diff options
| author | Richard Holland <richard.holland@codethink.co.uk> | 2013-04-12 16:15:36 +0000 |
|---|---|---|
| committer | Richard Holland <richard.holland@codethink.co.uk> | 2013-04-12 16:15:36 +0000 |
| commit | f6b095f85d8e27e9e14413f35c61747427941a6b (patch) | |
| tree | 20a20dd4409a6083eb852b566245d8bfeae9bc12 /morphlib/plugins/branch_and_merge_plugin.py | |
| parent | 2b7803f57ebde9c8647aeddd68d136b8c93e18d7 (diff) | |
| download | morph-f6b095f85d8e27e9e14413f35c61747427941a6b.tar.gz | |
morph branch caches previously uncached repos
Like morph checkout, morph branch will cache a previously uncached repo
rather than giving an error. The if statement checking for an already
existant branch will now no longer raise an error when repo is uncached.
Diffstat (limited to 'morphlib/plugins/branch_and_merge_plugin.py')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 25f786e0..99451f4c 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -617,7 +617,7 @@ class BranchAndMergePlugin(cliapp.Plugin): commit = 'master' if len(args) == 2 else args[2] self.lrc, self.rrc = morphlib.util.new_repo_caches(self.app) - if self.lrc.get_repo(repo).ref_exists(new_branch): + if self.get_cached_repo(repo).ref_exists(new_branch): raise cliapp.AppException('branch %s already exists in ' 'repository %s' % (new_branch, repo)) |