Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/hgweb/hgweb_mod.py @ 6776:39319a457dda
merge with mpm
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Sat, 28 Jun 2008 09:28:01 +0200 |
parents | 0dbb56e90a71 f6c00b17387c |
children | 44c5157474e7 |
comparison
equal
deleted
inserted
replaced
6775:54ccf41761c9 | 6776:39319a457dda |
---|---|
304 line=l, | 304 line=l, |
305 lineid="l%s" % lineno, | 305 lineid="l%s" % lineno, |
306 linenumber="% 8s" % lineno) | 306 linenumber="% 8s" % lineno) |
307 | 307 |
308 r = self.repo | 308 r = self.repo |
309 c1 = r.changectx(node1) | 309 c1 = r[node1] |
310 c2 = r.changectx(node2) | 310 c2 = r[node2] |
311 date1 = util.datestr(c1.date()) | 311 date1 = util.datestr(c1.date()) |
312 date2 = util.datestr(c2.date()) | 312 date2 = util.datestr(c2.date()) |
313 | 313 |
314 modified, added, removed, deleted, unknown = r.status(node1, node2)[:5] | 314 modified, added, removed, deleted, unknown = r.status(node1, node2)[:5] |
315 if files: | 315 if files: |