##// END OF EJS Templates
patch: support diff data loss detection and upgrade...
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.

File last commit:

r8168:8766fee6 default
r10189:e451e599 default
Show More
test-rebase-parameters
108 lines | 2.2 KiB | text/plain | TextLexer
/ tests / test-rebase-parameters
Stefano Tortarolo
Add rebase extension
r6906 #!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
Brendan Cully
Debashify rebase tests
r6910 addcommit () {
Stefano Tortarolo
Add rebase extension
r6906 echo $1 > $1
hg add $1
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d "${2} 0" -m $1
Stefano Tortarolo
Add rebase extension
r6906 }
Brendan Cully
Debashify rebase tests
r6910 commit () {
Martin Geisler
tests: removed redundant "-u test" from test scripts...
r8168 hg commit -d "${2} 0" -m $1
Stefano Tortarolo
Add rebase extension
r6906 }
Brendan Cully
Debashify rebase tests
r6910 createrepo () {
Stefano Tortarolo
Add rebase extension
r6906 hg init a
cd a
addcommit "c1" 0
addcommit "c2" 1
addcommit "c3" 2
hg update -C 1
addcommit "l1" 3
addcommit "l2" 4
addcommit "l3" 5
hg update -C 2
addcommit "r1" 6
addcommit "r2" 7
}
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo "% These fail"
echo
echo "% Use continue and abort"
hg rebase --continue --abort
echo
echo "% Use continue and collapse"
hg rebase --continue --collapse
echo
echo "% Use continue/abort and dest/source"
hg rebase --continue --dest 4
echo
echo "% Use source and base"
hg rebase --base 5 --source 4
echo
echo "% Rebase with no arguments - from current"
hg rebase
echo
echo "% Rebase with no arguments - from the current branch"
hg update 6
hg rebase
echo "% ----------"
echo "% These work"
echo
echo "% Rebase with no arguments (from 3 onto 7)"
hg update -C 5
hg rebase 2>&1 | sed 's/\(saving bundle to \).*/\1/'
Stefano Tortarolo
rebase: disable rollback after rebasing
r7130 echo "% Try to rollback after a rebase (fail)"
hg rollback
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Rebase with base == '.' => same as no arguments (from 3 onto 7)"
hg update -C 5
hg rebase --base . 2>&1 | sed 's/\(saving bundle to \).*/\1/'
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Rebase with dest == `hg branch` => same as no arguments (from 3 onto 7)"
hg update -C 5
hg rebase --dest `hg branch` 2>&1 | sed 's/\(saving bundle to \).*/\1/'
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Specify only source (from 4 onto 7)"
hg rebase --source 4 2>&1 | sed 's/\(saving bundle to \).*/\1/'
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Specify only dest (from 3 onto 6)"
hg update -C 5
hg rebase --dest 6 2>&1 | sed 's/\(saving bundle to \).*/\1/'
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Specify only base (from 3 onto 7)"
hg rebase --base 5 2>&1 | sed 's/\(saving bundle to \).*/\1/'
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Specify source and dest (from 4 onto 6)"
hg rebase --source 4 --dest 6 2>&1 | sed 's/\(saving bundle to \).*/\1/'
Stefano Tortarolo
Fix wrong redirection in test-rebase-parameters
r6939 createrepo > /dev/null 2>&1
Stefano Tortarolo
Add rebase extension
r6906 echo
echo "% Specify base and dest (from 3 onto 6)"
hg rebase --base 4 --dest 6 2>&1 | sed 's/\(saving bundle to \).*/\1/'
exit 0