This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6414

narrow: consider empty commits to be "inside the narrow spec" for templates
ClosedPublic

Authored by hooper on May 20 2019, 9:19 PM.

Details

Reviewers
durin42
martinvonz
pulkit
Group Reviewers
hg-reviewers
Commits
rHG45c18f7345c1: narrow: consider empty commits to be "inside the narrow spec" for templates
Summary

It doesn't seem useful to exclude them, or harmful to include them. Users
writing log templates using outsidenarrow as a predicate might consider it
unexpected if their locally created empty drafts are treated as if they
contained something outside the clone.

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

hooper created this revision.May 20 2019, 9:19 PM
pulkit accepted this revision.May 22 2019, 12:19 PM
Closed by commit rHG45c18f7345c1: narrow: consider empty commits to be "inside the narrow spec" for templates (authored by hooper). · Explain WhyMay 22 2019, 12:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowtemplates.py (2 lines)
Mtests/test-narrow.t (4 lines)

Diff 15221

hgext/narrow/narrowtemplates.py

@templatekeyword('outsidenarrow', requires={'repo', 'ctx'}) @templatekeyword('outsidenarrow', requires={'repo', 'ctx'})
def outsidenarrow(context, mapping): def outsidenarrow(context, mapping):
"""String. 'outsidenarrow' if the change affects no tracked files, """String. 'outsidenarrow' if the change affects no tracked files,
else ''.""" else ''."""
repo = context.resource(mapping, 'repo') repo = context.resource(mapping, 'repo')
ctx = context.resource(mapping, 'ctx') ctx = context.resource(mapping, 'ctx')
m = repo.narrowmatch() m = repo.narrowmatch()
if not m.always(): if ctx.files() and not m.always():
if not any(m(f) for f in ctx.files()): if not any(m(f) for f in ctx.files()):
return 'outsidenarrow' return 'outsidenarrow'
return '' return ''
@revsetpredicate('ellipsis()') @revsetpredicate('ellipsis()')
def ellipsisrevset(repo, subset, x): def ellipsisrevset(repo, subset, x):
"""Changesets that are ellipsis nodes.""" """Changesets that are ellipsis nodes."""
return subset.filter(lambda r: _isellipsis(repo, r)) return subset.filter(lambda r: _isellipsis(repo, r))

tests/test-narrow.t

$ test -d d0 $ test -d d0
[1] [1]
Do some work in the empty clone Do some work in the empty clone
$ hg diff --change . $ hg diff --change .
$ hg branch foo $ hg branch foo
marked working directory as branch foo marked working directory as branch foo
(branches are permanent and global, did you want a bookmark?) (branches are permanent and global, did you want a bookmark?)
$ hg ci -m empty $ hg ci -m empty
$ hg log -T "{rev}: {desc} {outsidenarrow}\n"
2: empty
1: add d5/f outsidenarrow
0: add d0/f outsidenarrow
$ hg pull -q $ hg pull -q
Can widen the empty clone Can widen the empty clone
$ hg tracked --addinclude d0 $ hg tracked --addinclude d0
comparing with ssh://user@dummy/master comparing with ssh://user@dummy/master
searching for changes searching for changes
no changes found no changes found
saved backup bundle to $TESTTMP/narrow-empty/.hg/strip-backup/*-widen.hg (glob) saved backup bundle to $TESTTMP/narrow-empty/.hg/strip-backup/*-widen.hg (glob)
adding changesets adding changesets