D5922: largefiles: get cwd and relative paths from repo instead of matcher
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sun Feb 10 06:19:36 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
As far as I can tell, the matcher returned from matchandpats() got its
cwd from the context object, which in turn got it from the repo, so
this should be equivalent.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5922
AFFECTED FILES
hgext/largefiles/overrides.py
CHANGE DETAILS
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -301,9 +301,10 @@
return kindpat[0] + ':' + tostandin(kindpat[1])
return tostandin(kindpat[1])
- if m._cwd:
+ cwd = repo.getcwd()
+ if cwd:
hglf = lfutil.shortname
- back = util.pconvert(m.rel(hglf)[:-len(hglf)])
+ back = util.pconvert(repo.pathto(hglf)[:-len(hglf)])
def tostandin(f):
# The file may already be a standin, so truncate the back
@@ -316,10 +317,10 @@
# path to the root before building the standin. Otherwise cwd
# is somewhere in the repo, relative to root, and needs to be
# prepended before building the standin.
- if os.path.isabs(m._cwd):
+ if os.path.isabs(cwd):
f = f[len(back):]
else:
- f = m._cwd + '/' + f
+ f = cwd + '/' + f
return back + lfutil.standin(f)
else:
def tostandin(f):
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list