Mercurial > hg > mercurial-crew-with-dirclash
comparison contrib/hgk.py @ 1619:1ba0d7041ac4
Distinguish removed and deleted files. Tests are not fixed yet.
hg status will now show "R filename" for "hg rm"ed files and
"! filename" for files which were deleted manually.
Manually deleted files are considered unmodified.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 12 Jan 2006 13:58:36 +0100 |
parents | ff339dd21976 |
children | f2b1df3dbcbb |
comparison
equal
deleted
inserted
replaced
1618:ff339dd21976 | 1619:1ba0d7041ac4 |
---|---|
13 def date(c): | 13 def date(c): |
14 return time.asctime(time.gmtime(c[2][0])) | 14 return time.asctime(time.gmtime(c[2][0])) |
15 | 15 |
16 if not changes: | 16 if not changes: |
17 changes = repo.changes(node1, node2, files, match=match) | 17 changes = repo.changes(node1, node2, files, match=match) |
18 modified, added, removed, unknown = changes | 18 modified, added, removed, deleted, unknown = changes |
19 if files: | 19 if files: |
20 modified, added, removed = map(lambda x: filterfiles(x, files), | 20 modified, added, removed = map(lambda x: filterfiles(x, files), |
21 (modified, added, removed)) | 21 (modified, added, removed)) |
22 | 22 |
23 if not modified and not added and not removed: | 23 if not modified and not added and not removed: |
65 return time.asctime(time.gmtime(c[2][0])) | 65 return time.asctime(time.gmtime(c[2][0])) |
66 | 66 |
67 if node2: | 67 if node2: |
68 change = repo.changelog.read(node2) | 68 change = repo.changelog.read(node2) |
69 mmap2 = repo.manifest.read(change[0]) | 69 mmap2 = repo.manifest.read(change[0]) |
70 modified, added, removed, unknown = repo.changes(node1, node2) | 70 modified, added, removed, deleted, unknown = repo.changes(node1, node2) |
71 def read(f): return repo.file(f).read(mmap2[f]) | 71 def read(f): return repo.file(f).read(mmap2[f]) |
72 date2 = date(change) | 72 date2 = date(change) |
73 else: | 73 else: |
74 date2 = time.asctime() | 74 date2 = time.asctime() |
75 modified, added, removed, unknown = repo.changes(node1) | 75 modified, added, removed, deleted, unknown = repo.changes(node1) |
76 if not node1: | 76 if not node1: |
77 node1 = repo.dirstate.parents()[0] | 77 node1 = repo.dirstate.parents()[0] |
78 def read(f): return file(os.path.join(repo.root, f)).read() | 78 def read(f): return file(os.path.join(repo.root, f)).read() |
79 | 79 |
80 change = repo.changelog.read(node1) | 80 change = repo.changelog.read(node1) |