Mercurial > hg
comparison mercurial/subrepo.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 | a56ba57c837d |
children | 03726f5b6092 |
comparison
equal
deleted
inserted
replaced
45374:bd56597b2254 | 45375:8c466bcb0879 |
---|---|
984 if not opts.get('dry_run'): | 984 if not opts.get('dry_run'): |
985 self.get(substate, overwrite=True) | 985 self.get(substate, overwrite=True) |
986 | 986 |
987 def filerevert(self, *pats, **opts): | 987 def filerevert(self, *pats, **opts): |
988 ctx = self._repo[opts['rev']] | 988 ctx = self._repo[opts['rev']] |
989 parents = self._repo.dirstate.parents() | |
990 if opts.get('all'): | 989 if opts.get('all'): |
991 pats = [b'set:modified()'] | 990 pats = [b'set:modified()'] |
992 else: | 991 else: |
993 pats = [] | 992 pats = [] |
994 cmdutil.revert(self.ui, self._repo, ctx, parents, *pats, **opts) | 993 cmdutil.revert(self.ui, self._repo, ctx, *pats, **opts) |
995 | 994 |
996 def shortid(self, revid): | 995 def shortid(self, revid): |
997 return revid[:12] | 996 return revid[:12] |
998 | 997 |
999 @annotatesubrepoerror | 998 @annotatesubrepoerror |