# HG changeset patch # User Dan Villiom Podlaski Christiansen # Date 1241873172 -7200 # Node ID 5f8f2fd4fd54fea87cf1790e013ec80d4ed1910d # Parent 235022089da60e0a3b59eba92e69d7b8624c4331 hg_delta_editor: simplify repository instantiation. diff --git a/hg_delta_editor.py b/hg_delta_editor.py --- a/hg_delta_editor.py +++ b/hg_delta_editor.py @@ -87,13 +87,7 @@ class HgChangeReceiver(delta.Editor): if not ui_: ui_ = ui.ui() self.ui = ui_ - if repo: - self.repo = repo - self.__setup_repo(repo) - self.path = os.path.normpath(os.path.join(self.repo.path, '..')) - elif path: - self.path = path - self.__setup_repo(path) + self.__setup_repo(repo or path) self.subdir = subdir if self.subdir and self.subdir[0] == '/': @@ -150,8 +144,9 @@ class HgChangeReceiver(delta.Editor): the Subversion metadata. """ if isinstance(arg, basestring): - self.path = arg - self.repo = hg.repository(self.ui, self.path, create=True) + self.repo = hg.repository(self.ui, arg, + create=(not os.path.exists(arg))) + self.path = os.path.normpath(os.path.join(arg, '..')) elif arg: self.repo = arg self.path = os.path.normpath(os.path.join(self.repo.path, '..'))