##// 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()".
Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r17026:f8af57c0 stable
r17159:36a30168 default
Show More
test-rebase-interruptions.t
268 lines | 3.9 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-interruptions.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify test-rebase*
 r12608 $ cat >> $HGRCPATH <<EOF
> [extensions]
> graphlog=
> rebase=
>
Pierre-Yves David
phases: prevent rebase to rebase immutable changeset.
 r15742 > [phases]
> publish=False
>
Adrian Buehlmann
tests: unify test-rebase*
 r12608 > [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 > tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
Adrian Buehlmann
tests: unify test-rebase*
 r12608 > EOF
$ hg init a
$ cd a
$ echo A > A
$ hg ci -Am A
adding A
$ echo B > B
$ hg ci -Am B
adding B
$ echo C >> A
$ hg ci -m C
$ hg up -q -C 0
$ echo D >> A
$ hg ci -m D
created new head
$ echo E > E
$ hg ci -Am E
adding E
$ cd ..
Changes during an interruption - continue:
$ hg clone -q -u . a a1
$ cd a1
$ hg tglog
@ 4: 'E'
|
o 3: 'D'
|
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Rebasing B onto E:
$ hg rebase -s 1 -d 4
merging A
warning: conflicts during merge.
Matt Mackall
merge: give a special message for internal:merge failure (issue3105)
 r15501 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
Steve Borho
rebase: improve resolve failure message
 r12896 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
Adrian Buehlmann
tests: unify test-rebase*
 r12608 [255]
Force a commit on C during the interruption:
$ hg up -q -C 2
$ echo 'Extra' > Extra
$ hg add Extra
$ hg ci -m 'Extra'
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 Force this commit onto secret phase
$ hg phase --force --secret 6
$ hg tglogp
@ 6:secret 'Extra'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 | o 5:draft 'B'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 | |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 | o 4:draft 'E'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 | |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 | o 3:draft 'D'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 | |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o | 2:draft 'C'
| |
o | 1:draft 'B'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |/
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o 0:draft 'A'
Adrian Buehlmann
tests: unify test-rebase*
 r12608
Resume the rebasing:
$ hg rebase --continue
merging A
warning: conflicts during merge.
Matt Mackall
merge: give a special message for internal:merge failure (issue3105)
 r15501 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
Steve Borho
rebase: improve resolve failure message
 r12896 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
Adrian Buehlmann
tests: unify test-rebase*
 r12608 [255]
Solve the conflict and go on:
$ echo 'conflict solved' > A
$ rm A.orig
$ hg resolve -m A
$ hg rebase --continue
warning: new changesets detected on source branch, not stripping
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 $ hg tglogp
@ 7:draft 'C'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 | o 6:secret 'Extra'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 | |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o | 5:draft 'B'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 | |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o | 4:draft 'E'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 | |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o | 3:draft 'D'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 | |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 | o 2:draft 'C'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 | |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 | o 1:draft 'B'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |/
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o 0:draft 'A'
Adrian Buehlmann
tests: unify test-rebase*
 r12608
$ cd ..
Changes during an interruption - abort:
$ hg clone -q -u . a a2
$ cd a2
$ hg tglog
@ 4: 'E'
|
o 3: 'D'
|
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Rebasing B onto E:
$ hg rebase -s 1 -d 4
merging A
warning: conflicts during merge.
Matt Mackall
merge: give a special message for internal:merge failure (issue3105)
 r15501 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
Steve Borho
rebase: improve resolve failure message
 r12896 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
Adrian Buehlmann
tests: unify test-rebase*
 r12608 [255]
Force a commit on B' during the interruption:
$ hg up -q -C 5
$ echo 'Extra' > Extra
$ hg add Extra
$ hg ci -m 'Extra'
$ hg tglog
@ 6: 'Extra'
|
o 5: 'B'
|
o 4: 'E'
|
o 3: 'D'
|
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Abort the rebasing:
$ hg rebase --abort
warning: new changesets detected on target branch, can't abort
[255]
$ hg tglog
@ 6: 'Extra'
|
o 5: 'B'
|
o 4: 'E'
|
o 3: 'D'
|
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ cd ..
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 Changes during an interruption - abort (again):
$ hg clone -q -u . a a3
$ cd a3
$ hg tglogp
@ 4:draft 'E'
|
o 3:draft 'D'
|
| o 2:draft 'C'
| |
| o 1:draft 'B'
|/
o 0:draft 'A'
Rebasing B onto E:
$ hg rebase -s 1 -d 4
merging A
warning: conflicts during merge.
merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Change phase on B and B'
$ hg up -q -C 5
$ hg phase --public 1
$ hg phase --public 5
$ hg phase --secret -f 2
$ hg tglogp
@ 5:public 'B'
|
o 4:public 'E'
|
o 3:public 'D'
|
| o 2:secret 'C'
| |
| o 1:public 'B'
|/
o 0:public 'A'
Abort the rebasing:
$ hg rebase --abort
Dan Villiom Podlaski Christiansen
rebase: improve error message on improper phases...
 r17026 abort: can't abort rebase due to immutable changesets 45396c49d53b
(see hg help phases for details)
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 [255]
$ hg tglogp
@ 5:public 'B'
|
o 4:public 'E'
|
o 3:public 'D'
|
| o 2:secret 'C'
| |
| o 1:public 'B'
|/
o 0:public 'A'
$ cd ..