Patchwork [06,of,19] localrepo: remove workingctx logic already moved to context

login
register
mail settings
Submitter Sean Farley
Date May 15, 2014, 9:16 p.m.
Message ID <d49a306617e4a3fad458.1400188584@laptop.local>
Download mbox | patch
Permalink /patch/4765/
State Accepted
Commit 1af854808a3c19abb4cfc687aa1e3a60deb8d091
Headers show

Comments

Sean Farley - May 15, 2014, 9:16 p.m.
# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1398130962 18000
#      Mon Apr 21 20:42:42 2014 -0500
# Node ID d49a306617e4a3fad4587c8e30ee71b80767011f
# Parent  83dbb0b4b5916f670f4a82bb4a218d39d4d00d13
localrepo: remove workingctx logic already moved to context

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1553,23 +1553,11 @@  class localrepository(object):
 
         modified, added, removed, deleted, unknown, ignored, clean = r
 
         if not parentworking:
             mf1 = ctx1._manifestmatches(match, r)
-            if working:
-                # we are comparing working dir against non-parent
-                # generate a pseudo-manifest for the working dir
-                mf2 = self['.']._manifestmatches(match, r)
-                for f in modified + added:
-                    mf2[f] = None
-                    mf2.set(f, ctx2.flags(f))
-                for f in removed:
-                    if f in mf2:
-                        del mf2[f]
-            else:
-                # we are comparing two revisions
-                mf2 = ctx2._manifestmatches(match, r)
+            mf2 = ctx2._manifestmatches(match, r)
 
             modified, added, clean = [], [], []
             deleted, unknown, ignored = r[3], [], []
             withflags = mf1.withflags() | mf2.withflags()
             for fn, mf2node in mf2.iteritems():