This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11543

dirstate-item: use item's property instead of `state` in largefile
ClosedPublic

Authored by marmoute on Oct 1 2021, 5:40 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG82e142b9ad18: dirstate-item: use item's property instead of `state` in largefile

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

marmoute created this revision.Oct 1 2021, 5:40 AM
Alphare added a subscriber: Alphare.Oct 1 2021, 11:40 AM
Alphare added inline comments.
hgext/largefiles/lfutil.py
563

Shouldn't that also be taken care of?

marmoute added inline comments.Oct 1 2021, 11:41 AM
hgext/largefiles/lfutil.py
563

I remember taking care of this eventually, so this is either later in this series, or in the next series.

Alphare accepted this revision.Oct 1 2021, 11:58 AM
This revision is now accepted and ready to land.Oct 1 2021, 11:58 AM

Revision Contents
Changeset List

Diff 30543

hgext/largefiles/lfcommands.py

) )
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.get_entry(standin).any_tracked:
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.update_file( lfdirstate.update_file(

hgext/largefiles/lfutil.py

if matcher is None: if matcher is None:
matcher = getstandinmatcher(repo) matcher = getstandinmatcher(repo)
# ignore unknown files in working directory # ignore unknown files in working directory
return [ return [
splitstandin(f) splitstandin(f)
for f in repo[rev].walk(matcher) for f in repo[rev].walk(matcher)
if rev is not None or repo.dirstate[f] != b'?' if rev is not None or repo.dirstate.get_entry(f).any_tracked
] ]
def instore(repo, hash, forcelocal=False): def instore(repo, hash, forcelocal=False):
'''Return true if a largefile with the given hash exists in the store''' '''Return true if a largefile with the given hash exists in the store'''
return os.path.exists(storepath(repo, hash, forcelocal)) return os.path.exists(storepath(repo, hash, forcelocal))
return standins return standins
def synclfdirstate(repo, lfdirstate, lfile, normallookup): def synclfdirstate(repo, lfdirstate, lfile, normallookup):
lfstandin = standin(lfile) lfstandin = standin(lfile)
if lfstandin not in repo.dirstate: if lfstandin not in repo.dirstate:
lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=False) lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=False)
else: else:
stat = repo.dirstate._map[lfstandin] stat = repo.dirstate.get_entry(lfstandin)
state, mtime = stat.state, stat.mtime state, mtime = stat.state, stat.mtime
if state == b'n': if state == b'n':
AlphareUnsubmitted
Not Done

Shouldn't that also be taken care of?

Alphare: Shouldn't that also be taken care of?
marmouteAuthorUnsubmitted
Done

I remember taking care of this eventually, so this is either later in this series, or in the next series.

marmoute: I remember taking care of this eventually, so this is either later in this series, or in the…
if normallookup or mtime < 0 or not repo.wvfs.exists(lfile): if normallookup or mtime < 0 or not repo.wvfs.exists(lfile):
# state 'n' doesn't ensure 'clean' in this case # state 'n' doesn't ensure 'clean' in this case
lfdirstate.update_file( lfdirstate.update_file(
lfile, p1_tracked=True, wc_tracked=True, possibly_dirty=True lfile, p1_tracked=True, wc_tracked=True, possibly_dirty=True
) )
else: else:
lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True) lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)
elif state == b'm': elif state == b'm':
# Refresh all matching big files. It's possible that the # Refresh all matching big files. It's possible that the
# commit will end up failing, in which case the big files will # commit will end up failing, in which case the big files will
# stay refreshed. No harm done: the user modified them and # stay refreshed. No harm done: the user modified them and
# asked to commit them, so sooner or later we're going to # asked to commit them, so sooner or later we're going to
# refresh the standins. Might as well leave them refreshed. # refresh the standins. Might as well leave them refreshed.
lfdirstate = openlfdirstate(ui, repo) lfdirstate = openlfdirstate(ui, repo)
for fstandin in standins: for fstandin in standins:
lfile = splitstandin(fstandin) lfile = splitstandin(fstandin)
if lfdirstate[lfile] != b'r': if lfdirstate.get_entry(lfile).tracked:
updatestandin(repo, lfile, fstandin) updatestandin(repo, lfile, fstandin)
# Cook up a new matcher that only matches regular files or # Cook up a new matcher that only matches regular files or
# standins corresponding to the big files requested by the # standins corresponding to the big files requested by the
# user. Have to modify _files to prevent commit() from # user. Have to modify _files to prevent commit() from
# complaining "not tracked" for big files. # complaining "not tracked" for big files.
match = copy.copy(match) match = copy.copy(match)
origmatchfn = match.matchfn origmatchfn = match.matchfn
# Check both the list of largefiles and the list of # Check both the list of largefiles and the list of
# standins because if a largefile was removed, it # standins because if a largefile was removed, it
# won't be in the list of largefiles at this point # won't be in the list of largefiles at this point
match._files += sorted(standins) match._files += sorted(standins)
actualfiles = [] actualfiles = []
for f in match._files: for f in match._files:
fstandin = standin(f) fstandin = standin(f)
# For largefiles, only one of the normal and standin should be # For largefiles, only one of the normal and standin should be
# committed (except if one of them is a remove). In the case of a # committed (except if one of them is a remove). In the case of a
# standin removal, drop the normal file if it is unknown to dirstate. # standin removal, drop the normal file if it is unknown to dirstate.
# Thus, skip plain largefile names but keep the standin. # Thus, skip plain largefile names but keep the standin.
if f in lfiles or fstandin in standins: if f in lfiles or fstandin in standins:
if repo.dirstate[fstandin] != b'r': if not repo.dirstate.get_entry(fstandin).removed:
if repo.dirstate[f] != b'r': if not repo.dirstate.get_entry(f).removed:
continue continue
elif repo.dirstate[f] == b'?': elif not repo.dirstate.get_entry(f).any_tracked:
continue continue
actualfiles.append(f) actualfiles.append(f)
match._files = actualfiles match._files = actualfiles
def matchfn(f): def matchfn(f):
if origmatchfn(f): if origmatchfn(f):
return f not in lfiles return f not in lfiles

hgext/largefiles/overrides.py

) )
wctx = repo[None] wctx = repo[None]
matchfiles = [] matchfiles = []
for f in m._files: for f in m._files:
standin = lfutil.standin(f) standin = lfutil.standin(f)
if standin in ctx or standin in mctx: if standin in ctx or standin in mctx:
matchfiles.append(standin) matchfiles.append(standin)
elif standin in wctx or lfdirstate[f] == b'r': elif standin in wctx or lfdirstate.get_entry(f).removed:
continue continue
else: else:
matchfiles.append(f) matchfiles.append(f)
m._files = matchfiles m._files = matchfiles
m._fileset = set(m._files) m._fileset = set(m._files)
origmatchfn = m.matchfn origmatchfn = m.matchfn
def matchfn(f): def matchfn(f):
clean=False, clean=False,
unknown=False, unknown=False,
listsubrepos=False, listsubrepos=False,
): ):
r = oldstatus( r = oldstatus(
node1, node2, match, ignored, clean, unknown, listsubrepos node1, node2, match, ignored, clean, unknown, listsubrepos
) )
lfdirstate = lfutil.openlfdirstate(ui, repo) lfdirstate = lfutil.openlfdirstate(ui, repo)
unknown = [f for f in r.unknown if lfdirstate[f] == b'?'] unknown = [
ignored = [f for f in r.ignored if lfdirstate[f] == b'?'] f for f in r.unknown if not lfdirstate.get_entry(f).any_tracked
]
ignored = [
f for f in r.ignored if not lfdirstate.get_entry(f).any_tracked
]
return scmutil.status( return scmutil.status(
r.modified, r.added, r.removed, r.deleted, unknown, ignored, r.clean r.modified, r.added, r.removed, r.deleted, unknown, ignored, r.clean
) )
repo.status = overridestatus repo.status = overridestatus
orig(ui, repo, *dirs, **opts) orig(ui, repo, *dirs, **opts)
repo.status = oldstatus repo.status = oldstatus
@eh.wrapcommand(b'rollback') @eh.wrapcommand(b'rollback')
def overriderollback(orig, ui, repo, **opts): def overriderollback(orig, ui, repo, **opts):
with repo.wlock(): with repo.wlock():
before = repo.dirstate.parents() before = repo.dirstate.parents()
orphans = { orphans = {
f f
for f in repo.dirstate for f in repo.dirstate
if lfutil.isstandin(f) and repo.dirstate[f] != b'r' if lfutil.isstandin(f) and not repo.dirstate.get_entry(f).removed
} }
result = orig(ui, repo, **opts) result = orig(ui, repo, **opts)
after = repo.dirstate.parents() after = repo.dirstate.parents()
if before == after: if before == after:
return result # no need to restore standins return result # no need to restore standins
pctx = repo[b'.'] pctx = repo[b'.']
for f in repo.dirstate: for f in repo.dirstate:
if lfutil.isstandin(f): if lfutil.isstandin(f):
orphans.discard(f) orphans.discard(f)
if repo.dirstate[f] == b'r': if repo.dirstate.get_entry(f).removed:
repo.wvfs.unlinkpath(f, ignoremissing=True) repo.wvfs.unlinkpath(f, ignoremissing=True)
elif f in pctx: elif f in pctx:
fctx = pctx[f] fctx = pctx[f]
repo.wwrite(f, fctx.data(), fctx.flags()) repo.wwrite(f, fctx.data(), fctx.flags())
else: else:
# content of standin is not so important in 'a', # content of standin is not so important in 'a',
# 'm' or 'n' (coming from the 2nd parent) cases # 'm' or 'n' (coming from the 2nd parent) cases
lfutil.writestandin(repo, f, b'', False) lfutil.writestandin(repo, f, b'', False)