Mercurial > hg
changeset 5056:34a54cc5df1b
imerge: sorted() is only available in python2.4 and above
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 02 Aug 2007 14:04:51 +0200 |
parents | 56d48aed1f69 |
children | 99a4592ea886 |
files | hgext/imerge.py |
diffstat | 1 files changed, 13 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/imerge.py Thu Aug 02 14:04:00 2007 +0200 +++ b/hgext/imerge.py Thu Aug 02 14:04:51 2007 +0200 @@ -92,16 +92,18 @@ if not os.path.isdir(self.path): os.mkdir(self.path) - fd = self.opener('status', 'wb') + statusfile = self.opener('status', 'wb') out = [hex(n.node()) for n in self.parents] out.append(str(len(self.conflicts))) - for f in sorted(self.conflicts): - out.append(f) - out.extend(self.conflicts[f]) + conflicts = self.conflicts.items() + conflicts.sort() + for fw, fd_fo in conflicts: + out.append(fw) + out.extend(fd_fo) out.extend(self.resolved) - fd.write('\0'.join(out)) + statusfile.write('\0'.join(out)) def remaining(self): return [f for f in self.conflicts if f not in self.resolved] @@ -164,7 +166,8 @@ if fn not in self.conflicts: raise util.Abort('%s is not in the merge set' % fn) resolved[fn] = True - self.resolved = sorted(resolved) + self.resolved = resolved.keys() + self.resolved.sort() self.save() return 0 @@ -174,7 +177,8 @@ if fn not in resolved: raise util.Abort('%s is not resolved' % fn) del resolved[fn] - self.resolved = sorted(resolved) + self.resolved = resolved.keys() + self.resolved.sort() self.save() return 0 @@ -264,7 +268,8 @@ if not cmd: raise cmdutil.UnknownCommand('imerge ' + c) if len(cmd) > 1: - raise cmdutil.AmbiguousCommand('imerge ' + c, sorted(cmd)) + cmd.sort() + raise cmdutil.AmbiguousCommand('imerge ' + c, cmd) cmd = cmd[0] func = subcmdtable[cmd]