From patchwork Wed Dec 24 00:44:14 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [4, of, 5] trydiff: use 'not in addedset' for symmetry with 'not in
 removedset'
From: Martin von Zweigbergk <martinvonz@google.com>
X-Patchwork-Id: 7223
Message-Id: <09218e2b5e5da5349166.1419381854@martinvonz.mtv.corp.google.com>
To: mercurial-devel@selenic.com
Date: Tue, 23 Dec 2014 16:44:14 -0800

# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1419380700 28800
#      Tue Dec 23 16:25:00 2014 -0800
# Node ID 09218e2b5e5da534916698fb524567625bff9ec3
# Parent  66f1754efb9b0578b09347c40734fbe37598f6e7
trydiff: use 'not in addedset' for symmetry with 'not in removedset'

With the previous change in place, we can safely use 'addedset'.

diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -1807,7 +1807,7 @@
         tn = None
         dodiff = True
         header = []
-        if f in man1:
+        if f not in addedset:
             to = getfilectx(f, ctx1).data()
         if f not in removedset:
             tn = getfilectx(f, ctx2).data()