This is an archive of the discontinued Mercurial Phabricator instance.

Differential D847

dirstate: use keyword arguments to clarify status()'s callers
ClosedPublic

Authored by martinvonz on Sep 29 2017, 5:53 PM.

Details

Reviewers
quark
yuja
Group Reviewers
hg-reviewers
Commits
rHGac0cd81e2f83: dirstate: use keyword arguments to clarify status()'s callers
Summary

The arguments are especially non-obvious because the order is
different from dirstate.walk().

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.Sep 29 2017, 5:53 PM
quark accepted this revision.Sep 29 2017, 6:00 PM
yuja accepted this revision.Sep 30 2017, 2:17 AM
yuja added a subscriber: yuja.
yuja added inline comments.
hgext/largefiles/overrides.py
1222

s/ignores/ignored/

Fixed in flight.

This revision is now accepted and ready to land.Sep 30 2017, 2:17 AM
Closed by commit rHGac0cd81e2f83: dirstate: use keyword arguments to clarify status()'s callers (authored by martinvonz). · Explain WhySep 30 2017, 2:28 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2171

hgext/largefiles/lfutil.py

for standin in standins: for standin in standins:
lfile = splitstandin(standin) lfile = splitstandin(standin)
lfdirstate.normallookup(lfile) lfdirstate.normallookup(lfile)
return lfdirstate return lfdirstate
def lfdirstatestatus(lfdirstate, repo): def lfdirstatestatus(lfdirstate, repo):
pctx = repo['.'] pctx = repo['.']
match = matchmod.always(repo.root, repo.getcwd()) match = matchmod.always(repo.root, repo.getcwd())
unsure, s = lfdirstate.status(match, [], False, False, False) unsure, s = lfdirstate.status(match, subrepos=[], ignored=False,
clean=False, unknown=False)
modified, clean = s.modified, s.clean modified, clean = s.modified, s.clean
for lfile in unsure: for lfile in unsure:
try: try:
fctx = pctx[standin(lfile)] fctx = pctx[standin(lfile)]
except LookupError: except LookupError:
fctx = None fctx = None
if not fctx or readasstandin(fctx) != hashfile(repo.wjoin(lfile)): if not fctx or readasstandin(fctx) != hashfile(repo.wjoin(lfile)):
modified.append(lfile) modified.append(lfile)
if match is None or match.always(): if match is None or match.always():
# Spend a bit of time here to get a list of files we know # Spend a bit of time here to get a list of files we know
# are modified so we can compare only against those. # are modified so we can compare only against those.
# It can cost a lot of time (several seconds) # It can cost a lot of time (several seconds)
# otherwise to update all standins if the largefiles are # otherwise to update all standins if the largefiles are
# large. # large.
lfdirstate = openlfdirstate(ui, repo) lfdirstate = openlfdirstate(ui, repo)
dirtymatch = matchmod.always(repo.root, repo.getcwd()) dirtymatch = matchmod.always(repo.root, repo.getcwd())
unsure, s = lfdirstate.status(dirtymatch, [], False, False, unsure, s = lfdirstate.status(dirtymatch, subrepos=[], ignored=False,
False) clean=False, unknown=False)
modifiedfiles = unsure + s.modified + s.added + s.removed modifiedfiles = unsure + s.modified + s.added + s.removed
lfiles = listlfiles(repo) lfiles = listlfiles(repo)
# this only loops through largefiles that exist (not # this only loops through largefiles that exist (not
# removed/renamed) # removed/renamed)
for lfile in lfiles: for lfile in lfiles:
if lfile in modifiedfiles: if lfile in modifiedfiles:
fstandin = standin(lfile) fstandin = standin(lfile)
if repo.wvfs.exists(fstandin): if repo.wvfs.exists(fstandin):

hgext/largefiles/overrides.py

def scmutiladdremove(orig, repo, matcher, prefix, opts=None, dry_run=None, def scmutiladdremove(orig, repo, matcher, prefix, opts=None, dry_run=None,
similarity=None): similarity=None):
if opts is None: if opts is None:
opts = {} opts = {}
if not lfutil.islfilesrepo(repo): if not lfutil.islfilesrepo(repo):
return orig(repo, matcher, prefix, opts, dry_run, similarity) return orig(repo, matcher, prefix, opts, dry_run, similarity)
# Get the list of missing largefiles so we can remove them # Get the list of missing largefiles so we can remove them
lfdirstate = lfutil.openlfdirstate(repo.ui, repo) lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
unsure, s = lfdirstate.status(matchmod.always(repo.root, repo.getcwd()), [], unsure, s = lfdirstate.status(matchmod.always(repo.root, repo.getcwd()),
False, False, False) subrepos=[], ignored=False, clean=False,
yujaUnsubmitted
Not Done

s/ignores/ignored/

Fixed in flight.

yuja: s/ignores/ignored/ Fixed in flight.
unknown=False)
# Call into the normal remove code, but the removing of the standin, we want # Call into the normal remove code, but the removing of the standin, we want
# to have handled by original addremove. Monkey patching here makes sure # to have handled by original addremove. Monkey patching here makes sure
# we don't remove the standin in the largefiles code, preventing a very # we don't remove the standin in the largefiles code, preventing a very
# confused state later. # confused state later.
if s.deleted: if s.deleted:
m = copy.copy(matcher) m = copy.copy(matcher)
# o | o | o | (*) # o | o | o | (*)
# #
# (*) don't care # (*) don't care
# (*1) deprecated, but used internally (e.g: "rebase --collapse") # (*1) deprecated, but used internally (e.g: "rebase --collapse")
lfdirstate = lfutil.openlfdirstate(repo.ui, repo) lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
unsure, s = lfdirstate.status(matchmod.always(repo.root, unsure, s = lfdirstate.status(matchmod.always(repo.root,
repo.getcwd()), repo.getcwd()),
[], False, True, False) subrepos=[], ignored=False,
clean=True, unknown=False)
oldclean = set(s.clean) oldclean = set(s.clean)
pctx = repo['.'] pctx = repo['.']
dctx = repo[node] dctx = repo[node]
for lfile in unsure + s.modified: for lfile in unsure + s.modified:
lfileabs = repo.wvfs.join(lfile) lfileabs = repo.wvfs.join(lfile)
if not repo.wvfs.exists(lfileabs): if not repo.wvfs.exists(lfileabs):
continue continue
lfhash = lfutil.hashfile(lfileabs) lfhash = lfutil.hashfile(lfileabs)

hgext/largefiles/reposetup.py

sf = lfutil.standin(f) sf = lfutil.standin(f)
dirstate = self.dirstate dirstate = self.dirstate
return sf in dirstate or sf in dirstate.dirs() return sf in dirstate or sf in dirstate.dirs()
match._files = [f for f in match._files match._files = [f for f in match._files
if sfindirstate(f)] if sfindirstate(f)]
# Don't waste time getting the ignored and unknown # Don't waste time getting the ignored and unknown
# files from lfdirstate # files from lfdirstate
unsure, s = lfdirstate.status(match, [], False, listclean, unsure, s = lfdirstate.status(match, subrepos=[],
False) ignored=False,
clean=listclean,
unknown=False)
(modified, added, removed, deleted, clean) = ( (modified, added, removed, deleted, clean) = (
s.modified, s.added, s.removed, s.deleted, s.clean) s.modified, s.added, s.removed, s.deleted, s.clean)
if parentworking: if parentworking:
for lfile in unsure: for lfile in unsure:
standin = lfutil.standin(lfile) standin = lfutil.standin(lfile)
if standin not in ctx1: if standin not in ctx1:
# from second parent # from second parent
modified.append(lfile) modified.append(lfile)

mercurial/context.py

except error.LockError: except error.LockError:
pass pass
finally: finally:
# Even if the wlock couldn't be grabbed, clear out the list. # Even if the wlock couldn't be grabbed, clear out the list.
self._repo.clearpostdsstatus() self._repo.clearpostdsstatus()
def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False): def _dirstatestatus(self, match, ignored=False, clean=False, unknown=False):
'''Gets the status from the dirstate -- internal use only.''' '''Gets the status from the dirstate -- internal use only.'''
listignored, listclean, listunknown = ignored, clean, unknown
subrepos = [] subrepos = []
if '.hgsub' in self: if '.hgsub' in self:
subrepos = sorted(self.substate) subrepos = sorted(self.substate)
cmp, s = self._repo.dirstate.status(match, subrepos, listignored, cmp, s = self._repo.dirstate.status(match, subrepos, ignored=ignored,
listclean, listunknown) clean=clean, unknown=unknown)
# check for any possibly clean files # check for any possibly clean files
fixup = [] fixup = []
if cmp: if cmp:
modified2, deleted2, fixup = self._checklookup(cmp) modified2, deleted2, fixup = self._checklookup(cmp)
s.modified.extend(modified2) s.modified.extend(modified2)
s.deleted.extend(deleted2) s.deleted.extend(deleted2)
if fixup and listclean: if fixup and clean:
s.clean.extend(fixup) s.clean.extend(fixup)
self._poststatusfixup(s, fixup) self._poststatusfixup(s, fixup)
if match.always(): if match.always():
# cache for performance # cache for performance
if s.unknown or s.ignored or s.clean: if s.unknown or s.ignored or s.clean:
# "_status" is cached with list*=False in the normal route # "_status" is cached with list*=False in the normal route