Project

General

Profile

Feature #7027

Rebase our ikiwiki template changes on top of current upstream

Added by intrigeri over 5 years ago. Updated over 4 years ago.

Status:
Resolved
Priority:
Normal
Assignee:
Category:
-
Target version:
Start date:
04/05/2014
Due date:
% Done:

50%

Feature Branch:
Type of work:
Website
Blueprint:
Starter:
No
Affected tool:

Description

We're shipping two forked templates in wiki/src/templates: page.tmpl and rsspage.tmpl. Since we have copied and modified these files, the upstream ones have evolved a bit. It would be good to rebase our changes on top of the current upstream ones.

0001-Rebase-ikiwiki-templates-on-top-of-upstream.patch View (5.64 KB) naar, 03/03/2015 03:19 AM

0002-Improve-ikiwiki-s-page-tmpl-indentation.patch View (16.1 KB) naar, 03/03/2015 03:19 AM

0003-Compact-HTML5-conditional-markup.patch View (3.96 KB) naar, 03/03/2015 03:19 AM

History

#1 Updated by u over 5 years ago

I am willing to look into this if needed.

#2 Updated by intrigeri over 5 years ago

Assigned: u

#3 Updated by BitingBird over 5 years ago

  • Assignee set to u

#4 Updated by u about 5 years ago

  • Assignee deleted (u)

#5 Updated by naar over 4 years ago

Sorry about that, but I didn't get you on this point. Just to be sure, which version are you targeting here? That one:

http://source.ikiwiki.branchable.com/?p=source.git;a=blob_plain;f=templates/page.tmpl;hb=HEAD

#6 Updated by intrigeri over 4 years ago

Sorry about that, but I didn't get you on this point. Just to be sure, which version are you targeting here?

See http://ikiwiki.info/git/

#7 Updated by naar over 4 years ago

  1. 0001-Rebase-ikiwiki-templates-on-top-of-upstream.patch is the mere rebasing patch (in which I've also replaced these <TMPL_VAR NAME="PERCENTTRANSLATED"> with <TMPL_VAR PERCENTTRANSLATED> since it doesn't seem needed).
  2. 0002-Improve-ikiwiki-s-page.tmpl-indentation.patch is self-explanatory.
  3. 0003-Compact-HTML5-conditional-markup.patch, which is based on the previous one, follow on from what has been started upstream, that is compacting those <TMPL_IF HTML5> conditional variables like so:
<TMPL_IF HTML5><nav<TMPL_ELSE><div</TMPL_IF> id="otherlanguages">

Furthermore, just to leave a note about it for the next iteration, here is a convenient snippet for an interactive merging (hitting <Return> when the sdiff prompt '%' is waiting for an input will display the list of available commands):


$ tmpdiff="$(mktemp)" 
$ [[ -w "tmpdiff" ]] && wget --quiet --output-document=- 'http://source.ikiwiki.branchable.com/?p=source.git;a=blob_plain;f=templates/page.tmpl;hb=HEAD' > "$tmpdiff" && sdiff --output=wiki/src/templates/page.tmpl.new --ignore-blank-lines --expand-tabs --ignore-tab-expansion --width=$(tput cols) wiki/src/templates/page.tmpl "$tmpdiff" 
$ srm "$tmpdiff" && unset tmpdiff

#8 Updated by intrigeri over 4 years ago

  • Assignee set to sajolida
  • Target version set to Tails_1.3.2

sajolida, do you want to take it?

#9 Updated by sajolida over 4 years ago

Ok.

#10 Updated by sajolida over 4 years ago

  • Status changed from In Progress to Resolved
  • Assignee deleted (sajolida)
  • QA Check changed from Ready for QA to Pass

Thanks, I applied 0001-Rebase-ikiwiki-templates-on-top-of-upstream.patch but not the other ones. As the idea of rebasing was to make the diff between upstream and our version smaller, your other two patches actually were going into the opposite direction.

I also did some more rebasing with 38f504f.

#11 Updated by BitingBird over 4 years ago

naar: maybe you should propose the other patches upstream?

#12 Updated by sajolida over 4 years ago

Yeah, I think that's definitely true for 0003-Compact-HTML5-conditional-markup.patch. Regarding 0002-Improve-ikiwiki-s-page-tmpl-indentation.patch, I'm not sure whether ikiwiki has a indentation policy already, but they might be more reluctant since that would break all possibility of doing diff for other instances.

#13 Updated by BitingBird over 4 years ago

  • Assignee set to naar

Assigning this closed ticket back to naar, otherwise he might not see this discussion.

Maybe a new ticket should be opened to track the not-merged patches?

#14 Updated by intrigeri over 4 years ago

BitingBird wrote:

Assigning this closed ticket back to naar, otherwise he might not see this discussion.

He's on the "watchers" list :)

#15 Updated by sajolida over 4 years ago

The patches that we proposed to push upstream contain only minor factorization in the template code, and don't represent any maintenance burden for Tails. So that's totally optional. That's why I'm fine with suggesting this on a closed ticket and not creating new ones.

#16 Updated by BitingBird over 4 years ago

  • Target version changed from Tails_1.3.2 to Tails_1.3.1

Also available in: Atom PDF