mercurial/commands.py
changeset 347 a0b2758edee7
parent 330 27d08c0c2a7e
child 349 b2293093b89e
equal deleted inserted replaced
330:27d08c0c2a7e 347:a0b2758edee7
    79         filerev = rev
    79         filerev = rev
    80         node = filenode = filelog.node(filerev)
    80         node = filenode = filelog.node(filerev)
    81         changerev = filelog.linkrev(filenode)
    81         changerev = filelog.linkrev(filenode)
    82         changenode = changenode or changelog.node(changerev)
    82         changenode = changenode or changelog.node(changerev)
    83     else:
    83     else:
       
    84         log = changelog
    84         changerev = rev
    85         changerev = rev
    85         log = changelog
       
    86         if changenode is None:
    86         if changenode is None:
    87             changenode = changelog.node(changerev)
    87             changenode = changelog.node(changerev)
    88         elif not changerev:
    88         elif not changerev:
    89             rev = changerev = changelog.rev(changenode)
    89             rev = changerev = changelog.rev(changenode)
    90         node = changenode
    90         node = changenode
    92     if ui.quiet:
    92     if ui.quiet:
    93         ui.write("%d:%s\n" % (rev, hg.hex(node)))
    93         ui.write("%d:%s\n" % (rev, hg.hex(node)))
    94         return
    94         return
    95 
    95 
    96     changes = changelog.read(changenode)
    96     changes = changelog.read(changenode)
    97     description = changes[4].strip().splitlines()
       
    98 
    97 
    99     parents = [(log.rev(parent), hg.hex(parent))
    98     parents = [(log.rev(parent), hg.hex(parent))
   100                for parent in log.parents(node)
    99                for parent in log.parents(node)
   101                if ui.debugflag or parent != hg.nullid]
   100                if ui.debugflag or parent != hg.nullid]
   102     if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
   101     if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
   115                                           hg.hex(changes[0])))
   114                                           hg.hex(changes[0])))
   116     ui.status("user:        %s\n" % changes[1])
   115     ui.status("user:        %s\n" % changes[1])
   117     ui.status("date:        %s\n" % time.asctime(
   116     ui.status("date:        %s\n" % time.asctime(
   118         time.localtime(float(changes[2].split(' ')[0]))))
   117         time.localtime(float(changes[2].split(' ')[0]))))
   119     ui.note("files:       %s\n" % " ".join(changes[3]))
   118     ui.note("files:       %s\n" % " ".join(changes[3]))
       
   119     description = changes[4].strip()
   120     if description:
   120     if description:
   121         if ui.verbose:
   121         if ui.verbose:
   122             ui.status("description:\n")
   122             ui.status("description:\n")
   123             ui.status(changes[4].strip())
   123             ui.status(description)
   124             ui.status("\n")
   124             ui.status("\n\n")
   125         else:
   125         else:
   126             ui.status("summary:     %s\n" % description[0])
   126             ui.status("summary:     %s\n" % description.splitlines()[0])
   127     ui.status("\n")
   127     ui.status("\n")
   128 
   128 
   129 def help(ui, cmd=None):
   129 def help(ui, cmd=None):
   130     '''show help for a given command or all commands'''
   130     '''show help for a given command or all commands'''
   131     if cmd:
   131     if cmd: