# HG changeset patch # User Durham Goode # Date 1422417146 28800 # Node ID 6156edaa82aab1193875f8ccd9c2cbe5661996b9 # Parent f1c127df7c4f645db6538a56d9a1c416505796cc revert: move prefetch to after the actions logic The prefetch logic came before the actual population of the actions collection, so it was always being passed an empty action list. This fixes it by moving it to after that logic. The only consumer of this function at the moment is remotefilelog, and I verified it works with this change. diff -r f1c127df7c4f -r 6156edaa82aa mercurial/cmdutil.py --- a/mercurial/cmdutil.py Wed Jan 28 13:34:20 2015 -0500 +++ b/mercurial/cmdutil.py Tue Jan 27 19:52:26 2015 -0800 @@ -2765,9 +2765,6 @@ (unknown, actions['unknown'], discard), ) - needdata = ('revert', 'add', 'undelete') - _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata]) - wctx = repo[None] for abs, (rel, exact) in sorted(names.items()): # target file to be touch on disk (relative to cwd) @@ -2797,6 +2794,9 @@ if not opts.get('dry_run'): + needdata = ('revert', 'add', 'undelete') + _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata]) + _performrevert(repo, parents, ctx, actions) # get the list of subrepos that must be reverted