mercurial-crew-with-dirclash: comparison mercurial/commands.py

equal deleted inserted replaced

-:96d034d02d61
+:fb493241d7f6
 return
 changes = log.read(changenode)
 date = util.datestr(changes[2])
-parents = [(log.rev(p), self.ui.verbose and hex(p) or short(p))
+hexfunc = self.ui.debugflag and hex or short
-for p in log.parents(changenode)
+parents = [(log.rev(p), hexfunc(p)) for p in log.parents(changenode)
 if self.ui.debugflag or p != nullid]
 if (not self.ui.debugflag and len(parents) == 1 and
 parents[0][0] == rev-1):
 parents = []
-if self.ui.verbose:
+self.ui.write(_("changeset:   %d:%s\n") % (rev, hexfunc(changenode)))
-self.ui.write(_("changeset:   %d:%s\n") % (rev, hex(changenode)))
-else:
-self.ui.write(_("changeset:   %d:%s\n") % (rev, short(changenode)))
 for tag in self.repo.nodetags(changenode):
 self.ui.status(_("tag:         %s\n") % tag)
 for parent in parents:
 self.ui.write(_("parent:      %d:%s\n") % parent)
 parents = [p for p in repo.dirstate.parents() if p != nullid]
 if not parents:
 ui.write(_("unknown\n"))
 return
-hexfunc = ui.verbose and hex or short
+hexfunc = ui.debugflag and hex or short
 modified, added, removed, deleted = repo.status()[:4]
 output = ["%s%s" %
 ('+'.join([hexfunc(parent) for parent in parents]),
 (modified or added or removed or deleted) and "+" or "")]
 This lists both regular and local tags.
 """
 l = repo.tagslist()
 l.reverse()
+hexfunc = ui.debugflag and hex or short
 for t, n in l:
 try:
-r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
+r = "%5d:%s" % (repo.changelog.rev(n), hexfunc(n))
 except KeyError:
 r = "    ?:?"
 if ui.quiet:
 ui.write("%s\n" % t)
 else:

changeset 2973	fb493241d7f6
parent 2963	a8546e40070a
child 2974	eef469259745