Mercurial > hg-stable
changeset 21475:c6976a4a39db
localrepo: call _prestatus hook instead of hardcoding dirstate knowledge
author | Sean Farley <sean.michael.farley@gmail.com> |
---|---|
date | Tue, 22 Apr 2014 12:43:20 -0500 |
parents | 6d7dcabb843f |
children | 168283c8dedf |
files | mercurial/localrepo.py |
diffstat | 1 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Mon Apr 21 22:12:59 2014 -0500 +++ b/mercurial/localrepo.py Tue Apr 22 12:43:20 2014 -0500 @@ -1550,9 +1550,7 @@ 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._buildstatus(ctx1, r, match, listignored, listclean,