equal
deleted
inserted
replaced
87 return True |
87 return True |
88 return False |
88 return False |
89 |
89 |
90 def apply(self, repo, source, revmap, merges, opts={}): |
90 def apply(self, repo, source, revmap, merges, opts={}): |
91 '''apply the revisions in revmap one by one in revision order''' |
91 '''apply the revisions in revmap one by one in revision order''' |
92 revs = util.sort(revmap) |
92 revs = sorted(revmap) |
93 p1, p2 = repo.dirstate.parents() |
93 p1, p2 = repo.dirstate.parents() |
94 pulls = [] |
94 pulls = [] |
95 diffopts = patch.diffopts(self.ui, opts) |
95 diffopts = patch.diffopts(self.ui, opts) |
96 diffopts.git = True |
96 diffopts.git = True |
97 |
97 |
313 return |
313 return |
314 |
314 |
315 if not os.path.isdir(self.path): |
315 if not os.path.isdir(self.path): |
316 os.mkdir(self.path) |
316 os.mkdir(self.path) |
317 series = self.opener('series', 'w') |
317 series = self.opener('series', 'w') |
318 for rev in util.sort(revmap): |
318 for rev in sorted(revmap): |
319 series.write(revlog.hex(revmap[rev]) + '\n') |
319 series.write(revlog.hex(revmap[rev]) + '\n') |
320 if merges: |
320 if merges: |
321 series.write('# Merges\n') |
321 series.write('# Merges\n') |
322 for m in merges: |
322 for m in merges: |
323 series.write(revlog.hex(m) + '\n') |
323 series.write(revlog.hex(m) + '\n') |