This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4068

narrow: move status-filtering to core and to ctx
ClosedPublic

Authored by martinvonz on Aug 3 2018, 3:14 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGe411774a2e0f: narrow: move status-filtering to core and to ctx
Summary

One of my recent changes from repo.status(ctx1, ctx2) to
ctx1.status(ctx2) broke some of our Google-internal tests. The problem
turned out to be that the narrow extension was overriding
repo.status() to make it filter out paths outside the narrowspec. When
I changed to ctx1.status(ctx2), then that filtering obviously got
lost. ctx.status() seems like a better method to do the filtering in,
so this patch moves the filtering into that method, thereby also
moving it out of the extension and into core.

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.Aug 3 2018, 3:14 AM
Closed by commit rHGe411774a2e0f: narrow: move status-filtering to core and to ctx (authored by martinvonz). · Explain WhyAug 3 2018, 9:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowrepo.py (18 lines)
Mmercurial/context.py (4 lines)

Diff 9819

hgext/narrow/narrowrepo.py

# narrowrepo.py - repository which supports narrow revlogs, lazy loading # narrowrepo.py - repository which supports narrow revlogs, lazy loading
# #
# Copyright 2017 Google, Inc. # Copyright 2017 Google, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
changegroup, changegroup,
hg, hg,
narrowspec, narrowspec,
scmutil,
) )
from . import ( from . import (
narrowdirstate, narrowdirstate,
narrowrevlog, narrowrevlog,
) )
def wrappostshare(orig, sourcerepo, destrepo, **kwargs): def wrappostshare(orig, sourcerepo, destrepo, **kwargs):
class narrowrepository(repo.__class__): class narrowrepository(repo.__class__):
def file(self, f): def file(self, f):
fl = super(narrowrepository, self).file(f) fl = super(narrowrepository, self).file(f)
narrowrevlog.makenarrowfilelog(fl, self.narrowmatch()) narrowrevlog.makenarrowfilelog(fl, self.narrowmatch())
return fl return fl
# I'm not sure this is the right place to do this filter.
# context._manifestmatches() would probably be better, or perhaps
# move it to a later place, in case some of the callers do want to know
# which directories changed. This seems to work for now, though.
def status(self, *args, **kwargs):
s = super(narrowrepository, self).status(*args, **kwargs)
narrowmatch = self.narrowmatch()
modified = list(filter(narrowmatch, s.modified))
added = list(filter(narrowmatch, s.added))
removed = list(filter(narrowmatch, s.removed))
deleted = list(filter(narrowmatch, s.deleted))
unknown = list(filter(narrowmatch, s.unknown))
ignored = list(filter(narrowmatch, s.ignored))
clean = list(filter(narrowmatch, s.clean))
return scmutil.status(modified, added, removed, deleted, unknown,
ignored, clean)
def _makedirstate(self): def _makedirstate(self):
dirstate = super(narrowrepository, self)._makedirstate() dirstate = super(narrowrepository, self)._makedirstate()
return narrowdirstate.wrapdirstate(self, dirstate) return narrowdirstate.wrapdirstate(self, dirstate)
repo.__class__ = narrowrepository repo.__class__ = narrowrepository

mercurial/context.py

rev2 = None rev2 = None
submatch = matchmod.subdirmatcher(subpath, match) submatch = matchmod.subdirmatcher(subpath, match)
s = sub.status(rev2, match=submatch, ignored=listignored, s = sub.status(rev2, match=submatch, ignored=listignored,
clean=listclean, unknown=listunknown, clean=listclean, unknown=listunknown,
listsubrepos=True) listsubrepos=True)
for rfiles, sfiles in zip(r, s): for rfiles, sfiles in zip(r, s):
rfiles.extend("%s/%s" % (subpath, f) for f in sfiles) rfiles.extend("%s/%s" % (subpath, f) for f in sfiles)
narrowmatch = self._repo.narrowmatch()
if not narrowmatch.always():
for l in r:
l[:] = list(filter(narrowmatch, l))
for l in r: for l in r:
l.sort() l.sort()
return r return r
class changectx(basectx): class changectx(basectx):
"""A changecontext object makes access to data related to a particular """A changecontext object makes access to data related to a particular
changeset convenient. It represents a read-only context already present in changeset convenient. It represents a read-only context already present in