From c9873341c915886263023cd7e30320c5c9736c6f Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Sun, 15 Mar 2015 11:10:30 +0000 Subject: makediff: update for cs03 Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@483 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index 16eba2d..b7e6831 100755 --- a/makediff.sh +++ b/makediff.sh @@ -9,31 +9,17 @@ export DATESTR=${DATESTR:-`cat REVISION-DATE`} MAIN=$1 PATH=.:${PATH} cur="$PWD" -oldrev=`git rev-list -1 origin/tags/v1.0-cs01` +oldrev=`git rev-list -1 origin/tags/v1.0-cs02` newrev=`git rev-list -1 HEAD` rm -fr old new git clone $PWD old cd "${cur}/old" git checkout $oldrev -##suppress diff of title -#git cherry-pick 0adee486ab987c3e98c5f31b51cc963d8bb6fff4 -##suppress diff of changelog -#git cherry-pick a41f3813a748e7d279cb6eb82f3c0afde4a3243a -#git cherry-pick fbfb402e69cdd9279c44b7684612e6f81df99e6d -#git cherry-pick 9f240fe0e718bf9b1e502e02916db9d8fede304b -#git cherry-pick a02605f9945f450ecaadf86736741de2e2c2e788 -#git cherry-pick 175e797beede8aea840102bee9b70bb08190153d while read -r rev; do echo "Applying $rev" git cherry-pick `git rev-list -1 -F --grep "$rev" $newrev` || exit 1 done << 'EOF' -formatting: escape \ldots in lstlisting -formatting: mark change manually as changed in cs02 -cl: remove changelog for cs01 -cl-os: prepare changelog for v1.0 cs02 -title: update previous version to cs01 -changelog: list acknowledgement change -changelog: typo fixup: formatting: formatting +Revert: formatting: mark change manually as changed in cs02 EOF #mv specvars.tex specvars-orig.tex -- cgit v1.2.3 From f612f689e7e97df615294f090b14d06a31fdabab Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Sun, 15 Mar 2015 11:10:49 +0000 Subject: makediff: work around for lstlisting latexdiff seems to go wild trying to diff lstlisting. But marking lstlisting as picture - so old text is commented out - then removing the comment sign - seems to work, with the only disadvantage being that listing is diffed as a whole. Seems to be the best I can come up with ATM. Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@484 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index b7e6831..dc2efff 100755 --- a/makediff.sh +++ b/makediff.sh @@ -50,6 +50,8 @@ sed 's/\\footnote{/\\footnote {/' new/flat.tex > new/flat-fixed.tex #wget http://mirror.math.ku.edu/tex-archive/support/latexdiff/latexdiff-fast #chmod +x latexdiff-fast latexdiff-fast --config \ -"FLOATENV=(?:figure|longtable|table|tabular|plate)[\w\d*@]*" \ - --append-safecmd=field --append-textcmd=mmioreg --ignore-warnings -p diffpreamble.tex old/flat-fixed.tex new/flat-fixed.tex > virtio-diff.tex -#perl -pi fixupdiff.pl virtio-diff.tex +"FLOATENV=(?:figure|longtable|table|tabular|plate|lstlisting)[\w\d*@]*,PICTUREENV=(?:picture|DIFnomarkup|lstlisting)[\w\d*@]*" \ + --append-safecmd=field --append-textcmd=mmioreg \ +--ignore-warnings -p diffpreamble.tex old/flat-fixed.tex \ +new/flat-fixed.tex > virtio-diff-tofix.tex +perl fixupdiff.pl virtio-diff-tofix.tex > virtio-diff.tex -- cgit v1.2.3 From ab5fb8dd72b80f7587d03a0a9b4aac5738f56998 Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Wed, 25 Mar 2015 17:09:28 +0000 Subject: makediff: cherry pick cl changes Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@496 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index dc2efff..df51bce 100755 --- a/makediff.sh +++ b/makediff.sh @@ -20,6 +20,8 @@ while read -r rev; do git cherry-pick `git rev-list -1 -F --grep "$rev" $newrev` || exit 1 done << 'EOF' Revert: formatting: mark change manually as changed in cs02 +cl: move out cs02 changelog +cl: drop contents temporarily EOF #mv specvars.tex specvars-orig.tex -- cgit v1.2.3 From 1132bfe6a3b930bcd2e06925e85bb1a473adda67 Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Wed, 25 Mar 2015 17:10:06 +0000 Subject: makediff: cherry-pick header removal makes changelog diff slightly prettier. Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@498 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index df51bce..bba099a 100755 --- a/makediff.sh +++ b/makediff.sh @@ -22,6 +22,7 @@ done << 'EOF' Revert: formatting: mark change manually as changed in cs02 cl: move out cs02 changelog cl: drop contents temporarily +changelog: comment out header EOF #mv specvars.tex specvars-orig.tex -- cgit v1.2.3 From 3199466fd385ccd1a5db26ddfea779c41e1c7b6c Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Wed, 22 Apr 2015 08:25:18 +0000 Subject: makediff: mark note as floatenv Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@505 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index bba099a..1135cbb 100755 --- a/makediff.sh +++ b/makediff.sh @@ -53,7 +53,7 @@ sed 's/\\footnote{/\\footnote {/' new/flat.tex > new/flat-fixed.tex #wget http://mirror.math.ku.edu/tex-archive/support/latexdiff/latexdiff-fast #chmod +x latexdiff-fast latexdiff-fast --config \ -"FLOATENV=(?:figure|longtable|table|tabular|plate|lstlisting)[\w\d*@]*,PICTUREENV=(?:picture|DIFnomarkup|lstlisting)[\w\d*@]*" \ +"FLOATENV=(?:figure|longtable|table|tabular|plate|lstlisting|note)[\w\d*@]*,PICTUREENV=(?:picture|DIFdeltextcstwo|DIFnomarkup|lstlisting)[\w\d*@]*" \ --append-safecmd=field --append-textcmd=mmioreg \ --ignore-warnings -p diffpreamble.tex old/flat-fixed.tex \ new/flat-fixed.tex > virtio-diff-tofix.tex -- cgit v1.2.3 From 8aaa8ec616d023ab9577cd30f16d7460c4ea936d Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Wed, 22 Apr 2015 11:25:04 +0000 Subject: makediff: cherry pick disabling markup on cl Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@511 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index 1135cbb..cb6eb76 100755 --- a/makediff.sh +++ b/makediff.sh @@ -23,6 +23,7 @@ Revert: formatting: mark change manually as changed in cs02 cl: move out cs02 changelog cl: drop contents temporarily changelog: comment out header +changelog: disable markup EOF #mv specvars.tex specvars-orig.tex -- cgit v1.2.3 From 077b7f28068b171123060d4542e685fd901f00b1 Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Thu, 21 May 2015 10:13:04 +0000 Subject: makediff: mark enumerate/itemize as floats Helps detect begin/end crossing these environments and fix up automatically. Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@533 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index cb6eb76..7d64c93 100755 --- a/makediff.sh +++ b/makediff.sh @@ -54,7 +54,7 @@ sed 's/\\footnote{/\\footnote {/' new/flat.tex > new/flat-fixed.tex #wget http://mirror.math.ku.edu/tex-archive/support/latexdiff/latexdiff-fast #chmod +x latexdiff-fast latexdiff-fast --config \ -"FLOATENV=(?:figure|longtable|table|tabular|plate|lstlisting|note)[\w\d*@]*,PICTUREENV=(?:picture|DIFdeltextcstwo|DIFnomarkup|lstlisting)[\w\d*@]*" \ +"FLOATENV=(?:figure|longtable|table|tabular|plate|lstlisting|note|enumerate|itemize)[\w\d*@]*,PICTUREENV=(?:picture|DIFdeltextcstwo|DIFnomarkup|lstlisting)[\w\d*@]*" \ --append-safecmd=field --append-textcmd=mmioreg \ --ignore-warnings -p diffpreamble.tex old/flat-fixed.tex \ new/flat-fixed.tex > virtio-diff-tofix.tex -- cgit v1.2.3