# HG changeset patch # User Sean Farley # Date 1397684088 18000 # Node ID 242637139efbbdde8b070482acd9f1900d81d7ea # Parent d13b4ecdb680d68b6899d98b886caa7f08e9d09e localrepo: reverse contexts in status This is a slight tweak to how localrepo.status calculates what files have changed. By forcing a changectx to be first operator and anything not a changectx to be the second operator, we can later exploit this to allow refactoring the status operation as a method of a context object. Furthermore, this change will speed up 'hg diff --reverse' when used with the working directory because the code will now hit a fast path without needing to calculate an unneeded second manifest. diff -r d13b4ecdb680 -r 242637139efb mercurial/localrepo.py --- a/mercurial/localrepo.py Fri May 16 13:18:57 2014 -0700 +++ b/mercurial/localrepo.py Wed Apr 16 16:34:48 2014 -0500 @@ -1523,6 +1523,24 @@ ctx1 = self[node1] ctx2 = self[node2] + # This next code block is, admittedly, fragile logic that tests for + # reversing the contexts and wouldn't need to exist if it weren't for + # the fast (and common) code path of comparing the working directory + # with its first parent. + # + # What we're aiming for here is the ability to call: + # + # workingctx.status(parentctx) + # + # If we always built the manifest for each context and compared those, + # then we'd be done. But the special case of the above call means we + # just copy the manifest of the parent. + reversed = False + if (not isinstance(ctx1, context.changectx) + and isinstance(ctx2, context.changectx)): + reversed = True + ctx1, ctx2 = ctx2, ctx1 + working = ctx2.rev() is None parentworking = working and ctx1 == self['.'] match = match or matchmod.always(self.root, self.getcwd()) @@ -1581,6 +1599,9 @@ if working: modified = ctx2._filtersuspectsymlink(modified) + if reversed: + added, removed = removed, added + r = modified, added, removed, deleted, unknown, ignored, clean if listsubrepos: