Show More
@@ -616,7 +616,7 b' class queue(object):' | |||||
616 | return (True, files, fuzz) |
|
616 | return (True, files, fuzz) | |
617 |
|
617 | |||
618 | def apply(self, repo, series, list=False, update_status=True, |
|
618 | def apply(self, repo, series, list=False, update_status=True, | |
619 |
strict=False, patchdir=None, merge=None, all_files= |
|
619 | strict=False, patchdir=None, merge=None, all_files=None): | |
620 | wlock = lock = tr = None |
|
620 | wlock = lock = tr = None | |
621 | try: |
|
621 | try: | |
622 | wlock = repo.wlock() |
|
622 | wlock = repo.wlock() | |
@@ -641,7 +641,7 b' class queue(object):' | |||||
641 | self.removeundo(repo) |
|
641 | self.removeundo(repo) | |
642 |
|
642 | |||
643 | def _apply(self, repo, series, list=False, update_status=True, |
|
643 | def _apply(self, repo, series, list=False, update_status=True, | |
644 |
strict=False, patchdir=None, merge=None, all_files= |
|
644 | strict=False, patchdir=None, merge=None, all_files=None): | |
645 | '''returns (error, hash) |
|
645 | '''returns (error, hash) | |
646 | error = 1 for unable to read, 2 for patch failed, 3 for patch fuzz''' |
|
646 | error = 1 for unable to read, 2 for patch failed, 3 for patch fuzz''' | |
647 | # TODO unify with commands.py |
|
647 | # TODO unify with commands.py | |
@@ -674,7 +674,8 b' class queue(object):' | |||||
674 |
|
674 | |||
675 | if ph.haspatch: |
|
675 | if ph.haspatch: | |
676 | (patcherr, files, fuzz) = self.patch(repo, pf) |
|
676 | (patcherr, files, fuzz) = self.patch(repo, pf) | |
677 |
all_files |
|
677 | if all_files is not None: | |
|
678 | all_files.update(files) | |||
678 | patcherr = not patcherr |
|
679 | patcherr = not patcherr | |
679 | else: |
|
680 | else: | |
680 | self.ui.warn(_("patch %s is empty\n") % patchname) |
|
681 | self.ui.warn(_("patch %s is empty\n") % patchname) | |
@@ -1071,7 +1072,7 b' class queue(object):' | |||||
1071 | end = self.series.index(patch, start) + 1 |
|
1072 | end = self.series.index(patch, start) + 1 | |
1072 |
|
1073 | |||
1073 | s = self.series[start:end] |
|
1074 | s = self.series[start:end] | |
1074 |
all_files = |
|
1075 | all_files = set() | |
1075 | try: |
|
1076 | try: | |
1076 | if mergeq: |
|
1077 | if mergeq: | |
1077 | ret = self.mergepatch(repo, mergeq, s, diffopts) |
|
1078 | ret = self.mergepatch(repo, mergeq, s, diffopts) |
General Comments 0
You need to be logged in to leave comments.
Login now