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

File last commit:

r15501:2371f4ae default
r17159:36a30168 default
Show More
test-conflict.t
33 lines | 732 B | text/troff | Tads3Lexer
/ tests / test-conflict.t
History | Source | Raw |Copy content |Copy permalink
Nicolas Dumazet
tests: unify test-conflict
 r11797 $ hg init
$ echo "nothing" > a
$ hg add a
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg commit -m ancestor
Nicolas Dumazet
tests: unify test-conflict
 r11797 $ echo "something" > a
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg commit -m branch1
Nicolas Dumazet
tests: unify test-conflict
 r11797 $ hg co 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "something else" > a
Martin Geisler
tests: remove unneeded -d flags...
 r12156 $ hg commit -m branch2
Nicolas Dumazet
tests: unify test-conflict
 r11797 created new head
$ hg merge 1
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')
Nicolas Dumazet
tests: unify test-conflict
 r11797 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Brodie Rao
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...
 r12314 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Nicolas Dumazet
tests: unify test-conflict
 r11797
$ hg id
Martin Geisler
tests: remove unneeded -d flags...
 r12156 32e80765d7fe+75234512624c+ tip
Nicolas Dumazet
tests: unify test-conflict
 r11797
$ cat a
<<<<<<< local
something else
=======
something
>>>>>>> other
$ hg status
M a
? a.orig