Show More
@@ -661,13 +661,13 b' class queue(object):' | |||||
661 | exactneg = [g for g in patchguards |
|
661 | exactneg = [g for g in patchguards | |
662 | if g.startswith('-') and g[1:] in guards] |
|
662 | if g.startswith('-') and g[1:] in guards] | |
663 | if exactneg: |
|
663 | if exactneg: | |
664 | return False, repr(exactneg[0]) |
|
664 | return False, pycompat.byterepr(exactneg[0]) | |
665 | pos = [g for g in patchguards if g.startswith('+')] |
|
665 | pos = [g for g in patchguards if g.startswith('+')] | |
666 | exactpos = [g for g in pos if g[1:] in guards] |
|
666 | exactpos = [g for g in pos if g[1:] in guards] | |
667 | if pos: |
|
667 | if pos: | |
668 | if exactpos: |
|
668 | if exactpos: | |
669 | return True, repr(exactpos[0]) |
|
669 | return True, pycompat.byterepr(exactpos[0]) | |
670 |
return False, ' '.join(map( |
|
670 | return False, ' '.join([pycompat.byterepr(p) for p in pos]) | |
671 | return True, '' |
|
671 | return True, '' | |
672 |
|
672 | |||
673 | def explainpushable(self, idx, all_patches=False): |
|
673 | def explainpushable(self, idx, all_patches=False): |
General Comments 0
You need to be logged in to leave comments.
Login now