Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 6068:ea33f695304a
Automated merge with http://hg.west.spy.net/hg/hacks/hg
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sat, 09 Feb 2008 20:43:42 -0800 |
parents | 218d5b9aa466 57c1a7052982 |
children | f5b00b6e426a |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Feb 09 12:27:58 2008 -0500 +++ b/mercurial/commands.py Sat Feb 09 20:43:42 2008 -0800 @@ -1713,6 +1713,8 @@ if opts["date"]: df = util.matchdate(opts["date"]) + only_branches = opts['only_branch'] + displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn) for st, rev, fns in changeiter: if st == 'add': @@ -1724,6 +1726,11 @@ if opts['only_merges'] and len(parents) != 2: continue + if only_branches: + revbranch = get(rev)[5]['branch'] + if revbranch not in only_branches: + continue + if df: changes = get(rev) if not df(changes[2][0]): @@ -2930,6 +2937,8 @@ ('M', 'no-merges', None, _('do not show merges')), ('', 'style', '', _('display using template map file')), ('m', 'only-merges', None, _('show only merges')), + ('b', 'only-branch', [], + _('show only changesets within the given named branch')), ('p', 'patch', None, _('show patch')), ('P', 'prune', [], _('do not display revision or any of its ancestors')), ('', 'template', '', _('display with template')),