##// END OF EJS Templates
mq: cleanup of lookup - handling of None is not relevant...
Mads Kiilerich -
r15257:a8555f99 default
parent child Browse files
Show More
@@ -1034,8 +1034,6 b' class queue(object):'
1034 return self.series[0]
1034 return self.series[0]
1035 return None
1035 return None
1036
1036
1037 if patch is None:
1038 return None
1039 if patch in self.series:
1037 if patch in self.series:
1040 return patch
1038 return patch
1041
1039
@@ -1095,12 +1093,12 b' class queue(object):'
1095 self.ui.warn(_('no patches in series\n'))
1093 self.ui.warn(_('no patches in series\n'))
1096 return 0
1094 return 0
1097
1095
1098 patch = self.lookup(patch)
1099 # Suppose our series file is: A B C and the current 'top'
1096 # Suppose our series file is: A B C and the current 'top'
1100 # patch is B. qpush C should be performed (moving forward)
1097 # patch is B. qpush C should be performed (moving forward)
1101 # qpush B is a NOP (no change) qpush A is an error (can't
1098 # qpush B is a NOP (no change) qpush A is an error (can't
1102 # go backwards with qpush)
1099 # go backwards with qpush)
1103 if patch:
1100 if patch:
1101 patch = self.lookup(patch)
1104 info = self.isapplied(patch)
1102 info = self.isapplied(patch)
1105 if info and info[0] >= len(self.applied) - 1:
1103 if info and info[0] >= len(self.applied) - 1:
1106 self.ui.warn(
1104 self.ui.warn(
General Comments 0
You need to be logged in to leave comments. Login now