Show More
@@ -1439,10 +1439,11 b' def heads(ui, repo, *branchrevs, **opts)' | |||||
1439 |
|
|
1439 | if not opts.get('closed'): | |
1440 |
|
|
1440 | heads = [h for h in heads if not repo[h].extra().get('close')] | |
1441 |
|
1441 | |||
1442 |
|
|
1442 | if opts.get('active') and branchrevs: | |
1443 |
|
|
1443 | dagheads = repo.heads(start) | |
1444 |
|
|
1444 | heads = [h for h in heads if h in dagheads] | |
1445 |
|
1445 | |||
|
1446 | if branchrevs: | |||
1446 | haveheads = set(repo[h].branch() for h in heads) |
|
1447 | haveheads = set(repo[h].branch() for h in heads) | |
1447 | if branches - haveheads: |
|
1448 | if branches - haveheads: | |
1448 | headless = ', '.join(encode(b) for b in branches - haveheads) |
|
1449 | headless = ', '.join(encode(b) for b in branches - haveheads) |
@@ -143,12 +143,6 b' user: test' | |||||
143 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
143 | date: Thu Jan 01 00:00:09 1970 +0000 | |
144 | summary: reopen branch with a change |
|
144 | summary: reopen branch with a change | |
145 |
|
145 | |||
146 | changeset: 11:c84627f3c15d |
|
|||
147 | branch: b |
|
|||
148 | user: test |
|
|||
149 | date: Thu Jan 01 00:00:09 1970 +0000 |
|
|||
150 | summary: prune bad branch |
|
|||
151 |
|
||||
152 | changeset: 7:10ff5895aa57 |
|
146 | changeset: 7:10ff5895aa57 | |
153 | branch: a branch name much longer than the default justification used by branches |
|
147 | branch: a branch name much longer than the default justification used by branches | |
154 | user: test |
|
148 | user: test |
General Comments 0
You need to be logged in to leave comments.
Login now