Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/hgweb.py @ 1637:3b1b44b917f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add new bdiff based unidiff generation.
author mason@suse.com
date Tue, 24 Jan 2006 15:02:10 +1300
parents 11cd38286fdb
children 8e9c203946ae
comparison
equal deleted inserted replaced
1636:7da32bb3d1d3 1637:3b1b44b917f4
268 modified, added, removed, deleted, unknown = r.changes(node1, node2) 268 modified, added, removed, deleted, unknown = r.changes(node1, node2)
269 if files: 269 if files:
270 modified, added, removed = map(lambda x: filterfiles(files, x), 270 modified, added, removed = map(lambda x: filterfiles(files, x),
271 (modified, added, removed)) 271 (modified, added, removed))
272 272
273 diffopts = self.repo.ui.diffopts()
274 showfunc = diffopts['showfunc']
275 ignorews = diffopts['ignorews']
273 for f in modified: 276 for f in modified:
274 to = r.file(f).read(mmap1[f]) 277 to = r.file(f).read(mmap1[f])
275 tn = r.file(f).read(mmap2[f]) 278 tn = r.file(f).read(mmap2[f])
276 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) 279 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
280 showfunc=showfunc, ignorews=ignorews), f, tn)
277 for f in added: 281 for f in added:
278 to = None 282 to = None
279 tn = r.file(f).read(mmap2[f]) 283 tn = r.file(f).read(mmap2[f])
280 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) 284 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
285 showfunc=showfunc, ignorews=ignorews), f, tn)
281 for f in removed: 286 for f in removed:
282 to = r.file(f).read(mmap1[f]) 287 to = r.file(f).read(mmap1[f])
283 tn = None 288 tn = None
284 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) 289 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
290 showfunc=showfunc, ignorews=ignorews), f, tn)
285 291
286 def changelog(self, pos): 292 def changelog(self, pos):
287 def changenav(**map): 293 def changenav(**map):
288 def seq(factor=1): 294 def seq(factor=1):
289 yield 1 * factor 295 yield 1 * factor