##// END OF EJS Templates
subrepo: change default path in hgrc of subrepo after cloning...
subrepo: change default path in hgrc of subrepo after cloning Previous behavior was to put in the cloned subrepos the path found in the original main repo. However it isn't valid for relative path and it seems more logical to reference instead the subrepos working copy path of the original main repo.

File last commit:

r9956:6045a8c4 stable
r10378:e1401c74 default
Show More
test-extdiff
73 lines | 1.6 KiB | text/plain | TextLexer
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 #!/bin/sh
Thomas Arendsen Hein
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc...
r2990 echo "[extensions]" >> $HGRCPATH
echo "extdiff=" >> $HGRCPATH
Vadim Gelfer
extdiff: fix bugs. add test.
r2906
hg init a
cd a
echo a > a
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 echo b > b
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 hg add
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 # should diff cloned directories
Thomas Arendsen Hein
Don't require a diff which accepts the -N option.
r3751 hg extdiff -o -r $opt
Vadim Gelfer
extdiff: fix bugs. add test.
r2906
Thomas Arendsen Hein
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc...
r2990 echo "[extdiff]" >> $HGRCPATH
echo "cmd.falabala=echo" >> $HGRCPATH
echo "opts.falabala=diffing" >> $HGRCPATH
Vadim Gelfer
extdiff: fix bugs. add test.
r2906
hg falabala
hg help falabala
hg ci -d '0 0' -mtest1
echo b >> a
hg ci -d '1 0' -mtest2
Thomas Arendsen Hein
Remove trailing spaces, fix indentation
r5143 # should diff cloned files directly
Benoit Boissinot
fix traceback of extdiff after a merge...
r3330 hg falabala -r 0:1
# test diff during merge
Patrick Mezard
extdiff: preserve execute-bit across copies (issue1562)...
r8065 hg update -C 0
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 echo c >> c
hg add c
Benoit Boissinot
fix traceback of extdiff after a merge...
r3330 hg ci -m "new branch" -d '1 0'
Gilles Moris
extdiff: add --change option to display single changeset diff...
r7758 hg merge 1
Thomas Arendsen Hein
Remove trailing spaces, fix indentation
r5143 # should diff cloned file against wc file
Gilles Moris
extdiff: add --change option to display single changeset diff...
r7758 hg falabala > out
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 # cleanup the output since the wc is a tmp directory
sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out
Gilles Moris
extdiff: add --change option to display single changeset diff...
r7758 # test --change option
hg ci -d '2 0' -mtest3
hg falabala -c 1
# check diff are made from the first parent
hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code"
#hg log
Patrick Mezard
extdiff: preserve execute-bit across copies (issue1562)...
r8065
echo
echo '% test extdiff of multiple files in tmp dir:'
hg update -C 0 > /dev/null
echo changed > a
echo changed > b
chmod +x b
echo '% diff in working directory, before'
hg diff --git
echo '% edit with extdiff -p'
# prepare custom diff/edit tool
Patrick Mezard
test-extdiff: replace shell script with python for portability
r8212 cat > differ.py << EOT
#!/usr/bin/env python
import time
time.sleep(1) # avoid unchanged-timestamp problems
file('a/a', 'ab').write('edited\n')
file('a/b', 'ab').write('edited\n')
Patrick Mezard
extdiff: preserve execute-bit across copies (issue1562)...
r8065 EOT
Patrick Mezard
test-extdiff: replace shell script with python for portability
r8212 chmod +x differ.py
hg extdiff -p `pwd`/differ.py # will change to /tmp/extdiff.TMP and populate directories a.TMP and a and start tool
Patrick Mezard
extdiff: preserve execute-bit across copies (issue1562)...
r8065 echo '% diff in working directory, after'
hg diff --git
Sune Foldager
extdiff: respect --option in command aliases (issue949)
r9956
echo
echo % test extdiff with --option
hg extdiff -p echo -o this -c 1
hg falabala -o this -c 1
echo