equal
deleted
inserted
replaced
49 os.close(tmpfd) |
49 os.close(tmpfd) |
50 vfs.unlink(tmpname) |
50 vfs.unlink(tmpname) |
51 |
51 |
52 def nonnormalentries(dmap): |
52 def nonnormalentries(dmap): |
53 '''Compute the nonnormal dirstate entries from the dmap''' |
53 '''Compute the nonnormal dirstate entries from the dmap''' |
54 return set(fname for fname, e in dmap.iteritems() |
54 try: |
55 if e[0] != 'n' or e[3] == -1) |
55 return parsers.nonnormalentries(dmap) |
|
56 except AttributeError: |
|
57 return set(fname for fname, e in dmap.iteritems() |
|
58 if e[0] != 'n' or e[3] == -1) |
56 |
59 |
57 def _trypending(root, vfs, filename): |
60 def _trypending(root, vfs, filename): |
58 '''Open file to be read according to HG_PENDING environment variable |
61 '''Open file to be read according to HG_PENDING environment variable |
59 |
62 |
60 This opens '.pending' of specified 'filename' only when HG_PENDING |
63 This opens '.pending' of specified 'filename' only when HG_PENDING |