mercurial/commands.py
changeset 1238 6a4f181497c9
parent 1233 5381b0d88e9e
child 1241 3b4f05ff3130
equal deleted inserted replaced
1237:227cfbe34109 1238:6a4f181497c9
  1159     for st, rev, fns in changeiter:
  1159     for st, rev, fns in changeiter:
  1160         if st == 'window':
  1160         if st == 'window':
  1161             du = dui(ui)
  1161             du = dui(ui)
  1162         elif st == 'add':
  1162         elif st == 'add':
  1163             du.bump(rev)
  1163             du.bump(rev)
  1164             show_changeset(du, repo, rev)
  1164             br = None
       
  1165             if opts['branch']:
       
  1166                 br = repo.branchlookup([repo.changelog.node(rev)])
       
  1167             show_changeset(du, repo, rev, brinfo=br)
  1165             if opts['patch']:
  1168             if opts['patch']:
  1166                 changenode = repo.changelog.node(rev)
  1169                 changenode = repo.changelog.node(rev)
  1167                 prev, other = repo.changelog.parents(changenode)
  1170                 prev, other = repo.changelog.parents(changenode)
  1168                 dodiff(du, du, repo, prev, changenode, fns)
  1171                 dodiff(du, du, repo, prev, changenode, fns)
  1169                 du.write("\n\n")
  1172                 du.write("\n\n")
  1741          'hg locate [OPTION]... [PATTERN]...'),
  1744          'hg locate [OPTION]... [PATTERN]...'),
  1742     "^log|history":
  1745     "^log|history":
  1743         (log,
  1746         (log,
  1744          [('I', 'include', [], 'include path in search'),
  1747          [('I', 'include', [], 'include path in search'),
  1745           ('X', 'exclude', [], 'exclude path from search'),
  1748           ('X', 'exclude', [], 'exclude path from search'),
       
  1749           ('b', 'branch', None, 'show branches'),
  1746           ('r', 'rev', [], 'revision'),
  1750           ('r', 'rev', [], 'revision'),
  1747           ('p', 'patch', None, 'show patch')],
  1751           ('p', 'patch', None, 'show patch')],
  1748          'hg log [-I] [-X] [-r REV]... [-p] [FILE]'),
  1752          'hg log [-I] [-X] [-r REV]... [-p] [FILE]'),
  1749     "manifest": (manifest, [], 'hg manifest [REV]'),
  1753     "manifest": (manifest, [], 'hg manifest [REV]'),
  1750     "outgoing|out": (outgoing, 
  1754     "outgoing|out": (outgoing,