Submitter | Laurent Charignon |
---|---|
Date | Dec. 23, 2015, 9:20 p.m. |
Message ID | <f6769ae3b7cb32f18041.1450905621@mbuchanan-mbp.DHCP.thefacebook.com> |
Download | mbox | patch |
Permalink | /patch/12329/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -38,8 +38,11 @@ def _getfsnow(vfs): def nonnomalentries(dmap): '''Compute the nonnormal dirstate entries from the dmap''' - return set(fname for fname, e in dmap.iteritems() - if e[0] != 'n' or e[3] == -1) + try: + return parsers.nonnormalentries(dmap) + except AttributeError: + return set(fname for fname, e in dmap.iteritems() + if e[0] != 'n' or e[3] == -1) def _trypending(root, vfs, filename): '''Open file to be read according to HG_PENDING environment variable