##// 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:

r16913:f2719b38 default
r20020:6fb59247 default
Show More
test-revset-dirstate-parents.t
60 lines | 816 B | text/troff | Tads3Lexer
/ tests / test-revset-dirstate-parents.t
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 $ HGENCODING=utf-8
$ export HGENCODING
$ try() {
> hg debugrevspec --debug $@
> }
$ log() {
> hg log --template '{rev}\n' -r "$1"
> }
$ hg init repo
$ cd repo
$ try 'p1()'
Patrick Mezard
debugrevspec: pretty print output...
r16218 (func
('symbol', 'p1')
None)
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 $ try 'p2()'
Patrick Mezard
debugrevspec: pretty print output...
r16218 (func
('symbol', 'p2')
None)
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ try 'parents()'
Patrick Mezard
debugrevspec: pretty print output...
r16218 (func
('symbol', 'parents')
None)
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928
null revision
$ log 'p1()'
$ log 'p2()'
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 $ log 'parents()'
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928
working dir with a single parent
$ echo a > a
$ hg ci -Aqm0
$ log 'p1()'
0
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ log 'tag() and p1()'
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 $ log 'p2()'
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 $ log 'parents()'
0
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ log 'tag() and parents()'
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928
merge in progress
$ echo b > b
$ hg ci -Aqm1
$ hg up -q 0
$ echo c > c
$ hg ci -Aqm2
$ hg merge -q
$ log 'p1()'
2
$ log 'p2()'
1
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ log 'tag() and p2()'
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 $ log 'parents()'
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 1
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 2
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..