comparison hgext/mq.py @ 14574:12fba7bcb4f1

mq: rename find_series to findseries
author Adrian Buehlmann <adrian@cadifra.com>
date Mon, 13 Jun 2011 11:54:25 +0200
parents d590ff1f22b2
children 845c864200d0
comparison
equal deleted inserted replaced
14573:d590ff1f22b2 14574:12fba7bcb4f1
358 return diffopts 358 return diffopts
359 359
360 def join(self, *p): 360 def join(self, *p):
361 return os.path.join(self.path, *p) 361 return os.path.join(self.path, *p)
362 362
363 def find_series(self, patch): 363 def findseries(self, patch):
364 def matchpatch(l): 364 def matchpatch(l):
365 l = l.split('#', 1)[0] 365 l = l.split('#', 1)[0]
366 return l.strip() == patch 366 return l.strip() == patch
367 for index, l in enumerate(self.fullseries): 367 for index, l in enumerate(self.fullseries):
368 if matchpatch(l): 368 if matchpatch(l):
744 del self.applied[:numrevs] 744 del self.applied[:numrevs]
745 self.applied_dirty = 1 745 self.applied_dirty = 1
746 746
747 unknown = [] 747 unknown = []
748 748
749 for (i, p) in sorted([(self.find_series(p), p) for p in patches], 749 for (i, p) in sorted([(self.findseries(p), p) for p in patches],
750 reverse=True): 750 reverse=True):
751 if i is not None: 751 if i is not None:
752 del self.fullseries[i] 752 del self.fullseries[i]
753 else: 753 else:
754 unknown.append(p) 754 unknown.append(p)
1694 self.removeundo(repo) 1694 self.removeundo(repo)
1695 1695
1696 def full_series_end(self): 1696 def full_series_end(self):
1697 if self.applied: 1697 if self.applied:
1698 p = self.applied[-1].name 1698 p = self.applied[-1].name
1699 end = self.find_series(p) 1699 end = self.findseries(p)
1700 if end is None: 1700 if end is None:
1701 return len(self.fullseries) 1701 return len(self.fullseries)
1702 return end + 1 1702 return end + 1
1703 return 0 1703 return 0
1704 1704
2449 if patch is None and args[0][0:1] not in '-+': 2449 if patch is None and args[0][0:1] not in '-+':
2450 patch = args.pop(0) 2450 patch = args.pop(0)
2451 if patch is None: 2451 if patch is None:
2452 raise util.Abort(_('no patch to work with')) 2452 raise util.Abort(_('no patch to work with'))
2453 if args or opts.get('none'): 2453 if args or opts.get('none'):
2454 idx = q.find_series(patch) 2454 idx = q.findseries(patch)
2455 if idx is None: 2455 if idx is None:
2456 raise util.Abort(_('no patch named %s') % patch) 2456 raise util.Abort(_('no patch named %s') % patch)
2457 q.set_guards(idx, args) 2457 q.set_guards(idx, args)
2458 q.save_dirty() 2458 q.save_dirty()
2459 else: 2459 else:
2591 name = normname(os.path.join(name, os.path.basename(patch))) 2591 name = normname(os.path.join(name, os.path.basename(patch)))
2592 absdest = q.join(name) 2592 absdest = q.join(name)
2593 q.checkpatchname(name) 2593 q.checkpatchname(name)
2594 2594
2595 ui.note(_('renaming %s to %s\n') % (patch, name)) 2595 ui.note(_('renaming %s to %s\n') % (patch, name))
2596 i = q.find_series(patch) 2596 i = q.findseries(patch)
2597 guards = q.guard_re.findall(q.fullseries[i]) 2597 guards = q.guard_re.findall(q.fullseries[i])
2598 q.fullseries[i] = name + ''.join([' #' + g for g in guards]) 2598 q.fullseries[i] = name + ''.join([' #' + g for g in guards])
2599 q.parse_series() 2599 q.parse_series()
2600 q.series_dirty = 1 2600 q.series_dirty = 1
2601 2601