From patchwork Thu Nov 13 06:29:53 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1, of,
 4] context.status: wipe deleted/unknown/ignored fields when reversed
From: Martin von Zweigbergk <martinvonz@google.com>
X-Patchwork-Id: 6699
Message-Id: <4efe64f7b1b244f9224a.1415860193@martinvonz.mtv.corp.google.com>
To: mercurial-devel@selenic.com
Date: Wed, 12 Nov 2014 22:29:53 -0800

# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1415855947 28800
#      Wed Nov 12 21:19:07 2014 -0800
# Node ID 4efe64f7b1b244f9224a0706bb98f358e24e3dd3
# Parent  3480c07fc934a9c90c8dda1ed2bc98fd9c96c44a
context.status: wipe deleted/unknown/ignored fields when reversed

It makes no sense to request reverse status (i.e. changes from the
working copy to its parent) and then look at the deleted, unknown or
ignored fields. If you do, you would get the result from the forward
status (changes from parent to the working copy). Instead of giving a
nonsensical answer to a nonsensical question, it seems a little saner
to return empty lists. It might be best if we could prevent the caller
accessing these lists, but it's doubtful it's worth the trouble.

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -304,9 +304,12 @@
         r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
                               listunknown)
 
+        r = scmutil.status(*r)
         if reversed:
-            # reverse added and removed
-            r[1], r[2] = r[2], r[1]
+            # Reverse added and removed. Clear deleted, unknown and ignored as
+            # these make no sense to reverse.
+            r = scmutil.status(r.modified, r.removed, r.added, [], [], [],
+                               r.clean)
 
         if listsubrepos:
             for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
@@ -325,8 +328,7 @@
         for l in r:
             l.sort()
 
-        # we return a tuple to signify that this list isn't changing
-        return scmutil.status(*r)
+        return r
 
 
 def makememctx(repo, parents, text, user, date, branch, files, store,