Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/hgweb/hgweb_mod.py @ 2928:27da6dddd0ee
merge with tah
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 18 Aug 2006 13:07:35 +0200 |
parents | ef8ee4477019 ee6ed2b29e1a |
children | cff3c58a5766 |
comparison
equal
deleted
inserted
replaced
2926:13cd2cdeff6a | 2928:27da6dddd0ee |
---|---|
132 modified, added, removed, deleted, unknown = r.status(node1, node2)[:5] | 132 modified, added, removed, deleted, unknown = r.status(node1, node2)[:5] |
133 if files: | 133 if files: |
134 modified, added, removed = map(lambda x: filterfiles(files, x), | 134 modified, added, removed = map(lambda x: filterfiles(files, x), |
135 (modified, added, removed)) | 135 (modified, added, removed)) |
136 | 136 |
137 diffopts = patch.diffopts(ui) | 137 diffopts = patch.diffopts(self.repo.ui) |
138 for f in modified: | 138 for f in modified: |
139 to = r.file(f).read(mmap1[f]) | 139 to = r.file(f).read(mmap1[f]) |
140 tn = r.file(f).read(mmap2[f]) | 140 tn = r.file(f).read(mmap2[f]) |
141 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, | 141 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, |
142 opts=diffopts), f, tn) | 142 opts=diffopts), f, tn) |