Show More
@@ -13,7 +13,6 b' revision graph is also shown.' | |||||
13 | ''' |
|
13 | ''' | |
14 |
|
14 | |||
15 | from mercurial.cmdutil import show_changeset |
|
15 | from mercurial.cmdutil import show_changeset | |
16 | from mercurial.commands import templateopts |
|
|||
17 | from mercurial.i18n import _ |
|
16 | from mercurial.i18n import _ | |
18 | from mercurial.node import nullrev |
|
17 | from mercurial.node import nullrev | |
19 | from mercurial import cmdutil, commands, extensions, scmutil |
|
18 | from mercurial import cmdutil, commands, extensions, scmutil | |
@@ -457,12 +456,28 b' def generate(ui, dag, displayer, showpar' | |||||
457 | displayer.close() |
|
456 | displayer.close() | |
458 |
|
457 | |||
459 | @command('glog', |
|
458 | @command('glog', | |
460 |
[(' |
|
459 | [('f', 'follow', None, | |
461 | _('limit number of changes displayed'), _('NUM')), |
|
460 | _('follow changeset history, or file history across copies and renames')), | |
462 | ('p', 'patch', False, _('show patch')), |
|
461 | ('', 'follow-first', None, | |
|
462 | _('only follow the first parent of merge changesets (DEPRECATED)')), | |||
|
463 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), | |||
|
464 | ('C', 'copies', None, _('show copied files')), | |||
|
465 | ('k', 'keyword', [], | |||
|
466 | _('do case-insensitive search for a given text'), _('TEXT')), | |||
463 | ('r', 'rev', [], _('show the specified revision or range'), _('REV')), |
|
467 | ('r', 'rev', [], _('show the specified revision or range'), _('REV')), | |
464 | ] + templateopts, |
|
468 | ('', 'removed', None, _('include revisions where files were removed')), | |
465 | _('hg glog [OPTION]... [FILE]')) |
|
469 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), | |
|
470 | ('u', 'user', [], _('revisions committed by user'), _('USER')), | |||
|
471 | ('', 'only-branch', [], | |||
|
472 | _('show only changesets within the given named branch (DEPRECATED)'), | |||
|
473 | _('BRANCH')), | |||
|
474 | ('b', 'branch', [], | |||
|
475 | _('show changesets within the given named branch'), _('BRANCH')), | |||
|
476 | ('P', 'prune', [], | |||
|
477 | _('do not display revision or any of its ancestors'), _('REV')), | |||
|
478 | ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')), | |||
|
479 | ] + commands.logopts + commands.walkopts, | |||
|
480 | _('[OPTION]... [FILE]')) | |||
466 | def graphlog(ui, repo, *pats, **opts): |
|
481 | def graphlog(ui, repo, *pats, **opts): | |
467 | """show revision history alongside an ASCII revision graph |
|
482 | """show revision history alongside an ASCII revision graph | |
468 |
|
483 | |||
@@ -473,8 +488,6 b' def graphlog(ui, repo, *pats, **opts):' | |||||
473 | directory. |
|
488 | directory. | |
474 | """ |
|
489 | """ | |
475 |
|
490 | |||
476 | check_unsupported_flags(pats, opts) |
|
|||
477 |
|
||||
478 | revs, expr, filematcher = getlogrevs(repo, pats, opts) |
|
491 | revs, expr, filematcher = getlogrevs(repo, pats, opts) | |
479 | revs = sorted(revs, reverse=1) |
|
492 | revs = sorted(revs, reverse=1) | |
480 | limit = cmdutil.loglimit(opts) |
|
493 | limit = cmdutil.loglimit(opts) |
General Comments 0
You need to be logged in to leave comments.
Login now