This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3711

context: make workingctx.matches() filter our removed files (API)
ClosedPublic

Authored by martinvonz on Jun 11 2018, 1:38 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGaaed058a0390: context: make workingctx.matches() filter our removed files (API)
Summary

It seems surprising that workingctx.matches() includes files that had
been removed in the working copy. The callers don't want that either
(besides the hg locate that was changed in the previous patch).

The only observable difference that I'm aware of is that `hg log -T
'wdir()' -r '{files(...)}'` will no longer include removed files (an
improvement, IMO). That matches hg files (but does not match the
deprecated hg locate).

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.Jun 11 2018, 1:38 PM
yuja added a subscriber: yuja.Jun 12 2018, 8:06 AM
It seems surprising that workingctx.matches() includes files that had
been removed in the working copy. The callers don't want that either
(besides the `hg locate` that was changed in the previous patch).
The only observable difference that I'm aware of is that `hg log -T
'wdir()' -r '{files(...)}'` will no longer include removed files (an
improvement, IMO). That matches `hg files` (but does not match the
deprecated `hg locate`).

Queued the series, thanks.

FWIW, ctx.matches() vs ctx.walk() is one of the most obscure API I can't
say what is the right behavior. :-)

Closed by commit rHGaaed058a0390: context: make workingctx.matches() filter our removed files (API) (authored by martinvonz). · Explain WhyJun 12 2018, 8:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (3 lines)
Mtests/test-command-template.t (6 lines)

Diff 9019

mercurial/context.py

def walk(self, match): def walk(self, match):
'''Generates matching file names.''' '''Generates matching file names.'''
return sorted(self._repo.dirstate.walk(match, return sorted(self._repo.dirstate.walk(match,
subrepos=sorted(self.substate), subrepos=sorted(self.substate),
unknown=True, ignored=False)) unknown=True, ignored=False))
def matches(self, match): def matches(self, match):
return sorted(self._repo.dirstate.matches(match)) ds = self._repo.dirstate
return sorted(f for f in ds.matches(match) if ds[f] != 'r')
def ancestors(self): def ancestors(self):
for p in self._parents: for p in self._parents:
yield p yield p
for a in self._repo.changelog.ancestors( for a in self._repo.changelog.ancestors(
[p.rev() for p in self._parents]): [p.rev() for p in self._parents]):
yield changectx(self._repo, a) yield changectx(self._repo, a)

tests/test-command-template.t

$ hg log -T "{rev}\n{join(files('aa'), '\n')}\n" $ hg log -T "{rev}\n{join(files('aa'), '\n')}\n"
2 2
aa aa
1 1
0 0
$ hg rm a
$ hg log -r "wdir()" -T "{rev}\n{join(files('*'), '\n')}\n"
2147483647
aa
b
$ hg revert a
Test relpath function Test relpath function
$ hg log -r0 -T '{files % "{file|relpath}\n"}' $ hg log -r0 -T '{files % "{file|relpath}\n"}'
a a
$ cd .. $ cd ..
$ hg log -R r -r0 -T '{files % "{file|relpath}\n"}' $ hg log -R r -r0 -T '{files % "{file|relpath}\n"}'
r/a r/a