Show More
@@ -430,16 +430,16 b' def branch(repo, subset, x):' | |||||
430 | # note: falls through to the revspec case if no branch with |
|
430 | # note: falls through to the revspec case if no branch with | |
431 | # this name exists |
|
431 | # this name exists | |
432 | if pattern in repo.branchmap(): |
|
432 | if pattern in repo.branchmap(): | |
433 |
return |
|
433 | return lazyset(subset, lambda r: matcher(repo[r].branch())) | |
434 | else: |
|
434 | else: | |
435 |
return |
|
435 | return lazyset(subset, lambda r: matcher(repo[r].branch())) | |
436 |
|
436 | |||
437 | s = getset(repo, baseset(repo), x) |
|
437 | s = getset(repo, baseset(repo), x) | |
438 | b = set() |
|
438 | b = set() | |
439 | for r in s: |
|
439 | for r in s: | |
440 | b.add(repo[r].branch()) |
|
440 | b.add(repo[r].branch()) | |
441 | s = s.set() |
|
441 | s = s.set() | |
442 |
return |
|
442 | return lazyset(subset, lambda r: r in s or repo[r].branch() in b) | |
443 |
|
443 | |||
444 | def bumped(repo, subset, x): |
|
444 | def bumped(repo, subset, x): | |
445 | """``bumped()`` |
|
445 | """``bumped()`` |
General Comments 0
You need to be logged in to leave comments.
Login now