Mercurial > hg
comparison mercurial/hg.py @ 17159:36a3016811d1
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()".
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Fri, 06 Jul 2012 18:45:27 +0900 |
parents | c2d9ef43ff6c |
children | 5884812686f7 |
comparison
equal
deleted
inserted
replaced
17158:60338880d265 | 17159:36a3016811d1 |
---|---|
261 dest = ui.expandpath(dest) | 261 dest = ui.expandpath(dest) |
262 | 262 |
263 dest = util.urllocalpath(dest) | 263 dest = util.urllocalpath(dest) |
264 source = util.urllocalpath(source) | 264 source = util.urllocalpath(source) |
265 | 265 |
266 if not dest: | |
267 raise util.Abort(_("empty destination path is not valid")) | |
266 if os.path.exists(dest): | 268 if os.path.exists(dest): |
267 if not os.path.isdir(dest): | 269 if not os.path.isdir(dest): |
268 raise util.Abort(_("destination '%s' already exists") % dest) | 270 raise util.Abort(_("destination '%s' already exists") % dest) |
269 elif os.listdir(dest): | 271 elif os.listdir(dest): |
270 raise util.Abort(_("destination '%s' is not empty") % dest) | 272 raise util.Abort(_("destination '%s' is not empty") % dest) |