Mercurial > hg
view tests/printrevset.py @ 48976:877d7e1a4223 stable
amend: fix amend with copies in extras
If copy information is stored only in the commit extras and not in
filelogs, then they get lost on amend if the file wasn't also modified
in the working copy. That's because we create `filectx` object from
the old commit in those cases, and the `.copysource()` of such objects
read only from the filelog. This patch fixes it by always creating a
new `memfilectx` in these cases, passing the calculated copy
information to it.
Differential Revision: https://phab.mercurial-scm.org/D12387
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 18 Mar 2022 21:15:54 -0700 |
parents | c1d0f83d62c4 |
children | 6000f5b25c9b |
line wrap: on
line source
from __future__ import absolute_import from mercurial.thirdparty import attr from mercurial import ( cmdutil, commands, extensions, logcmdutil, revsetlang, smartset, ) from mercurial.utils import stringutil def logrevset(repo, wopts): revs = logcmdutil._initialrevs(repo, wopts) if not revs: return None match, pats, slowpath = logcmdutil._makematcher(repo, revs, wopts) wopts = attr.evolve(wopts, pats=pats) return logcmdutil._makerevset(repo, wopts, slowpath) def uisetup(ui): def printrevset(orig, repo, wopts): revs, filematcher = orig(repo, wopts) if wopts.opts.get(b'print_revset'): expr = logrevset(repo, wopts) if expr: tree = revsetlang.parse(expr) tree = revsetlang.analyze(tree) else: tree = [] ui = repo.ui ui.write(b'%s\n' % stringutil.pprint(wopts.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)', ) )