equal
deleted
inserted
replaced
171 def diffblock(diff, f, fn): |
171 def diffblock(diff, f, fn): |
172 yield self.t("diffblock", |
172 yield self.t("diffblock", |
173 lines = prettyprintlines(diff), |
173 lines = prettyprintlines(diff), |
174 parity = parity[0], |
174 parity = parity[0], |
175 file = f, |
175 file = f, |
176 filenode = hex(fn)) |
176 filenode = hex(fn or nullid)) |
177 parity[0] = 1 - parity[0] |
177 parity[0] = 1 - parity[0] |
178 |
178 |
179 def prettyprintlines(diff): |
179 def prettyprintlines(diff): |
180 for l in diff.splitlines(1): |
180 for l in diff.splitlines(1): |
181 if l.startswith('+'): |
181 if l.startswith('+'): |
299 |
299 |
300 files = [] |
300 files = [] |
301 mf = self.repo.manifest.read(changes[0]) |
301 mf = self.repo.manifest.read(changes[0]) |
302 for f in changes[3]: |
302 for f in changes[3]: |
303 files.append(self.t("filenodelink", |
303 files.append(self.t("filenodelink", |
304 filenode = hex(mf[f]), file = f)) |
304 filenode = hex(mf.get(f, nullid)), file = f)) |
305 |
305 |
306 def diff(): |
306 def diff(): |
307 yield self.diff(p1, n, changes[3]) |
307 yield self.diff(p1, n, changes[3]) |
308 |
308 |
309 yield self.t('changeset', |
309 yield self.t('changeset', |