This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5922

largefiles: get cwd and relative paths from repo instead of matcher
ClosedPublic

Authored by martinvonz on Feb 10 2019, 1:19 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8fa1a5fb8a28: largefiles: get cwd and relative paths from repo instead of matcher
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 10 2019, 1:19 AM
Closed by commit rHG8fa1a5fb8a28: largefiles: get cwd and relative paths from repo instead of matcher (authored by martinvonz). · Explain WhyFeb 10 2019, 8:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/largefiles/overrides.py (9 lines)

Diff 14008

hgext/largefiles/overrides.py

return pat return pat
kindpat = matchmod._patsplit(pat, None) kindpat = matchmod._patsplit(pat, None)
if kindpat[0] is not None: if kindpat[0] is not None:
return kindpat[0] + ':' + tostandin(kindpat[1]) return kindpat[0] + ':' + tostandin(kindpat[1])
return tostandin(kindpat[1]) return tostandin(kindpat[1])
if m._cwd: cwd = repo.getcwd()
if cwd:
hglf = lfutil.shortname hglf = lfutil.shortname
back = util.pconvert(m.rel(hglf)[:-len(hglf)]) back = util.pconvert(repo.pathto(hglf)[:-len(hglf)])
def tostandin(f): def tostandin(f):
# The file may already be a standin, so truncate the back # The file may already be a standin, so truncate the back
# prefix and test before mangling it. This avoids turning # prefix and test before mangling it. This avoids turning
# 'glob:../.hglf/foo*' into 'glob:../.hglf/../.hglf/foo*'. # 'glob:../.hglf/foo*' into 'glob:../.hglf/../.hglf/foo*'.
if f.startswith(back) and lfutil.splitstandin(f[len(back):]): if f.startswith(back) and lfutil.splitstandin(f[len(back):]):
return f return f
# An absolute path is from outside the repo, so truncate the # An absolute path is from outside the repo, so truncate the
# path to the root before building the standin. Otherwise cwd # path to the root before building the standin. Otherwise cwd
# is somewhere in the repo, relative to root, and needs to be # is somewhere in the repo, relative to root, and needs to be
# prepended before building the standin. # prepended before building the standin.
if os.path.isabs(m._cwd): if os.path.isabs(cwd):
f = f[len(back):] f = f[len(back):]
else: else:
f = m._cwd + '/' + f f = cwd + '/' + f
return back + lfutil.standin(f) return back + lfutil.standin(f)
else: else:
def tostandin(f): def tostandin(f):
if lfutil.isstandin(f): if lfutil.isstandin(f):
return f return f
return lfutil.standin(f) return lfutil.standin(f)
pats.update(fixpats(f, tostandin) for f in p) pats.update(fixpats(f, tostandin) for f in p)