From c6606b8b078957dd7d6d5d74b5e83f40561baf39 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Sun, 16 Nov 2014 18:37:01 +0000 Subject: Add relative_to_root_repo to sysbranchdir --- morphlib/sysbranchdir.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/morphlib/sysbranchdir.py b/morphlib/sysbranchdir.py index 4dbc5f6c..8da2a386 100644 --- a/morphlib/sysbranchdir.py +++ b/morphlib/sysbranchdir.py @@ -107,6 +107,11 @@ class SystemBranchDirectory(object): return os.path.join(self.root_directory, relative) + def relative_to_root_repo(self, path): # pragma: no cover + gitdirpath = self.get_git_directory_name(self.root_repository_url) + + return os.path.relpath(os.path.abspath(path), gitdirpath) + def get_git_directory_name(self, repo_url): '''Return directory pathname for a given git repository. @@ -123,6 +128,7 @@ class SystemBranchDirectory(object): ''' found_repo = self._find_git_directory(repo_url) + if not found_repo: return self._fabricate_git_directory_name(repo_url) return found_repo -- cgit v1.2.1