Patchwork [11,of,19] localrepo: call _prestatus hook instead of hardcoding dirstate knowledge

login
register
mail settings
Submitter Sean Farley
Date May 15, 2014, 9:16 p.m.
Message ID <975876989faeebc2c515.1400188589@laptop.local>
Download mbox | patch
Permalink /patch/4770/
State Accepted
Commit c6976a4a39db2a6f9b89208680da662566471dc1
Headers show

Comments

Sean Farley - May 15, 2014, 9:16 p.m.
# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1398188600 18000
#      Tue Apr 22 12:43:20 2014 -0500
# Node ID 975876989faeebc2c515bd17171b9cc7413822fd
# Parent  fc447ebc4465a7e53beafa1a5ffb3e151a8c4b47
localrepo: call _prestatus hook instead of hardcoding dirstate knowledge

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1545,13 +1545,11 @@  class localrepository(object):
                 if f not in ctx1 and f not in ctx1.dirs():
                     self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg))
             match.bad = bad
 
         r = [[], [], [], [], [], [], []]
-        if working: # we need to scan the working dir
-            r = ctx2._dirstatestatus(match=match, ignored=listignored,
-                                     clean=listclean, unknown=listunknown)
+        r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown)
 
         if not parentworking:
             r = ctx2._generatestatus(ctx1, s, match, listignored, listclean,
                                      listunknown)