equal
deleted
inserted
replaced
440 try: |
440 try: |
441 wlock = repo.wlock() |
441 wlock = repo.wlock() |
442 lock = repo.lock() |
442 lock = repo.lock() |
443 tr = repo.transaction() |
443 tr = repo.transaction() |
444 try: |
444 try: |
445 ret = self._apply(tr, repo, series, list, update_status, |
445 ret = self._apply(repo, series, list, update_status, |
446 strict, patchdir, merge, all_files=all_files) |
446 strict, patchdir, merge, all_files=all_files) |
447 tr.close() |
447 tr.close() |
448 self.save_dirty() |
448 self.save_dirty() |
449 return ret |
449 return ret |
450 except: |
450 except: |
455 repo.dirstate.invalidate() |
455 repo.dirstate.invalidate() |
456 raise |
456 raise |
457 finally: |
457 finally: |
458 del lock, wlock, tr |
458 del lock, wlock, tr |
459 |
459 |
460 def _apply(self, tr, repo, series, list=False, update_status=True, |
460 def _apply(self, repo, series, list=False, update_status=True, |
461 strict=False, patchdir=None, merge=None, all_files={}): |
461 strict=False, patchdir=None, merge=None, all_files={}): |
462 # TODO unify with commands.py |
462 # TODO unify with commands.py |
463 if not patchdir: |
463 if not patchdir: |
464 patchdir = self.path |
464 patchdir = self.path |
465 err = 0 |
465 err = 0 |