equal
deleted
inserted
replaced
202 def set_active(self, guards): |
202 def set_active(self, guards): |
203 for guard in guards: |
203 for guard in guards: |
204 bad = self.check_guard(guard) |
204 bad = self.check_guard(guard) |
205 if bad: |
205 if bad: |
206 raise util.Abort(bad) |
206 raise util.Abort(bad) |
207 guards = util.sort(set(guards)) |
207 guards = sorted(set(guards)) |
208 self.ui.debug(_('active guards: %s\n') % ' '.join(guards)) |
208 self.ui.debug(_('active guards: %s\n') % ' '.join(guards)) |
209 self.active_guards = guards |
209 self.active_guards = guards |
210 self.guards_dirty = True |
210 self.guards_dirty = True |
211 |
211 |
212 def active(self): |
212 def active(self): |
598 err = 1 |
598 err = 1 |
599 break |
599 break |
600 return (err, n) |
600 return (err, n) |
601 |
601 |
602 def _clean_series(self, patches): |
602 def _clean_series(self, patches): |
603 indices = util.sort([self.find_series(p) for p in patches]) |
603 for i in sorted([self.find_series(p) for p in patches], reverse=True): |
604 for i in indices[-1::-1]: |
|
605 del self.full_series[i] |
604 del self.full_series[i] |
606 self.parse_series() |
605 self.parse_series() |
607 self.series_dirty = 1 |
606 self.series_dirty = 1 |
608 |
607 |
609 def finish(self, repo, revs): |
608 def finish(self, repo, revs): |
610 revs.sort() |
|
611 firstrev = repo[self.applied[0].rev].rev() |
609 firstrev = repo[self.applied[0].rev].rev() |
612 appliedbase = 0 |
610 appliedbase = 0 |
613 patches = [] |
611 patches = [] |
614 for rev in util.sort(revs): |
612 for rev in sorted(revs): |
615 if rev < firstrev: |
613 if rev < firstrev: |
616 raise util.Abort(_('revision %d is not managed') % rev) |
614 raise util.Abort(_('revision %d is not managed') % rev) |
617 base = bin(self.applied[appliedbase].rev) |
615 base = bin(self.applied[appliedbase].rev) |
618 node = repo.changelog.node(rev) |
616 node = repo.changelog.node(rev) |
619 if node != base: |
617 if node != base: |
1365 if (fl not in self.series and |
1363 if (fl not in self.series and |
1366 fl not in (self.status_path, self.series_path, |
1364 fl not in (self.status_path, self.series_path, |
1367 self.guards_path) |
1365 self.guards_path) |
1368 and not fl.startswith('.')): |
1366 and not fl.startswith('.')): |
1369 msng_list.append(fl) |
1367 msng_list.append(fl) |
1370 for x in util.sort(msng_list): |
1368 for x in sorted(msng_list): |
1371 pfx = self.ui.verbose and ('D ') or '' |
1369 pfx = self.ui.verbose and ('D ') or '' |
1372 self.ui.write("%s%s\n" % (pfx, displayname(x))) |
1370 self.ui.write("%s%s\n" % (pfx, displayname(x))) |
1373 |
1371 |
1374 def issaveline(self, l): |
1372 def issaveline(self, l): |
1375 if l.name == '.hg.patches.save.line': |
1373 if l.name == '.hg.patches.save.line': |