mercurial-scm/hg-stable: mercurial/commands.py comparison

comparison mercurial/commands.py @ 6762:f67d1468ac50

util: add sort helper

author	Matt Mackall <mpm@selenic.com>
date	Fri, 27 Jun 2008 18:28:45 -0500
parents	cb981fc955fb
children	8db64464d136

comparison

equal deleted inserted replaced

-:cb981fc955fb
+:f67d1468ac50
 Use the command 'hg update' to switch to an existing branch.
 """
 hexfunc = ui.debugflag and hex or short
 activebranches = [util.tolocal(repo[n].branch())
 for n in repo.heads()]
-branches = [(tag in activebranches, repo.changelog.rev(node), tag)
+branches = util.sort([(tag in activebranches, repo.changelog.rev(node), tag)
-for tag, node in repo.branchtags().items()]
+for tag, node in repo.branchtags().items()])
-branches.sort()
 branches.reverse()
 for isactive, node, tag in branches:
 if (not active) or isactive:
 if ui.quiet:
 options.append('-%s' % o[0])
 options.append('--%s' % o[1])
 ui.write("%s\n" % "\n".join(options))
 return
-clist = cmdutil.findpossible(ui, cmd, table).keys()
+ui.write("%s\n" % "\n".join(util.sort(cmdutil.findpossible(ui, cmd, table))))
-clist.sort()
-ui.write("%s\n" % "\n".join(clist))
 def debugfsinfo(ui, path = "."):
 file('.debugfsinfo', 'w').write('')
 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
 finally:
 del wlock
 def debugstate(ui, repo, nodates=None):
 """show the contents of the current dirstate"""
-k = repo.dirstate._map.items()
-k.sort()
 timestr = ""
 showdate = not nodates
-for file_, ent in k:
+for file_, ent in util.sort(repo.dirstate._map.items()):
 if showdate:
 if ent[3] == -1:
 # Pad or slice to locale representation
 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", time.localtime(0)))
 timestr = 'unset'
 if copied:
 copies.setdefault(rev, {})[fn] = copied[0]
 except revlog.LookupError:
 pass
 elif st == 'iter':
-states = matches[rev].items()
+for fn, m in util.sort(matches[rev].items()):
-states.sort()
-for fn, m in states:
 copy = copies.get(rev, {}).get(fn)
 if fn in skip:
 if copy:
 skip[copy] = True
 continue
 fstate[fn] = m
 if copy:
 fstate[copy] = m
 prev[fn] = rev
-fstate = fstate.items()
+for fn, state in util.sort(fstate.items()):
-fstate.sort()
-for fn, state in fstate:
 if fn in skip:
 continue
 if fn not in copies.get(prev[fn], {}):
 found = display(fn, rev, {}, state) or found
 return (not found and 1) or 0
 if not h:
 ui.status(_('no commands defined\n'))
 return
 ui.status(header)
-fns = h.keys()
+fns = util.sort(h)
-fns.sort()
 m = max(map(len, fns))
 for f in fns:
 if ui.verbose:
 commands = cmds[f].replace("|",", ")
 ui.write(" %s:\n      %s\n"%(commands, h[f]))
 else:
 remove, forget = deleted + clean, []
 warn(modified, _('is modified'))
 warn(added, _('has been marked for add'))
-files = remove + forget
+for f in util.sort(remove + forget):
-files.sort()
-for f in files:
 if ui.verbose or not m.exact(f):
 ui.status(_('removing %s\n') % m.rel(f))
 repo.forget(forget)
 repo.remove(remove, unlink=not after)
 (added, revert, remove, True, False),
 (removed, undelete, None, False, False),
 (deleted, revert, remove, False, False),
 )
-entries = names.items()
+for abs, (rel, exact) in util.sort(names.items()):
-entries.sort()
-for abs, (rel, exact) in entries:
 mfentry = mf.get(abs)
 target = repo.wjoin(abs)
 def handle(xlist, dobackup):
 xlist[0].append(abs)
 if dobackup and not opts['no_backup'] and util.lexists(target):

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 6762:f67d1468ac50