This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11107

largefile: consider `updatelfiles` as a `parentchange`
ClosedPublic

Authored by marmoute on Jul 18 2021, 5:52 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG40811cc7fa56: largefile: consider `updatelfiles` as a `parentchange`
Summary

This is not strictly a parentchange, however this is still some internal
dirstate adjustment as "similar" enough that it seems find to do so.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Jul 18 2021, 5:52 PM
pulkit accepted this revision.Jul 18 2021, 6:26 PM
This revision is now accepted and ready to land.Jul 18 2021, 6:26 PM
marmoute added a commit: rHG40811cc7fa56: largefile: consider `updatelfiles` as a `parentchange`.Jul 19 2021, 9:15 AM
Closed by commit rHG40811cc7fa56: largefile: consider `updatelfiles` as a `parentchange` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
marmoute updated this revision to Diff 29466.Jul 19 2021, 10:49 AM

Revision Contents
Changeset List

PathPackages
Mhgext/largefiles/lfcommands.py (158 lines)

Diff 29466

hgext/largefiles/lfcommands.py

with repo.wlock(): with repo.wlock():
lfdirstate = lfutil.openlfdirstate(ui, repo) lfdirstate = lfutil.openlfdirstate(ui, repo)
lfiles = set(lfutil.listlfiles(repo)) | set(lfdirstate) lfiles = set(lfutil.listlfiles(repo)) | set(lfdirstate)
if filelist is not None: if filelist is not None:
filelist = set(filelist) filelist = set(filelist)
lfiles = [f for f in lfiles if f in filelist] lfiles = [f for f in lfiles if f in filelist]
with lfdirstate.parentchange():
update = {} update = {}
dropped = set() dropped = set()
updated, removed = 0, 0 updated, removed = 0, 0
wvfs = repo.wvfs wvfs = repo.wvfs
wctx = repo[None] wctx = repo[None]
for lfile in lfiles: for lfile in lfiles:
lfileorig = os.path.relpath( lfileorig = os.path.relpath(
scmutil.backuppath(ui, repo, lfile), start=repo.root scmutil.backuppath(ui, repo, lfile), start=repo.root
) )
standin = lfutil.standin(lfile) standin = lfutil.standin(lfile)
standinorig = os.path.relpath( standinorig = os.path.relpath(
scmutil.backuppath(ui, repo, standin), start=repo.root scmutil.backuppath(ui, repo, standin), start=repo.root
) )
if wvfs.exists(standin): if wvfs.exists(standin):
if wvfs.exists(standinorig) and wvfs.exists(lfile): if wvfs.exists(standinorig) and wvfs.exists(lfile):
shutil.copyfile(wvfs.join(lfile), wvfs.join(lfileorig)) shutil.copyfile(wvfs.join(lfile), wvfs.join(lfileorig))
wvfs.unlinkpath(standinorig) wvfs.unlinkpath(standinorig)
expecthash = lfutil.readasstandin(wctx[standin]) expecthash = lfutil.readasstandin(wctx[standin])
if expecthash != b'': if expecthash != b'':
if lfile not in wctx: # not switched to normal file if lfile not in wctx: # not switched to normal file
if repo.dirstate[standin] != b'?': if repo.dirstate[standin] != b'?':
wvfs.unlinkpath(lfile, ignoremissing=True) wvfs.unlinkpath(lfile, ignoremissing=True)
else: else:
dropped.add(lfile) dropped.add(lfile)
# use normallookup() to allocate an entry in largefiles # use normallookup() to allocate an entry in largefiles
# dirstate to prevent lfilesrepo.status() from reporting # dirstate to prevent lfilesrepo.status() from reporting
# missing files as removed. # missing files as removed.
lfdirstate.normallookup(lfile) lfdirstate.normallookup(lfile)
update[lfile] = expecthash update[lfile] = expecthash
else: else:
# Remove lfiles for which the standin is deleted, unless the # Remove lfiles for which the standin is deleted, unless the
# lfile is added to the repository again. This happens when a # lfile is added to the repository again. This happens when a
# largefile is converted back to a normal file: the standin # largefile is converted back to a normal file: the standin
# disappears, but a new (normal) file appears as the lfile. # disappears, but a new (normal) file appears as the lfile.
if ( if (
wvfs.exists(lfile) wvfs.exists(lfile)
and repo.dirstate.normalize(lfile) not in wctx and repo.dirstate.normalize(lfile) not in wctx
): ):
wvfs.unlinkpath(lfile) wvfs.unlinkpath(lfile)
removed += 1 removed += 1
# largefile processing might be slow and be interrupted - be prepared # largefile processing might be slow and be interrupted - be prepared
lfdirstate.write() lfdirstate.write()
with lfdirstate.parentchange():
if lfiles: if lfiles:
lfiles = [f for f in lfiles if f not in dropped] lfiles = [f for f in lfiles if f not in dropped]
for f in dropped: for f in dropped:
repo.wvfs.unlinkpath(lfutil.standin(f)) repo.wvfs.unlinkpath(lfutil.standin(f))
# This needs to happen for dropped files, otherwise they stay in # This needs to happen for dropped files, otherwise they stay in
# the M state. # the M state.
lfutil.synclfdirstate(repo, lfdirstate, f, normallookup) lfutil.synclfdirstate(repo, lfdirstate, f, normallookup)
statuswriter(_(b'getting changed largefiles\n')) statuswriter(_(b'getting changed largefiles\n'))
cachelfiles(ui, repo, None, lfiles) cachelfiles(ui, repo, None, lfiles)
for lfile in lfiles: for lfile in lfiles:
update1 = 0 update1 = 0
expecthash = update.get(lfile) expecthash = update.get(lfile)
if expecthash: if expecthash:
if not lfutil.copyfromcache(repo, expecthash, lfile): if not lfutil.copyfromcache(repo, expecthash, lfile):
# failed ... but already removed and set to normallookup # failed ... but already removed and set to normallookup
continue continue
# Synchronize largefile dirstate to the last modified # Synchronize largefile dirstate to the last modified
# time of the file # time of the file
lfdirstate.normal(lfile) lfdirstate.normal(lfile)
update1 = 1 update1 = 1
# copy the exec mode of largefile standin from the repository's # copy the exec mode of largefile standin from the repository's
# dirstate to its state in the lfdirstate. # dirstate to its state in the lfdirstate.
standin = lfutil.standin(lfile) standin = lfutil.standin(lfile)
if wvfs.exists(standin): if wvfs.exists(standin):
# exec is decided by the users permissions using mask 0o100 # exec is decided by the users permissions using mask 0o100
standinexec = wvfs.stat(standin).st_mode & 0o100 standinexec = wvfs.stat(standin).st_mode & 0o100
st = wvfs.stat(lfile) st = wvfs.stat(lfile)
mode = st.st_mode mode = st.st_mode
if standinexec != mode & 0o100: if standinexec != mode & 0o100:
# first remove all X bits, then shift all R bits to X # first remove all X bits, then shift all R bits to X
mode &= ~0o111 mode &= ~0o111
if standinexec: if standinexec:
mode |= (mode >> 2) & 0o111 & ~util.umask mode |= (mode >> 2) & 0o111 & ~util.umask
wvfs.chmod(lfile, mode) wvfs.chmod(lfile, mode)
update1 = 1 update1 = 1
updated += update1 updated += update1
lfutil.synclfdirstate(repo, lfdirstate, lfile, normallookup) lfutil.synclfdirstate(repo, lfdirstate, lfile, normallookup)
lfdirstate.write() lfdirstate.write()
if lfiles: if lfiles:
statuswriter( statuswriter(
_(b'%d largefiles updated, %d removed\n') % (updated, removed) _(b'%d largefiles updated, %d removed\n') % (updated, removed)
) )