##// END OF EJS Templates
transplant: use peer of source repository as "remote" for "repo.pull()"...
transplant: use peer of source repository as "remote" for "repo.pull()" Before this patch, transplant with "--merge" option fails with traceback unexpectedly, if it causes pull from the source repository on the local host. "discovery.findcommonincoming()" invokes "capable()" method on the object given from "localrepository.pull()", but it is "localrepository" object in this case and doesn't have such method. This patch uses peer object of source repository as "remote" argument for "localrepository.pull()" invocation like other invocations of it in transplant.py.

File last commit:

r18395:904b7109 default
r20020:6fb59247 default
Show More
test-mq-symlinks.t
108 lines | 1.8 KiB | text/troff | Tads3Lexer
/ tests / test-mq-symlinks.t
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 $ "$TESTDIR/hghave" symlink || exit 80
$ echo "[extensions]" >> $HGRCPATH
$ echo "mq=" >> $HGRCPATH
$ hg init
$ hg qinit
$ hg qnew base.patch
$ echo aaa > a
$ echo bbb > b
$ echo ccc > c
$ hg add a b c
$ hg qrefresh
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ "$TESTDIR/readlink.py" a
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 a -> a not a symlink
test replacing a file with a symlink
$ hg qnew symlink.patch
$ rm a
$ ln -s b a
$ hg qrefresh --git
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ "$TESTDIR/readlink.py" a
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 a -> b
$ hg qpop
popping symlink.patch
now at: base.patch
$ hg qpush
applying symlink.patch
now at: symlink.patch
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ "$TESTDIR/readlink.py" a
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 a -> b
test updating a symlink
$ rm a
$ ln -s c a
$ hg qnew --git -f updatelink
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ "$TESTDIR/readlink.py" a
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 a -> c
$ hg qpop
popping updatelink
now at: symlink.patch
$ hg qpush --debug
applying updatelink
patching file a
a
now at: updatelink
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ "$TESTDIR/readlink.py" a
Nicolas Dumazet
tests: unify test-mq-symlinks
r11908 a -> c
$ hg st
test replacing a symlink with a file
$ ln -s c s
$ hg add s
$ hg qnew --git -f addlink
$ rm s
$ echo sss > s
$ hg qnew --git -f replacelinkwithfile
$ hg qpop
popping replacelinkwithfile
now at: addlink
$ hg qpush
applying replacelinkwithfile
now at: replacelinkwithfile
$ cat s
sss
$ hg st
test symlink removal
$ hg qnew removesl.patch
$ hg rm a
$ hg qrefresh --git
$ hg qpop
popping removesl.patch
now at: replacelinkwithfile
$ hg qpush
applying removesl.patch
now at: removesl.patch
$ hg st -c
C b
C c
C s
Patrick Mezard
Merge with stable
r12345
replace broken symlink with another broken symlink
$ ln -s linka linka
$ hg add linka
$ hg qnew link
$ hg mv linka linkb
Mads Kiilerich
merge with stable
r12398 $ rm linkb
$ ln -s linkb linkb
Patrick Mezard
Merge with stable
r12345 $ hg qnew movelink
$ hg qpop
popping movelink
now at: link
$ hg qpush
applying movelink
now at: movelink
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ "$TESTDIR/readlink.py" linkb
Patrick Mezard
Merge with stable
r12345 linkb -> linkb