1278             du.bump(rev)

  1278             du.bump(rev)

  1279             changenode = repo.changelog.node(rev)

  1279             changenode = repo.changelog.node(rev)

  1280             parents = [p for p in repo.changelog.parents(changenode)

  1280             parents = [p for p in repo.changelog.parents(changenode)

  1281                        if p != nullid]

  1281                        if p != nullid]

  1282             if opts['no_merges'] and len(parents) == 2:

  1282             if opts['no_merges'] and len(parents) == 2:

  1283                  continue

  1285                  continue

  1284 

  1286 

  1285             br = None

  1287             br = None

  1286             if opts['keyword']:

  1288             if opts['keyword']:

  1287                 changes = repo.changelog.read(repo.changelog.node(rev))

  1289                 changes = repo.changelog.read(repo.changelog.node(rev))

  1901           ('X', 'exclude', [], _('exclude path from search')),

  1903           ('X', 'exclude', [], _('exclude path from search')),

  1902           ('b', 'branch', None, _('show branches')),

  1904           ('b', 'branch', None, _('show branches')),

  1903           ('k', 'keyword', [], _('search for a keyword')),

  1905           ('k', 'keyword', [], _('search for a keyword')),

  1904           ('r', 'rev', [], _('revision')),

  1906           ('r', 'rev', [], _('revision')),

  1905           ('M', 'no-merges', None, _("do not show merges")),

  1907           ('M', 'no-merges', None, _("do not show merges")),

  1906           ('p', 'patch', None, _('show patch'))],

  1909           ('p', 'patch', None, _('show patch'))],

  1907          _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),

  1910          _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),

  1908     "manifest": (manifest, [], _('hg manifest [REV]')),

  1911     "manifest": (manifest, [], _('hg manifest [REV]')),

  1909     "outgoing|out": (outgoing,

  1912     "outgoing|out": (outgoing,

  1910          [('M', 'no-merges', None, _("do not show merges")),

  1913          [('M', 'no-merges', None, _("do not show merges")),