summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-09-05 23:30:48 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-09-05 23:30:48 +0200
commitdca7e002c69f04c52182aa16ffa1ea230d967055 (patch)
tree119e189014f0811a9a3ee5ece718d2b101018eb4
parente5431ed8be6250cdbde567f552ba4e924240cd1b (diff)
downloadpython-fastimport-dca7e002c69f04c52182aa16ffa1ea230d967055.tar.gz
remove bzrisms from Processor.
-rw-r--r--fastimport/processor.py20
1 files changed, 1 insertions, 19 deletions
diff --git a/fastimport/processor.py b/fastimport/processor.py
index d3c4866..77291ac 100644
--- a/fastimport/processor.py
+++ b/fastimport/processor.py
@@ -68,25 +68,7 @@ class ImportProcessor(object):
:param command_iter: an iterator providing commands
"""
- if self.working_tree is not None:
- self.working_tree.lock_write()
- elif self.branch is not None:
- self.branch.lock_write()
- elif self.repo is not None:
- self.repo.lock_write()
- try:
- self._process(command_iter)
- finally:
- # If an unhandled exception occurred, abort the write group
- if self.repo is not None and self.repo.is_in_write_group():
- self.repo.abort_write_group()
- # Release the locks
- if self.working_tree is not None:
- self.working_tree.unlock()
- elif self.branch is not None:
- self.branch.unlock()
- elif self.repo is not None:
- self.repo.unlock()
+ self._process(command_iter)
def _process(self, command_iter):
self.pre_process()