Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/templater.py @ 2956:6dddcba7596a
merge.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Fri, 18 Aug 2006 21:17:28 -0700 |
| parents | 3d6efcbbd1c9 |
| children | e18c3d08528d |
line wrap: on
line diff
--- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -241,6 +241,7 @@ def nl2br(text): return text.replace('\n', '<br/>\n') def obfuscate(text): + text = unicode(text, 'utf-8', 'replace') return ''.join(['&#%d;' % ord(c) for c in text]) def domain(author): @@ -458,7 +459,7 @@ class changeset_templater(object): yield x if self.ui.debugflag: - files = self.repo.changes(log.parents(changenode)[0], changenode) + files = self.repo.status(log.parents(changenode)[0], changenode)[:3] def showfiles(**args): for x in showlist('file', files[0], **args): yield x def showadds(**args):