equal
deleted
inserted
replaced
95 modified, added, removed = repo.status(node1, node2, m)[:3] |
95 modified, added, removed = repo.status(node1, node2, m)[:3] |
96 empty = short(nullid) |
96 empty = short(nullid) |
97 |
97 |
98 for f in modified: |
98 for f in modified: |
99 # TODO get file permissions |
99 # TODO get file permissions |
100 ui.write( |
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 added: |
105 ui.write( |
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 removed: |
110 ui.write( |
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 |
115 ## |
115 ## |
164 |
164 |
165 ui.write((b"revision %d\n" % ctx.rev())) |
165 ui.write((b"revision %d\n" % ctx.rev())) |
166 ui.write((b"branch %s\n" % ctx.branch())) |
166 ui.write((b"branch %s\n" % ctx.branch())) |
167 if obsolete.isenabled(repo, obsolete.createmarkersopt): |
167 if obsolete.isenabled(repo, obsolete.createmarkersopt): |
168 if ctx.obsolete(): |
168 if ctx.obsolete(): |
169 ui.write(b"obsolete\n") |
169 ui.writenoi18n(b"obsolete\n") |
170 ui.write((b"phase %s\n\n" % ctx.phasestr())) |
170 ui.write((b"phase %s\n\n" % ctx.phasestr())) |
171 |
171 |
172 if prefix != b"": |
172 if prefix != b"": |
173 ui.write( |
173 ui.write( |
174 b"%s%s\n" % (prefix, description.replace(b'\n', nlprefix).strip()) |
174 b"%s%s\n" % (prefix, description.replace(b'\n', nlprefix).strip()) |