Skip to content
Snippets Groups Projects
Commit 2538b876 authored by Katsunori FUJIWARA's avatar Katsunori FUJIWARA
Browse files

subrepo: use repo.pathto instead of util.pathto to simplify invocation

This centralization into 'repo.pathto()' should reduce the cost of vfs
migration around 'getcwd()' and so on in the future.
parent 7a9ef860
No related branches found
No related tags found
No related merge requests found
......@@ -72,8 +72,8 @@
raise
# handle missing subrepo spec files as removed
ui.warn(_("warning: subrepo spec file \'%s\' not found\n") %
util.pathto(repo.root, repo.getcwd(), f))
repo.pathto(f))
return
p.parse(f, data, sections, remap, read)
else:
raise util.Abort(_("subrepo spec file \'%s\' not found") %
......@@ -76,9 +76,8 @@
return
p.parse(f, data, sections, remap, read)
else:
raise util.Abort(_("subrepo spec file \'%s\' not found") %
util.pathto(repo.root, repo.getcwd(), f))
repo.pathto(f))
if '.hgsub' in ctx:
read('.hgsub')
......@@ -97,8 +96,7 @@
except ValueError:
raise util.Abort(_("invalid subrepository revision "
"specifier in \'%s\' line %d")
% (util.pathto(repo.root, repo.getcwd(),
'.hgsubstate'), (i + 1)))
% (repo.pathto('.hgsubstate'), (i + 1)))
rev[path] = revision
except IOError as err:
if err.errno != errno.ENOENT:
......
......@@ -23,8 +23,8 @@
$ cp .hgsubstate .hgsubstate.old
>>> file('.hgsubstate', 'wb').write('\ninvalid')
$ hg st --subrepos
abort: invalid subrepository revision specifier in '.hgsubstate' line 2
$ hg st --subrepos --cwd $TESTTMP -R $TESTTMP/repo
abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2 (glob)
[255]
$ mv .hgsubstate.old .hgsubstate
......@@ -44,9 +44,9 @@
delete .hgsub and update
$ rm .hgsub
$ hg up 0
warning: subrepo spec file '.hgsub' not found
warning: subrepo spec file '.hgsub' not found
$ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo
warning: subrepo spec file 'repo/.hgsub' not found (glob)
warning: subrepo spec file 'repo/.hgsub' not found (glob)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st
warning: subrepo spec file '.hgsub' not found
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment