206 mmap2 = mf.read(change2[0]) |
206 mmap2 = mf.read(change2[0]) |
207 date1 = self.date(change1) |
207 date1 = self.date(change1) |
208 date2 = self.date(change2) |
208 date2 = self.date(change2) |
209 |
209 |
210 c, a, d, u = r.changes(node1, node2) |
210 c, a, d, u = r.changes(node1, node2) |
211 c, a, d = map(lambda x: filterfiles(x, files), (c, a, d)) |
211 if files: |
|
212 c, a, d = map(lambda x: filterfiles(x, files), (c, a, d)) |
212 |
213 |
213 for f in c: |
214 for f in c: |
214 to = r.file(f).read(mmap1[f]) |
215 to = r.file(f).read(mmap1[f]) |
215 tn = r.file(f).read(mmap2[f]) |
216 tn = r.file(f).read(mmap2[f]) |
216 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
217 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
359 for f in changes[3]: |
360 for f in changes[3]: |
360 files.append(self.t("filenodelink", |
361 files.append(self.t("filenodelink", |
361 filenode = hex(mf.get(f, nullid)), file = f)) |
362 filenode = hex(mf.get(f, nullid)), file = f)) |
362 |
363 |
363 def diff(): |
364 def diff(): |
364 yield self.diff(p1, n, changes[3]) |
365 yield self.diff(p1, n, None) |
365 |
366 |
366 yield self.t('changeset', |
367 yield self.t('changeset', |
367 diff = diff, |
368 diff = diff, |
368 rev = cl.rev(n), |
369 rev = cl.rev(n), |
369 node = nodeid, |
370 node = nodeid, |