Make morph show-branch-root print the path

The help for the show-branch-root command said it returns a path, but
the command and the yarns just showed the aliased url it was cloned
from.

Given I found myself needing the path in some scripts, not the repo url,
I think it's more useful to reconcile the difference this way.

2 files changed, 30 insertions, 15 deletions

diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index 9450c67b..434ff6af 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -373,16 +373,17 @@ class BranchAndMergePlugin(cliapp.Plugin):
 
         This would, for example, write out something like:
 
-            /src/ws/master/baserock:baserock/morphs
+            /src/ws/master/baserock/baserock/morphs
 
-        when the master branch of the `baserock:baserock/morphs`
+        when the master branch of the `baserock/baserock/morphs`
         repository is checked out.
 
         '''
 
         ws = morphlib.workspace.open('.')
         sb = morphlib.sysbranchdir.open_from_within('.')
-        self.app.output.write('%s\n' % sb.get_config('branch.root'))
+        repo_url = sb.get_config('branch.root')
+        self.app.output.write('%s\n' % sb.get_git_directory_name(repo_url))
 
     def _remove_branch_dir_safe(self, workspace_root, system_branch_root):
         # This function avoids throwing any exceptions, so it is safe to call
diff --git a/morphlib/sysbranchdir.py b/morphlib/sysbranchdir.py
index b8953c2f..19fba695 100644
--- a/morphlib/sysbranchdir.py
+++ b/morphlib/sysbranchdir.py
@@ -68,19 +68,13 @@ class SystemBranchDirectory(object):
         value = cliapp.runcmd(['git', 'config', '-f', self._config_path, key])
         return value.strip()
 
-    def get_git_directory_name(self, repo_url):
-        '''Return directory pathname for a given git repository.
-
-        If the URL is a real one (not aliased), the schema and leading //
-        are removed from it, as is a .git suffix.
-
-        Any colons in the URL path or network location are replaced
-        with slashes, so that directory paths do not contain colons.
-        This avoids problems with PYTHONPATH, PATH, and other things
-        that use colon as a separator.
-
-        '''
+    def _find_git_directory(self, repo_url):
+        for gd in self.list_git_directories():
+            if gd.get_config('morph.repository') == repo_url:
+                return gd.dirname
+        return None
 
+    def _fabricate_git_directory_name(self, repo_url):
         # Parse the URL. If the path component is absolute, we assume
         # it's a real URL; otherwise, an aliased URL.
         parts = urlparse.urlparse(repo_url)
@@ -107,6 +101,26 @@ class SystemBranchDirectory(object):
 
         return os.path.join(self.root_directory, relative)
 
+    def get_git_directory_name(self, repo_url):
+        '''Return directory pathname for a given git repository.
+
+        If the repository has already been cloned, then it returns the
+        path to that, if not it will fabricate a path based on the url.
+
+        If the URL is a real one (not aliased), the schema and leading //
+        are removed from it, as is a .git suffix.
+
+        Any colons in the URL path or network location are replaced
+        with slashes, so that directory paths do not contain colons.
+        This avoids problems with PYTHONPATH, PATH, and other things
+        that use colon as a separator.
+
+        '''
+        found_repo = self._find_git_directory(repo_url)
+        if not found_repo:
+            return self._fabricate_git_directory_name(repo_url)
+        return found_repo
+
     def get_filename(self, repo_url, relative):
         '''Return full pathname to a file in a checked out repository.