##// 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()".
Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default
r17159:36a30168 default
Show More
test-branch-tag-confict.t
65 lines | 1.6 KiB | text/troff | Tads3Lexer
/ tests / test-branch-tag-confict.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>...
 r13750 Initial setup.
$ hg init repo
$ cd repo
$ touch thefile
$ hg ci -A -m 'Initial commit.'
adding thefile
Create a tag.
$ hg tag branchortag
Create a branch with the same name as the tag.
$ hg branch branchortag
marked working directory as branch branchortag
Matt Mackall
branch: warn on branching
 r15615 (branches are permanent and global, did you want a bookmark?)
Matt Mackall
# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>...
 r13750 $ hg ci -m 'Create a branch with the same name as a tag.'
This is what we have:
$ hg log
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
 r14162 changeset: 2:10519b3f489a
Matt Mackall
# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>...
 r13750 branch: branchortag
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Create a branch with the same name as a tag.
changeset: 1:2635c45ca99b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Added tag branchortag for changeset f57387372b5d
changeset: 0:f57387372b5d
tag: branchortag
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Initial commit.
Update to the tag:
$ hg up 'tag(branchortag)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg parents
changeset: 0:f57387372b5d
tag: branchortag
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Initial commit.
Updating to the branch:
$ hg up 'branch(branchortag)'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg parents
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
 r14162 changeset: 2:10519b3f489a
Matt Mackall
# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>...
 r13750 branch: branchortag
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Create a branch with the same name as a tag.
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913
$ cd ..