Mercurial > hg-stable
view tests/test-rebase-interruptions @ 10189:e451e599fbcf
patch: support diff data loss detection and upgrade
In worst case, generating diff in upgrade mode can be two times more expensive
than generating it in git mode directly: we may have to regenerate the whole
diff again whenever a git feature is detected. Also, the first diff attempt is
completely buffered instead of being streamed. That said, even without having
profiled it yet, I am convinced we can fast-path the upgrade mode if necessary
were it to be used in regular diff commands, and not only in mq where avoiding
data loss is worth the price.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 01 Jan 2010 20:54:05 +0100 |
parents | 8766fee6f225 |
children | b345b1cc124f |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH BASE=`pwd` addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -m $1 } commit () { hg commit -d "${2} 0" -m $1 } createrepo () { cd $BASE rm -rf a hg init a cd a addcommit "A" 0 addcommit "B" 1 echo "C" >> A commit "C" 2 hg update -C 0 echo "D" >> A commit "D" 3 addcommit "E" 4 } echo "% Changes during an interruption - continue" createrepo > /dev/null 2>&1 hg glog --template '{rev}: {desc}\n' echo echo "% - Rebasing B onto E" hg rebase -s 1 -d 4 2>&1 | sed 's/\(saving bundle to \).*/\1/' echo echo "% - Force a commit on C during the interruption" hg update -C 2 addcommit "Extra" 5 hg glog --template '{rev}: {desc}\n' echo echo "% - Resume the rebasing" hg rebase --continue echo echo "% - Solve the conflict and go on" echo 'conflict solved' > A rm A.orig hg resolve -m A hg rebase --continue hg glog --template '{rev}: {desc}\n' echo echo echo "% Changes during an interruption - abort" createrepo > /dev/null 2>&1 hg glog --template '{rev}: {desc}\n' echo echo "% Rebasing B onto E" hg rebase -s 1 -d 4 2>&1 | sed 's/\(saving bundle to \).*/\1/' echo echo "% Force a commit on B' during the interruption" hg update -C 5 addcommit "Extra" 6 hg glog --template '{rev}: {desc}\n' echo echo "% Abort the rebasing" hg rebase --abort hg glog --template '{rev}: {desc}\n' exit 0