Show More
@@ -3424,7 +3424,6 b' def log(ui, repo, *pats, **opts):' | |||||
3424 | if opts.get('graph'): |
|
3424 | if opts.get('graph'): | |
3425 | if linerange: |
|
3425 | if linerange: | |
3426 | raise error.Abort(_('graph not supported with line range patterns')) |
|
3426 | raise error.Abort(_('graph not supported with line range patterns')) | |
3427 | return logcmdutil.graphlog(ui, repo, revs, differ, opts) |
|
|||
3428 |
|
3427 | |||
3429 | if linerange: |
|
3428 | if linerange: | |
3430 | revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) |
|
3429 | revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) | |
@@ -3439,6 +3438,10 b' def log(ui, repo, *pats, **opts):' | |||||
3439 | ui.pager('log') |
|
3438 | ui.pager('log') | |
3440 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ, |
|
3439 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ, | |
3441 | buffered=True) |
|
3440 | buffered=True) | |
|
3441 | if opts.get('graph'): | |||
|
3442 | logcmdutil.graphlog(ui, repo, revs, displayer, getrenamed) | |||
|
3443 | return | |||
|
3444 | ||||
3442 | for rev in revs: |
|
3445 | for rev in revs: | |
3443 | ctx = repo[rev] |
|
3446 | ctx = repo[rev] | |
3444 | copies = None |
|
3447 | copies = None |
@@ -899,19 +899,8 b' def displaygraph(ui, repo, dag, displaye' | |||||
899 | lines = [] |
|
899 | lines = [] | |
900 | displayer.close() |
|
900 | displayer.close() | |
901 |
|
901 | |||
902 |
def graphlog(ui, repo, revs, di |
|
902 | def graphlog(ui, repo, revs, displayer, getrenamed): | |
903 | # Parameters are identical to log command ones |
|
|||
904 | revdag = graphmod.dagwalker(repo, revs) |
|
903 | revdag = graphmod.dagwalker(repo, revs) | |
905 |
|
||||
906 | getrenamed = None |
|
|||
907 | if opts.get('copies'): |
|
|||
908 | endrev = None |
|
|||
909 | if opts.get('rev'): |
|
|||
910 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
|
|||
911 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
|||
912 |
|
||||
913 | ui.pager('log') |
|
|||
914 | displayer = changesetdisplayer(ui, repo, opts, differ, buffered=True) |
|
|||
915 | displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed) |
|
904 | displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed) | |
916 |
|
905 | |||
917 | def checkunsupportedgraphflags(pats, opts): |
|
906 | def checkunsupportedgraphflags(pats, opts): |
General Comments 0
You need to be logged in to leave comments.
Login now