--- a/mercurial/debugcommands.py Thu Feb 02 09:59:47 2017 +0100
+++ b/mercurial/debugcommands.py Thu Feb 02 10:00:26 2017 +0100
@@ -1457,6 +1457,44 @@
(abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
pa.distance(pb), rel))
+@command('debugrebuilddirstate|debugrebuildstate',
+ [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
+ ('', 'minimal', None, _('only rebuild files that are inconsistent with '
+ 'the working copy parent')),
+ ],
+ _('[-r REV]'))
+def debugrebuilddirstate(ui, repo, rev, **opts):
+ """rebuild the dirstate as it would look like for the given revision
+
+ If no revision is specified the first current parent will be used.
+
+ The dirstate will be set to the files of the given revision.
+ The actual working directory content or existing dirstate
+ information such as adds or removes is not considered.
+
+ ``minimal`` will only rebuild the dirstate status for files that claim to be
+ tracked but are not in the parent manifest, or that exist in the parent
+ manifest but are not in the dirstate. It will not change adds, removes, or
+ modified files that are in the working copy parent.
+
+ One use of this command is to make the next :hg:`status` invocation
+ check the actual file content.
+ """
+ ctx = scmutil.revsingle(repo, rev)
+ with repo.wlock():
+ dirstate = repo.dirstate
+ changedfiles = None
+ # See command doc for what minimal does.
+ if opts.get('minimal'):
+ manifestfiles = set(ctx.manifest().keys())
+ dirstatefiles = set(dirstate)
+ manifestonly = manifestfiles - dirstatefiles
+ dsonly = dirstatefiles - manifestfiles
+ dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
+ changedfiles = manifestonly | dsnotadded
+
+ dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
+
@command('debugupgraderepo', [
('o', 'optimize', [], _('extra optimization to perform'), _('NAME')),
('', 'run', False, _('performs an upgrade')),