Rebase our ikiwiki template changes on top of current upstream
We're shipping two forked templates in
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.
#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:
#7 Updated by naar over 4 years ago
- File 0001-Rebase-ikiwiki-templates-on-top-of-upstream.patch View added
- File 0002-Improve-ikiwiki-s-page-tmpl-indentation.patch View added
- File 0003-Compact-HTML5-conditional-markup.patch View added
- Status changed from Confirmed to In Progress
- % Done changed from 0 to 50
- QA Check set to Ready for QA
0001-Rebase-ikiwiki-templates-on-top-of-upstream.patchis the mere rebasing patch (in which I've also replaced these
<TMPL_VAR PERCENTTRANSLATED>since it doesn't seem needed).
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
#10 Updated by sajolida over 4 years ago
- Status changed from In Progress to Resolved
- Assignee deleted (
- 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.
#12 Updated by sajolida over 4 years ago
Yeah, I think that's definitely true for
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.
#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.