From 8cf3add90b3eb28778e1d62cec77e72e16609414 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 7 Mar 2014 12:16:49 +0000 Subject: Raise correct error on `morph checkout|branch` of repo with no morphs --- morphlib/plugins/branch_and_merge_new_plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py b/morphlib/plugins/branch_and_merge_new_plugin.py index 94b2381c..8c8a98e9 100644 --- a/morphlib/plugins/branch_and_merge_new_plugin.py +++ b/morphlib/plugins/branch_and_merge_new_plugin.py @@ -191,7 +191,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): ws, root_url, system_branch, cached_repo, base_ref) as (sb, gd): if not self._checkout_has_systems(gd): - raise BranchRootHasNoSystemsError(base_ref) + raise BranchRootHasNoSystemsError(root_url, base_ref) def branch(self, args): @@ -252,7 +252,7 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin): gd.checkout(system_branch) if not self._checkout_has_systems(gd): - raise BranchRootHasNoSystemsError(base_ref) + raise BranchRootHasNoSystemsError(root_url, base_ref) def _save_dirty_morphologies(self, loader, sb, morphs): logging.debug('Saving dirty morphologies: start') -- cgit v1.2.1