Mercurial > hg
view tests/printrevset.py @ 45375:8c466bcb0879
revert: remove dangerous `parents` argument from `cmdutil.revert()`
As we found out the hard way (thanks to spectral@ for figuring it
out!), `cmdutil.revert()`'s `parents` argument must be
`repo.dirstate.parents()` or things may go wrong. We had an extension
that passed in the target commit as the first parent. The `hg split`
command from the evolve extension seems to have made the same mistake,
but I haven't looked carefully.
The problem is that `cmdutil._performrevert()` calls
`dirstate.normal()` on reverted files if the commit to revert to
equals the first parent. So if you pass in `ctx=foo` and
`parents=(foo.node(), nullid)`, then `dirstate.normal()` will be
called for the revert files, even though they might not be clean in
the working copy.
There doesn't seem to be any reason, other than a tiny performance
benefit, to passing the `parents` around instead of looking them up
again in `cmdutil._performrevert()`, so that's what this patch does.
Differential Revision: https://phab.mercurial-scm.org/D8925
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 10 Aug 2020 21:46:47 -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)', ) )