| hg-reviewers |
I though we had one, but actually we don't seem to. So here is a revset to reuse
a list of node previously stored.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/revset.py (45 lines) | |||
| M | tests/test-default-push.t (1 line) | |||
| M | tests/test-revset.t (15 lines) |
| fctx, fromline, toline | fctx, fromline, toline | ||||
| ) | ) | ||||
| ), | ), | ||||
| iterasc=False, | iterasc=False, | ||||
| ) | ) | ||||
| return subset & rs | return subset & rs | ||||
| @predicate(b'nodefromfile(path)') | |||||
| def nodefromfile(repo, subset, x): | |||||
| """ | |||||
| An alias for ``::.`` (ancestors of the working directory's first parent). | |||||
| If file pattern is specified, the histories of files matching given | |||||
| pattern in the revision given by startrev are followed, including copies. | |||||
| """ | |||||
| path = getstring(x, _(b"nodefromfile require a file path")) | |||||
| listed_rev = set() | |||||
| try: | |||||
| with pycompat.open(path, 'rb') as f: | |||||
| for line in f: | |||||
| n = line.strip() | |||||
| rn = _node(repo, n) | |||||
| if rn is not None: | |||||
| listed_rev.add(rn) | |||||
| except IOError as exc: | |||||
| m = _(b'cannot open nodes file "%s": %s') | |||||
| m %= (path, encoding.strtolocal(exc.strerror)) | |||||
| raise error.Abort(m) | |||||
| return subset & baseset(listed_rev) | |||||
| @predicate(b'all()', safe=True) | @predicate(b'all()', safe=True) | ||||
| def getall(repo, subset, x): | def getall(repo, subset, x): | ||||
| """All changesets, the same as ``0:tip``.""" | """All changesets, the same as ``0:tip``.""" | ||||
| # i18n: "all" is a keyword | # i18n: "all" is a keyword | ||||
| getargs(x, 0, 0, _(b"all takes no arguments")) | getargs(x, 0, 0, _(b"all takes no arguments")) | ||||
| return subset & spanset(repo) # drop "null" if any | return subset & spanset(repo) # drop "null" if any | ||||
| for name in ns.listnames(repo): | for name in ns.listnames(repo): | ||||
| if name not in ns.deprecated: | if name not in ns.deprecated: | ||||
| names.update(repo[n].rev() for n in ns.nodes(repo, name)) | names.update(repo[n].rev() for n in ns.nodes(repo, name)) | ||||
| names -= {nullrev} | names -= {nullrev} | ||||
| return subset & names | return subset & names | ||||
| @predicate(b'id(string)', safe=True) | def _node(repo, n): | ||||
| def node_(repo, subset, x): | """process a node input""" | ||||
| """Revision non-ambiguously specified by the given hex string prefix.""" | rn = None | ||||
| # i18n: "id" is a keyword | |||||
| l = getargs(x, 1, 1, _(b"id requires one argument")) | |||||
| # i18n: "id" is a keyword | |||||
| n = getstring(l[0], _(b"id requires a string")) | |||||
| if len(n) == 40: | if len(n) == 40: | ||||
| try: | try: | ||||
| rn = repo.changelog.rev(bin(n)) | rn = repo.changelog.rev(bin(n)) | ||||
| except error.WdirUnsupported: | except error.WdirUnsupported: | ||||
| rn = wdirrev | rn = wdirrev | ||||
| except (LookupError, TypeError): | except (LookupError, TypeError): | ||||
| rn = None | rn = None | ||||
| else: | else: | ||||
| rn = None | |||||
| try: | try: | ||||
| pm = scmutil.resolvehexnodeidprefix(repo, n) | pm = scmutil.resolvehexnodeidprefix(repo, n) | ||||
| if pm is not None: | if pm is not None: | ||||
| rn = repo.changelog.rev(pm) | rn = repo.changelog.rev(pm) | ||||
| except LookupError: | except LookupError: | ||||
| pass | pass | ||||
| except error.WdirUnsupported: | except error.WdirUnsupported: | ||||
| rn = wdirrev | rn = wdirrev | ||||
| return rn | |||||
| @predicate(b'id(string)', safe=True) | |||||
| def node_(repo, subset, x): | |||||
| """Revision non-ambiguously specified by the given hex string prefix.""" | |||||
| # i18n: "id" is a keyword | |||||
| l = getargs(x, 1, 1, _(b"id requires one argument")) | |||||
| # i18n: "id" is a keyword | |||||
| n = getstring(l[0], _(b"id requires a string")) | |||||
| rn = _node(repo, n) | |||||
| if rn is None: | if rn is None: | ||||
| return baseset() | return baseset() | ||||
| result = baseset([rn]) | result = baseset([rn]) | ||||
| return result & subset | return result & subset | ||||
| @predicate(b'none()', safe=True) | @predicate(b'none()', safe=True) | ||||
| adding file changes | adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
| Invalid :pushrev raises appropriately | Invalid :pushrev raises appropriately | ||||
| $ hg --config 'paths.default:pushrev=notdefined()' push | $ hg --config 'paths.default:pushrev=notdefined()' push | ||||
| pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob) | pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob) | ||||
| hg: parse error: unknown identifier: notdefined | hg: parse error: unknown identifier: notdefined | ||||
| (did you mean nodefromfile?) | |||||
| [10] | [10] | ||||
| $ hg --config 'paths.default:pushrev=(' push | $ hg --config 'paths.default:pushrev=(' push | ||||
| pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob) | pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob) | ||||
| hg: parse error at 1: not a prefix: end | hg: parse error at 1: not a prefix: end | ||||
| (( | (( | ||||
| ^ here) | ^ here) | ||||
| [10] | [10] | ||||
| 1 | 1 | ||||
| 2 | 2 | ||||
| $ log 'expectsize(0:2, 4:)' | $ log 'expectsize(0:2, 4:)' | ||||
| abort: revset size mismatch. expected between 4 and 11, got 3 | abort: revset size mismatch. expected between 4 and 11, got 3 | ||||
| [255] | [255] | ||||
| $ log 'expectsize(0:2, :2)' | $ log 'expectsize(0:2, :2)' | ||||
| abort: revset size mismatch. expected between 0 and 2, got 3 | abort: revset size mismatch. expected between 0 and 2, got 3 | ||||
| [255] | [255] | ||||
| Test getting list of node from file | |||||
| $ hg log -r '0:2' -T '{node}\n' > some.nodes | |||||
| $ hg log -r 'nodefromfile("some.nodes")' -T '{rev}\n' | |||||
| 0 | |||||
| 1 | |||||
| 2 | |||||
| $ hg log -r 'nodefromfile("missing-file")' -T '{rev}\n' | |||||
| abort: cannot open nodes file "missing-file": $ENOENT$ | |||||
| [255] | |||||
| $ echo bad-node > bad.nodes | |||||
| $ hg log -r 'nodefromfile("bad.nodes")' -T '{rev}\n' | |||||
| $ echo abcdefabcdefabcdeabcdeabcdeabcdeabcdeabc > missing.nodes | |||||