##// END OF EJS Templates
merge with crew
merge with crew

File last commit:

r6246:35bf9c23 default
r6986:55c16f12 merge default
Show More
test-fetch
69 lines | 1.6 KiB | text/plain | TextLexer
Vadim Gelfer
fetch: fix breakage from mpm....
r2822 #!/bin/sh
Thomas Arendsen Hein
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
r6246 # adjust to non-default HGPORT, e.g. with run-tests.py -j
hideport() { sed "s/localhost:$HGPORT/localhost:20059/"; }
hidehash() { sed "s/changeset 3:............ merges/changeset 3:... merges/"; }
Thomas Arendsen Hein
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc...
r2990 echo "[extensions]" >> $HGRCPATH
echo "fetch=" >> $HGRCPATH
Vadim Gelfer
fetch: fix breakage from mpm....
r2822
hg init a
echo a > a/a
hg --cwd a commit -d '1 0' -Ama
hg clone a b
hg clone a c
echo b > a/b
hg --cwd a commit -d '2 0' -Amb
hg --cwd a parents -q
echo % should pull one change
hg --cwd b fetch ../a
hg --cwd b parents -q
echo c > c/c
hg --cwd c commit -d '3 0' -Amc
Bryan O'Sullivan
fetch: hide authentication details
r5798
hg clone c d
hg clone c e
Bryan O'Sullivan
fetch: make test reproducible, tiny code cleanup
r6207 # We cannot use the default commit message if fetching from a local
# repo, because the path of the repo will be included in the commit
# message, making every commit appear different.
Bryan O'Sullivan
fetch: switch the default parent used for a merge...
r6206 echo % should merge c into a
Vadim Gelfer
test-fetch: make output stable
r2823 hg --cwd c fetch -d '4 0' -m 'automated merge' ../a
Vadim Gelfer
fetch: fix breakage from mpm....
r2822 ls c
Bryan O'Sullivan
fetch: hide authentication details
r5798
hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid
cat a/hg.pid >> "$DAEMON_PIDS"
echo '% fetch over http, no auth'
Thomas Arendsen Hein
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
r6246 hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/ | hideport | hidehash
hg --cwd d tip --template '{desc}\n' | hideport
Bryan O'Sullivan
fetch: hide authentication details
r5798
echo '% fetch over http with auth (should be hidden in desc)'
Thomas Arendsen Hein
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
r6246 hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/ | hideport | hidehash
hg --cwd e tip --template '{desc}\n' | hideport
Bryan O'Sullivan
fetch: switch the default parent used for a merge...
r6206
hg clone a f
hg clone a g
echo f > f/f
hg --cwd f ci -d '6 0' -Amf
echo g > g/g
hg --cwd g ci -d '6 0' -Amg
Bryan O'Sullivan
fetch: don't proceed if working directory is missing files (issue988)
r6226 hg clone -q f h
hg clone -q g i
Bryan O'Sullivan
fetch: switch the default parent used for a merge...
r6206 echo % should merge f into g
Bryan O'Sullivan
fetch: make test reproducible, tiny code cleanup
r6207 hg --cwd g fetch -d '7 0' --switch -m 'automated merge' ../f
Bryan O'Sullivan
fetch: don't proceed if working directory is missing files (issue988)
r6226
rm i/g
echo % should abort, because i is modified
hg --cwd i fetch ../h
Thomas Arendsen Hein
test-fetch failed due to non-zero exit code
r6235
true