Show More
@@ -614,17 +614,16 b' class queue:' | |||||
614 | # 3) patchname[-+]num to indicate an offset in the series file |
|
614 | # 3) patchname[-+]num to indicate an offset in the series file | |
615 | def lookup(self, patch, strict=False): |
|
615 | def lookup(self, patch, strict=False): | |
616 | def partial_name(s): |
|
616 | def partial_name(s): | |
617 | count = 0 |
|
|||
618 | if s in self.series: |
|
617 | if s in self.series: | |
619 | return s |
|
618 | return s | |
620 |
for x in self.series |
|
619 | matches = [x for x in self.series if s in x] | |
621 |
|
|
620 | if len(matches) > 1: | |
622 | count += 1 |
|
621 | self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) | |
623 |
|
|
622 | for m in matches: | |
624 | if count > 1: |
|
623 | self.ui.warn(' %s\n' % m) | |
625 |
|
|
624 | return None | |
626 |
if |
|
625 | if matches: | |
627 |
return |
|
626 | return matches[0] | |
628 | if len(self.series) > 0 and len(self.applied) > 0: |
|
627 | if len(self.series) > 0 and len(self.applied) > 0: | |
629 | if s == 'qtip': |
|
628 | if s == 'qtip': | |
630 | return self.series[self.series_end()-1] |
|
629 | return self.series[self.series_end()-1] |
General Comments 0
You need to be logged in to leave comments.
Login now