# HG changeset patch # User FUJIWARA Katsunori # Date 2015-07-08 08:01:09 # Node ID 72d395e399c162ada601f994c5631ab81b80f8e3 # Parent 19cc443aac34633b3fa3463b9d570ad959e7997c cmdutil: remove useless dirstate.normallookup() invocation in revert() Explicit 'dirstate.normallookup()' invocation in 'revert()' is useless now, because previous patch fixed the relevant issue by writing in-memory dirstate changes out at the end of dirty check. 'dirstate.normallookup()' invocation was introduced by 21b33f0460e0 to avoid occasional test failure (see issue4583 for detail). This is partial backout of it (added tests are still left). diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -3068,7 +3068,7 @@ def _performrevert(repo, parents, ctx, a node = ctx.node() def checkout(f): fc = ctx[f] - return repo.wwrite(f, fc.data(), fc.flags()) + repo.wwrite(f, fc.data(), fc.flags()) audit_path = pathutil.pathauditor(repo.root) for f in actions['forget'][0]: @@ -3135,13 +3135,9 @@ def _performrevert(repo, parents, ctx, a del fp else: for f in actions['revert'][0]: - wsize = checkout(f) + checkout(f) if normal: normal(f) - elif wsize == repo.dirstate._map[f][2]: - # changes may be overlooked without normallookup, - # if size isn't changed at reverting - repo.dirstate.normallookup(f) for f in actions['add'][0]: # Don't checkout modified files, they are already created by the diff