90 if files is None: |
90 if files is None: |
91 files = [] |
91 files = [] |
92 mmap = repo[node1].manifest() |
92 mmap = repo[node1].manifest() |
93 mmap2 = repo[node2].manifest() |
93 mmap2 = repo[node2].manifest() |
94 m = scmutil.match(repo[node1], files) |
94 m = scmutil.match(repo[node1], files) |
95 modified, added, removed = repo.status(node1, node2, m)[:3] |
95 st = repo.status(node1, node2, m) |
96 empty = short(nullid) |
96 empty = short(nullid) |
97 |
97 |
98 for f in modified: |
98 for f in st.modified: |
99 # TODO get file permissions |
99 # TODO get file permissions |
100 ui.writenoi18n( |
100 ui.writenoi18n( |
101 b":100664 100664 %s %s M\t%s\t%s\n" |
101 b":100664 100664 %s %s M\t%s\t%s\n" |
102 % (short(mmap[f]), short(mmap2[f]), f, f) |
102 % (short(mmap[f]), short(mmap2[f]), f, f) |
103 ) |
103 ) |
104 for f in added: |
104 for f in st.added: |
105 ui.writenoi18n( |
105 ui.writenoi18n( |
106 b":000000 100664 %s %s N\t%s\t%s\n" |
106 b":000000 100664 %s %s N\t%s\t%s\n" |
107 % (empty, short(mmap2[f]), f, f) |
107 % (empty, short(mmap2[f]), f, f) |
108 ) |
108 ) |
109 for f in removed: |
109 for f in st.removed: |
110 ui.writenoi18n( |
110 ui.writenoi18n( |
111 b":100664 000000 %s %s D\t%s\t%s\n" |
111 b":100664 000000 %s %s D\t%s\t%s\n" |
112 % (short(mmap[f]), empty, f, f) |
112 % (short(mmap[f]), empty, f, f) |
113 ) |
113 ) |
114 |
114 |