diff -r 32a2a1e244f1 -r a1a5a57efe90 mercurial/changelog.py --- a/mercurial/changelog.py Sun Apr 26 16:50:44 2009 -0500 +++ b/mercurial/changelog.py Sun Apr 26 16:50:44 2009 -0500 @@ -155,7 +155,7 @@ def encode_extra(self, d): # keys must be sorted to produce a deterministic changelog entry - items = [_string_escape('%s:%s' % (k, d[k])) for k in util.sort(d)] + items = [_string_escape('%s:%s' % (k, d[k])) for k in sorted(d)] return "\0".join(items) def read(self, node): @@ -216,6 +216,6 @@ if extra: extra = self.encode_extra(extra) parseddate = "%s %s" % (parseddate, extra) - l = [hex(manifest), user, parseddate] + util.sort(files) + ["", desc] + l = [hex(manifest), user, parseddate] + sorted(files) + ["", desc] text = "\n".join(l) return self.addrevision(text, transaction, len(self), p1, p2)