Show More
@@ -320,11 +320,13 b' class changeset_printer(object):' | |||||
320 |
|
320 | |||
321 | hexfunc = self.ui.debugflag and hex or short |
|
321 | hexfunc = self.ui.debugflag and hex or short | |
322 |
|
322 | |||
323 |
parents = |
|
323 | parents = log.parentrevs(rev) | |
324 |
|
|
324 | if not self.ui.debugflag: | |
325 | if (not self.ui.debugflag and len(parents) == 1 and |
|
325 | parents = [p for p in parents if p != -1] | |
326 |
parents |
|
326 | if len(parents) == 1 and parents[0] == rev-1: | |
327 | parents = [] |
|
327 | parents = [] | |
|
328 | parents = [(p, hexfunc(log.node(p))) for p in parents] | |||
|
329 | ||||
328 |
|
330 | |||
329 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) |
|
331 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) | |
330 |
|
332 | |||
@@ -1915,7 +1917,7 b' def log(ui, repo, *pats, **opts):' | |||||
1915 | rename = getrenamed(fn, rev, mf) |
|
1917 | rename = getrenamed(fn, rev, mf) | |
1916 | if rename: |
|
1918 | if rename: | |
1917 | copies.append((fn, rename[0])) |
|
1919 | copies.append((fn, rename[0])) | |
1918 | displayer.show(rev, brinfo=br, copies=copies) |
|
1920 | displayer.show(rev, changenode, brinfo=br, copies=copies) | |
1919 | if opts['patch']: |
|
1921 | if opts['patch']: | |
1920 | if parents: |
|
1922 | if parents: | |
1921 | prev = parents[0] |
|
1923 | prev = parents[0] |
General Comments 0
You need to be logged in to leave comments.
Login now