Mercurial > hg > mercurial-crew-with-dirclash
changeset 4649:52259d5fb76d
Small fixes for 8e503fa54d2d (hg heads branch)
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Wed, 20 Jun 2007 17:53:11 -0700 |
| parents | 8e503fa54d2d |
| children | 15e22b483adc |
| files | mercurial/commands.py tests/test-bheads.out |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1232,8 +1232,7 @@ def heads(ui, repo, *branchrevs, **opts) heads = repo.heads(start) else: heads = [] - visitedset = set() - displayer = cmdutil.show_changeset(ui, repo, opts) + visitedset = util.set() for branchrev in branchrevs: branch = repo.changectx(branchrev).branch() if branch in visitedset:
--- a/tests/test-bheads.out +++ b/tests/test-bheads.out @@ -234,7 +234,7 @@ date: Thu Jan 01 00:00:07 1970 +0 summary: Adding c branch ======= -No changes on branch c (the branch of revision .) are reachable from revision 3 +no changes on branch c containing . are reachable from 3 1 ------- changeset: 7:9fb091bb9835 @@ -273,7 +273,7 @@ summary: Merging b branch head 2 and 0 ------- -No changes on branch b (the branch of revision .) are reachable from revision 7 +no changes on branch b containing . are reachable from 7 1 ======= 0 files updated, 0 files merged, 2 files removed, 0 files unresolved