Mercurial > hg
view tests/printrevset.py @ 44805:02bf61bb4a70
copy: to find copy source, walk parent of revision we're marking copies in
As shown in the previous patch, `hg cp --after --at-rev . src dst`
fails if `src` is not in `.`. It seems obvious that you should always
walk the *parent* of the revision you're marking copies in, but that's
not how it was done for the working copy, and I didn't think to change
it when marking copies in a non-working-copy commit.
This patch fixes that by walking the parent commit instead, but only
if we're marking copies for a non-working-copy commit. We need to
leave the working-copy code unchanged because it depends on the weird
behavior of `workingctx.walk()`. With these changes, there's very
little overlap between the working-copy version and the
non-working-copy version of `walkpats()`, but I've refrained from
cleaning that up on the stable branch.
Differential Revision: https://phab.mercurial-scm.org/D8494
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 06 May 2020 10:33:56 -0700 |
parents | 2372284d9457 |
children | a717de1cb624 |
line wrap: on
line source
from __future__ import absolute_import from mercurial import ( cmdutil, commands, extensions, logcmdutil, revsetlang, smartset, ) from mercurial.utils import stringutil def logrevset(repo, pats, opts): revs = logcmdutil._initialrevs(repo, opts) if not revs: return None match, pats, slowpath = logcmdutil._makematcher(repo, revs, pats, opts) return logcmdutil._makerevset(repo, match, pats, slowpath, opts) def uisetup(ui): def printrevset(orig, repo, pats, opts): revs, filematcher = orig(repo, pats, opts) if opts.get(b'print_revset'): expr = logrevset(repo, pats, opts) if expr: tree = revsetlang.parse(expr) tree = revsetlang.analyze(tree) else: tree = [] ui = repo.ui ui.write(b'%s\n' % stringutil.pprint(opts.get(b'rev', []))) ui.write(revsetlang.prettyformat(tree) + b'\n') ui.write(stringutil.prettyrepr(revs) + b'\n') revs = smartset.baseset() # display no revisions return revs, filematcher extensions.wrapfunction(logcmdutil, 'getrevs', printrevset) aliases, entry = cmdutil.findcmd(b'log', commands.table) entry[1].append( ( b'', b'print-revset', False, b'print generated revset and exit (DEPRECATED)', ) )