Mercurial > public > mercurial-scm > hg-stable
diff mercurial/changelog.py @ 6762:f67d1468ac50
util: add sort helper
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 27 Jun 2008 18:28:45 -0500 |
| parents | fb42030d79d6 |
| children | f29b674cc221 |
line wrap: on
line diff
--- a/mercurial/changelog.py Fri Jun 27 14:53:30 2008 -0500 +++ b/mercurial/changelog.py Fri Jun 27 18:28:45 2008 -0500 @@ -130,9 +130,7 @@ def encode_extra(self, d): # keys must be sorted to produce a deterministic changelog entry - keys = d.keys() - keys.sort() - items = [_string_escape('%s:%s' % (k, d[k])) for k in keys] + items = [_string_escape('%s:%s' % (k, d[k])) for k in util.sort(d)] return "\0".join(items) def read(self, node): @@ -175,7 +173,7 @@ files = l[3:] return (manifest, user, (time, timezone), files, desc, extra) - def add(self, manifest, list, desc, transaction, p1=None, p2=None, + def add(self, manifest, files, desc, transaction, p1=None, p2=None, user=None, date=None, extra={}): user, desc = util.fromlocal(user), util.fromlocal(desc) @@ -189,7 +187,6 @@ if extra: extra = self.encode_extra(extra) parseddate = "%s %s" % (parseddate, extra) - list.sort() - l = [hex(manifest), user, parseddate] + list + ["", desc] + l = [hex(manifest), user, parseddate] + util.sort(files) + ["", desc] text = "\n".join(l) return self.addrevision(text, transaction, len(self), p1, p2)