This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7138

largefiles: use context manager for setting "lfstatus" on subrepos too
ClosedPublic

Authored by martinvonz on Oct 18 2019, 8:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2cb787b65cf2: largefiles: use context manager for setting "lfstatus" on subrepos too
Summary

It's safe since we now reset to the previous value.

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.Oct 18 2019, 8:51 PM
martinvonz added a commit: rHG2cb787b65cf2: largefiles: use context manager for setting "lfstatus" on subrepos too.Oct 19 2019, 1:13 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG2cb787b65cf2: largefiles: use context manager for setting "lfstatus" on subrepos too (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 17350

hgext/largefiles/overrides.py

getdata = lambda: util.readfile(path) getdata = lambda: util.readfile(path)
write(f, b'x' in ff and 0o755 or 0o644, b'l' in ff, getdata) write(f, b'x' in ff and 0o755 or 0o644, b'l' in ff, getdata)
if subrepos: if subrepos:
for subpath in sorted(ctx.substate): for subpath in sorted(ctx.substate):
sub = ctx.workingsub(subpath) sub = ctx.workingsub(subpath)
submatch = matchmod.subdirmatcher(subpath, match) submatch = matchmod.subdirmatcher(subpath, match)
subprefix = prefix + subpath + b'/' subprefix = prefix + subpath + b'/'
sub._repo.lfstatus = True with lfstatus(sub._repo):
sub.archive(archiver, subprefix, submatch) sub.archive(archiver, subprefix, submatch)
archiver.done() archiver.done()
@eh.wrapfunction(subrepo.hgsubrepo, b'archive') @eh.wrapfunction(subrepo.hgsubrepo, b'archive')
def hgsubrepoarchive(orig, repo, archiver, prefix, match=None, decode=True): def hgsubrepoarchive(orig, repo, archiver, prefix, match=None, decode=True):
lfenabled = util.safehasattr(repo._repo, b'_largefilesenabled') lfenabled = util.safehasattr(repo._repo, b'_largefilesenabled')
if not lfenabled or not repo._repo.lfstatus: if not lfenabled or not repo._repo.lfstatus:
getdata = lambda: util.readfile(os.path.join(prefix, path)) getdata = lambda: util.readfile(os.path.join(prefix, path))
write(f, b'x' in ff and 0o755 or 0o644, b'l' in ff, getdata) write(f, b'x' in ff and 0o755 or 0o644, b'l' in ff, getdata)
for subpath in sorted(ctx.substate): for subpath in sorted(ctx.substate):
sub = ctx.workingsub(subpath) sub = ctx.workingsub(subpath)
submatch = matchmod.subdirmatcher(subpath, match) submatch = matchmod.subdirmatcher(subpath, match)
subprefix = prefix + subpath + b'/' subprefix = prefix + subpath + b'/'
sub._repo.lfstatus = True with lfstatus(sub._repo):
sub.archive(archiver, subprefix, submatch, decode) sub.archive(archiver, subprefix, submatch, decode)
# If a largefile is modified, the change is not reflected in its # If a largefile is modified, the change is not reflected in its
# standin until a commit. cmdutil.bailifchanged() raises an exception # standin until a commit. cmdutil.bailifchanged() raises an exception
# if the repo has uncommitted changes. Wrap it to also check if # if the repo has uncommitted changes. Wrap it to also check if
# largefiles were changed. This is used by bisect, backout and fetch. # largefiles were changed. This is used by bisect, backout and fetch.
@eh.wrapfunction(cmdutil, b'bailifchanged') @eh.wrapfunction(cmdutil, b'bailifchanged')
def overridebailifchanged(orig, repo, *args, **kwargs): def overridebailifchanged(orig, repo, *args, **kwargs):