##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

localrepo: use the path relative to "self.vfs" instead of "path" argument...
localrepo: use the path relative to "self.vfs" instead of "path" argument As a part of migration to vfs, this patch uses "self.root", which can be recognized as the path relative to "self.vfs", instead of "path" argument. This fix allows to make invocations of "util.makedirs()" and "os.path.exists()" while ensuring repository directory in "localrepository.__init__()" ones indirectly via vfs. But this fix also raises issue 2528: "hg clone" with empty destination. "path" argument is empty in many cases, so this issue can't be fixed in the view of "localrepository.__init__()". Before this patch, it is fixed by empty-ness check ("not name") of exception handler in "util.makedirs()". try: os.mkdir(name) except OSError, err: if err.errno == errno.EEXIST: return if err.errno != errno.ENOENT or not name: raise This requires "localrepository.__init__()" to invoke "util.makedirs()" with "path" instead of "self.root", because empty "path" is treated as "current directory" and "self.root" becomes valid path. But "hg clone" with empty destination can be detected also in "hg.clone()" before "localrepository.__init__()" invocation, so this patch re-fixes issue2528 by checking it in "hg.clone()".
Patrick Mezard - - Load All Authors

File last commit:

r16491:bfe89d65 stable
r17159:36a30168 default
Show More
test-update-branches.t
156 lines | 3.8 KiB | text/troff | Tads3Lexer
/ tests / test-update-branches.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
combine tests
 r12279 # Construct the following history tree:
#
# @ 5:e1bb631146ca b1
# |
# o 4:a4fdb3b883c4 0:b608b9236435 b1
# |
# | o 3:4b57d2520816 1:44592833ba9f
# | |
# | | o 2:063f31070f65
# | |/
# | o 1:44592833ba9f
# |/
# o 0:b608b9236435
$ hg init
$ echo foo > foo
$ echo zero > a
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 $ hg init sub
$ echo suba > sub/suba
$ hg --cwd sub ci -Am addsuba
adding suba
$ echo 'sub = sub' > .hgsub
Adrian Buehlmann
combine tests
 r12279 $ hg ci -qAm0
$ echo one > a ; hg ci -m1
$ echo two > a ; hg ci -m2
$ hg up -q 1
$ echo three > a ; hg ci -qm3
$ hg up -q 0
$ hg branch -q b1
$ echo four > a ; hg ci -qm4
$ echo five > a ; hg ci -qm5
Initial repo state:
$ hg --config 'extensions.graphlog=' \
> glog --template '{rev}:{node|short} {parents} {branches}\n'
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 @ 5:ff252e8273df b1
Adrian Buehlmann
combine tests
 r12279 |
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 o 4:d047485b3896 0:60829823a42a b1
Adrian Buehlmann
combine tests
 r12279 |
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 | o 3:6efa171f091b 1:0786582aa4b1
Adrian Buehlmann
combine tests
 r12279 | |
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 | | o 2:bd10386d478c
Adrian Buehlmann
combine tests
 r12279 | |/
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 | o 1:0786582aa4b1
Adrian Buehlmann
combine tests
 r12279 |/
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 o 0:60829823a42a
Adrian Buehlmann
combine tests
 r12279
Test helper functions:
$ revtest () {
> msg=$1
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 > dirtyflag=$2 # 'clean', 'dirty' or 'dirtysub'
Adrian Buehlmann
combine tests
 r12279 > startrev=$3
> targetrev=$4
> opt=$5
> hg up -qC $startrev
> test $dirtyflag = dirty && echo dirty > foo
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 > test $dirtyflag = dirtysub && echo dirty > sub/suba
Adrian Buehlmann
combine tests
 r12279 > hg up $opt $targetrev
> hg parent --template 'parent={rev}\n'
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 > hg stat -S
Adrian Buehlmann
combine tests
 r12279 > }
$ norevtest () {
> msg=$1
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 > dirtyflag=$2 # 'clean', 'dirty' or 'dirtysub'
Adrian Buehlmann
combine tests
 r12279 > startrev=$3
> opt=$4
> hg up -qC $startrev
> test $dirtyflag = dirty && echo dirty > foo
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 > test $dirtyflag = dirtysub && echo dirty > sub/suba
Adrian Buehlmann
combine tests
 r12279 > hg up $opt
> hg parent --template 'parent={rev}\n'
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 > hg stat -S
Adrian Buehlmann
combine tests
 r12279 > }
Matt Mackall
tests: fix a bunch of pointless #s in unified tests
 r12328 Test cases are documented in a table in the update function of merge.py.
Cases are run as shown in that table, row by row.
Adrian Buehlmann
combine tests
 r12279
$ norevtest 'none clean linear' clean 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=5
$ norevtest 'none clean same' clean 2
Brendan Cully
Make pull -u behave like pull && update...
 r14485 abort: crosses branches (merge branches or update --check to force update)
Adrian Buehlmann
combine tests
 r12279 parent=2
$ revtest 'none clean linear' clean 1 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2
$ revtest 'none clean same' clean 2 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=3
$ revtest 'none clean cross' clean 3 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=4
$ revtest 'none dirty linear' dirty 1 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2
M foo
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 $ revtest 'none dirtysub linear' dirtysub 1 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2
M sub/suba
Adrian Buehlmann
combine tests
 r12279 $ revtest 'none dirty same' dirty 2 3
Brodie Rao
update: use higher level wording for "crosses branches" error...
 r12681 abort: crosses branches (merge branches or use --clean to discard changes)
Adrian Buehlmann
combine tests
 r12279 parent=2
M foo
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 $ revtest 'none dirtysub same' dirtysub 2 3
abort: crosses branches (merge branches or use --clean to discard changes)
parent=2
M sub/suba
Adrian Buehlmann
combine tests
 r12279 $ revtest 'none dirty cross' dirty 3 4
Brodie Rao
update: use higher level wording for "crosses branches" error...
 r12681 abort: crosses branches (merge branches or use --clean to discard changes)
Adrian Buehlmann
combine tests
 r12279 parent=3
M foo
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 $ revtest 'none dirtysub cross' dirtysub 3 4
abort: crosses branches (merge branches or use --clean to discard changes)
parent=3
M sub/suba
Adrian Buehlmann
combine tests
 r12279
$ revtest '-C dirty linear' dirty 1 2 -C
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2
$ revtest '-c dirty linear' dirty 1 2 -c
abort: uncommitted local changes
parent=1
M foo
Patrick Mezard
update: make --check abort with dirty subrepos...
 r16491 $ revtest '-c dirtysub linear' dirtysub 1 2 -c
abort: uncommitted local changes
parent=1
M sub/suba
Adrian Buehlmann
combine tests
 r12279 $ norevtest '-c clean same' clean 2 -c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=3
$ revtest '-cC dirty linear' dirty 1 2 -cC
abort: cannot specify both -c/--check and -C/--clean
parent=1
M foo