Mine may be a nice metaphor but it is not very intuitive. Hence, this commit renames "mine" to "workspace". This affects not just the branch and merge plugin (the only code that changes) but also documentation and tests, which are updated along with the code in this commit. I decided to omit the "dir" suffix in the command because I think people know well that a workspace will be a directory in this case and that allows us to refer to this concept with one word ("workspace") instead of two words ("workspace directory"). --- doc/branching-merging-systems.mdwn | 28 ++++++------ morphlib/plugins/branch_and_merge_plugin.py | 50 +++++++++++----------- ...reates-new-system-branch-not-from-master.script | 4 +- .../branch-creates-new-system-branch.script | 4 +- .../branch-when-branchdir-exists-locally.script | 2 +- tests.branching/checkout-existing-branch.script | 2 +- .../edit-checkouts-existing-chunk.script | 8 ++-- tests.branching/edit-clones-chunk.script | 16 ++++--- tests.branching/edit-updates-stratum.script | 2 +- tests.branching/edit-uses-ref-from-stratum.script | 2 +- tests.branching/init-cwd.script | 4 +- tests.branching/init-default.script | 4 +- tests.branching/init-existing.script | 4 +- tests.branching/init-nonempty.script | 4 +- tests.branching/init-nonempty.stderr | 2 +- .../merge-explicitly-named-repos.script | 4 +- tests.branching/minedir-not-found.script | 4 +- tests.branching/minedir-not-found.stderr | 2 +- tests.branching/minedir.script | 8 ++-- tests.branching/minedir.stdout | 2 +- tests.branching/petrify.script | 2 +- tests.branching/setup | 8 ++-- .../show-system-branch-shows-name-correctly.script | 2 +- tests.branching/workflow.script | 4 +- 24 files changed, 88 insertions(+), 84 deletions(-) diff --git a/doc/branching-merging-systems.mdwn b/doc/branching-merging-systems.mdwn index 3daee73..c2e24d7 100644 --- a/doc/branching-merging-systems.mdwn +++ b/doc/branching-merging-systems.mdwn @@ -57,15 +57,15 @@ we introduce the following concepts (FIXME: naming needs attention): a system branch; it need not contain all the repositories, just the ones that are being worked on by the user, or that the user for other reasons have checked out -* **morph mine** is where all Morph keeps global +* **morph workspace** is where all Morph keeps global state and shared caches, so that creating a system branch directory is a fairly cheap operation; all the system branch directories are - inside the morph mine directory + inside the morph workspace directory As a picture: /home/liw/ -- user's home directory - baserock/ -- morph mine + baserock/ -- morph workspace .morph/ -- morph shared state, cache, etc unstable/ -- system branch directory: mainline devel morphs/ -- git repository for system, stratum morphs @@ -76,13 +76,13 @@ As a picture: To use the system branching and merging, you do the following (which we'll cover in more detail later): -1. Initialize the morph mine. This creates the `.morph` directory and - populates it with some initial stuff. You can have as many mines as +1. Initialize the morph workspace. This creates the `.morph` directory and + populates it with some initial stuff. You can have as many workspaces as you want, but you don't have to have more than one, and you only need to initialize it once. 2. Branch the system from some version of it (e.g., `master`) to work on a new feature or bug fix. - This creates a system branch directory under the mine directory. + This creates a system branch directory under the workspace directory. The system branch directory initially contains a clone of the `morphs` git repository, with some changes specific to this system branch. (See petrification, below.) @@ -105,7 +105,7 @@ still fairly high level, and implementation details will come later. morph init ~/baserock This creates the `~/baserock` directory if it does not exist, and then -initializes it as a "morph mine" directory, by creating a `.morph` +initializes it as a "morph workspace" directory, by creating a `.morph` subdirectory. `.morph` will contain the Morph cache directory, and other shared state between the various branches. As part of the cache, any git repositories that Morph clones get put into the cache first, @@ -197,7 +197,7 @@ Usage: morph branch BRANCH [COMMIT] -This needs to be run in the morph mine directory (the one initialized +This needs to be run in the morph workspace directory (the one initialized with `morph init`). * If `./BRANCH` as a directory exists, abort. @@ -206,7 +206,7 @@ with `morph init`). * Create a new branch called `BRANCH` in morphs, based either the tip of `master` or from `COMMIT` if given. Store the SHA-1 of the branch origin in some way so we get at it later. - + Implementation: `morph checkout` -------------- @@ -215,7 +215,7 @@ Usage: morph checkout BRANCH -This needs to be run in the morph mine directory. It works like +This needs to be run in the morph workspace directory. It works like `morph branch`, except it does not create the new branch and requires it to exist instead. @@ -289,8 +289,8 @@ Usage: morph git -- log -p master..HEAD -This is to be run in the morph mine. It runs git with the arguments on -the command line in each local git repository in the mine. (The `--` is +This is to be run in the morph workspace. It runs git with the arguments on +the command line in each local git repository in the workspace. (The `--` is only necessary if the git arguments are to contain options.) @@ -303,7 +303,7 @@ Usage: This needs to be run inside a system branch directory's `morphs` repository, and `BRANCH` must be another system branch checked out -in the morph mine. +in the morph workspace. * In each git repository modified by the `BRANCH` system branch, run `git merge --no-commit BRANCH`, then undo any changes to @@ -318,7 +318,7 @@ Usage: morph mass-merge BRANCH [TARGET]... -To be run in the morph mine directory. +To be run in the morph workspace directory. This just runs `morph merge BRANCH` in each `TARGET` system branch. diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 670b311..2304fc0 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -32,7 +32,8 @@ class BranchAndMergePlugin(cliapp.Plugin): self.app.add_subcommand('petrify', self.petrify, arg_synopsis='STRATUM...') self.app.add_subcommand('init', self.init, arg_synopsis='[DIR]') - self.app.add_subcommand('minedir', self.minedir, arg_synopsis='') + self.app.add_subcommand('workspace', self.workspace, + arg_synopsis='') self.app.add_subcommand('branch', self.branch, arg_synopsis='NEW [OLD]') self.app.add_subcommand('checkout', self.checkout, @@ -48,7 +49,7 @@ class BranchAndMergePlugin(cliapp.Plugin): pass @staticmethod - def deduce_mine_directory(): + def deduce_workspace(): dirname = os.getcwd() while dirname != '/': dot_morph = os.path.join(dirname, '.morph') @@ -59,18 +60,18 @@ class BranchAndMergePlugin(cliapp.Plugin): @classmethod def deduce_system_branch(cls): - minedir = cls.deduce_mine_directory() - if minedir is None: + workspace = cls.deduce_workspace() + if workspace is None: return None - if not minedir.endswith('/'): - minedir += '/' + if not workspace.endswith('/'): + workspace += '/' cwd = os.getcwd() - if not cwd.startswith(minedir): + if not cwd.startswith(workspace): return None - return os.path.dirname(cwd[len(minedir):]) + return os.path.dirname(cwd[len(workspace):]) @staticmethod def clone_to_directory(app, dirname, reponame, ref): @@ -181,7 +182,7 @@ class BranchAndMergePlugin(cliapp.Plugin): self.write_morphology(filename, morph) def init(self, args): - '''Initialize a mine.''' + '''Initialize a workspace directory.''' if not args: args = ['.'] @@ -190,28 +191,29 @@ class BranchAndMergePlugin(cliapp.Plugin): dirname = args[0] - # verify the mine directory is empty (and thus, can be used) or + # verify the workspace is empty (and thus, can be used) or # create it if it doesn't exist yet if os.path.exists(dirname): if os.listdir(dirname) != []: raise cliapp.AppException('can only initialize empty ' - 'directory: %s' % dirname) + 'directory as a workspace: %s' % + dirname) else: try: os.makedirs(dirname) except: - raise cliapp.AppException('failed to create mine ' - 'directory: %s' % dirname) + raise cliapp.AppException('failed to create workspace: %s' % + dirname) os.mkdir(os.path.join(dirname, '.morph')) - self.app.status(msg='Initialized morph mine', chatty=True) + self.app.status(msg='Initialized morph workspace', chatty=True) - def minedir(self, args): - '''Find morph mine directory from current working directory.''' + def workspace(self, args): + '''Find morph workspace directory from current working directory.''' - dirname = self.deduce_mine_directory() + dirname = self.deduce_workspace() if dirname is None: - raise cliapp.AppException("Can't find the mine directory") + raise cliapp.AppException("Can't find the workspace directory") self.app.output.write('%s\n' % dirname) def branch(self, args): @@ -274,14 +276,14 @@ class BranchAndMergePlugin(cliapp.Plugin): app = self.app other_branch = args[0] - mine = self.deduce_mine_directory() + workspace = self.deduce_workspace() this_branch = self.deduce_system_branch() for repo in args[1:]: repo = self.resolve_reponame(app, repo) basename = os.path.basename(repo) - pull_from = os.path.join(mine, other_branch, basename) - repo_dir = os.path.join(mine, this_branch, basename) + pull_from = os.path.join(workspace, other_branch, basename) + repo_dir = os.path.join(workspace, this_branch, basename) app.runcmd(['git', 'pull', pull_from, other_branch], cwd=repo_dir) def edit(self, args): @@ -292,12 +294,12 @@ class BranchAndMergePlugin(cliapp.Plugin): 'and commit ref as argument') app = self.app - mine_directory = self.deduce_mine_directory() + workspace = self.deduce_workspace() system_branch = self.deduce_system_branch() if system_branch is None: raise morphlib.Error('Cannot deduce system branch') - morphs_dirname = os.path.join(mine_directory, system_branch, 'morphs') + morphs_dirname = os.path.join(workspace, system_branch, 'morphs') if morphs_dirname is None: raise morphlib.Error('Can not find morphs directory') @@ -310,7 +312,7 @@ class BranchAndMergePlugin(cliapp.Plugin): if ref is None: raise morphlib.Error('Cannot deduce commit to start edit from') - new_repo = os.path.join(mine_directory, system_branch, + new_repo = os.path.join(workspace, system_branch, os.path.basename(repo)) self.clone_to_directory(app, new_repo, args[0], ref) diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.script b/tests.branching/branch-creates-new-system-branch-not-from-master.script index 9ab4480..1116ae7 100755 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.script +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.script @@ -18,7 +18,7 @@ set -eu -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch newbranch origin/alfred @@ -32,4 +32,4 @@ echo "Current branches:" echo "Current origin:" "$SRCDIR/scripts/run-git-in" newbranch/morphs remote show origin | - sed 's,\(TMP/mine/\.morph/cache/gits/file_\).*_,\1,g' + sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g' diff --git a/tests.branching/branch-creates-new-system-branch.script b/tests.branching/branch-creates-new-system-branch.script index 61e9daf..9f3b3b4 100755 --- a/tests.branching/branch-creates-new-system-branch.script +++ b/tests.branching/branch-creates-new-system-branch.script @@ -18,7 +18,7 @@ set -eu -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch newbranch @@ -32,4 +32,4 @@ echo "Current branches:" echo "Current origin:" "$SRCDIR/scripts/run-git-in" newbranch/morphs remote show origin | - sed 's,\(TMP/mine/\.morph/cache/gits/file_\).*_,\1,g' + sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g' diff --git a/tests.branching/branch-when-branchdir-exists-locally.script b/tests.branching/branch-when-branchdir-exists-locally.script index 4692b5f..27d3206 100755 --- a/tests.branching/branch-when-branchdir-exists-locally.script +++ b/tests.branching/branch-when-branchdir-exists-locally.script @@ -19,7 +19,7 @@ set -eu -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init mkdir newbranch diff --git a/tests.branching/checkout-existing-branch.script b/tests.branching/checkout-existing-branch.script index 74941e1..54697a1 100755 --- a/tests.branching/checkout-existing-branch.script +++ b/tests.branching/checkout-existing-branch.script @@ -21,7 +21,7 @@ set -eu -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" checkout master diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script index 4e88ec7..a3a8d01 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -21,7 +21,7 @@ set -eu # Checkout the master system branch. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" checkout alfred @@ -30,10 +30,10 @@ cd alfred/morphs "$SRCDIR/scripts/test-morph" edit baserock:hello alfred echo "Current branches, morphs:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/alfred/morphs" branch +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/alfred/morphs" branch echo "Current branches, hello:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/alfred/hello" branch +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/alfred/hello" branch echo "Files in hello:" -ls "$DATADIR/mine/alfred/hello" +ls "$DATADIR/workspace/alfred/hello" diff --git a/tests.branching/edit-clones-chunk.script b/tests.branching/edit-clones-chunk.script index 8b87b4d..38f2cd7 100755 --- a/tests.branching/edit-clones-chunk.script +++ b/tests.branching/edit-clones-chunk.script @@ -21,7 +21,7 @@ set -eu # Create system branch. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch newbranch @@ -30,15 +30,17 @@ cd newbranch/morphs "$SRCDIR/scripts/test-morph" edit baserock:hello master echo "Current branches, morphs:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/newbranch/morphs" branch +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/newbranch/morphs" branch echo "Current origin, morphs:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/newbranch/morphs" \ - remote show origin | sed 's,\(TMP/mine/\.morph/cache/gits/file_\).*_,\1,g' +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/newbranch/morphs" \ + remote show origin | \ + sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g' echo "Current branches, hello:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/newbranch/hello" branch +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/newbranch/hello" branch echo "Current origin, hello:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/mine/newbranch/hello" \ - remote show origin | sed 's,\(TMP/mine/\.morph/cache/gits/file_\).*_,\1,g' +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/newbranch/hello" \ + remote show origin | \ + sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g' diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script index a3e213e..4a2f6a1 100755 --- a/tests.branching/edit-updates-stratum.script +++ b/tests.branching/edit-updates-stratum.script @@ -21,7 +21,7 @@ set -eu # Create system branch. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch newbranch diff --git a/tests.branching/edit-uses-ref-from-stratum.script b/tests.branching/edit-uses-ref-from-stratum.script index 74c26d5..8b952b0 100755 --- a/tests.branching/edit-uses-ref-from-stratum.script +++ b/tests.branching/edit-uses-ref-from-stratum.script @@ -21,7 +21,7 @@ set -eu # Create system branch. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch newbranch diff --git a/tests.branching/init-cwd.script b/tests.branching/init-cwd.script index 91c2350..61a62b1 100755 --- a/tests.branching/init-cwd.script +++ b/tests.branching/init-cwd.script @@ -19,7 +19,7 @@ set -eu # Test that "morph init" works for the current working directory. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init . -"$SRCDIR/scripts/list-tree" "$DATADIR/mine" +"$SRCDIR/scripts/list-tree" "$DATADIR/workspace" diff --git a/tests.branching/init-default.script b/tests.branching/init-default.script index 5ec5148..f6abf7d 100755 --- a/tests.branching/init-default.script +++ b/tests.branching/init-default.script @@ -19,6 +19,6 @@ set -eu # Test that "morph init" works without an explicit argument. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/list-tree" "$DATADIR/mine" +"$SRCDIR/scripts/list-tree" "$DATADIR/workspace" diff --git a/tests.branching/init-existing.script b/tests.branching/init-existing.script index 59b658a..b403108 100755 --- a/tests.branching/init-existing.script +++ b/tests.branching/init-existing.script @@ -20,5 +20,5 @@ set -eu # Test that "morph init" works when given the name of an existing, # empty directory. -"$SRCDIR/scripts/test-morph" init "$DATADIR/mine" -"$SRCDIR/scripts/list-tree" "$DATADIR/mine" +"$SRCDIR/scripts/test-morph" init "$DATADIR/workspace" +"$SRCDIR/scripts/list-tree" "$DATADIR/workspace" diff --git a/tests.branching/init-nonempty.script b/tests.branching/init-nonempty.script index 28762d0..3bcb8e8 100755 --- a/tests.branching/init-nonempty.script +++ b/tests.branching/init-nonempty.script @@ -20,5 +20,5 @@ set -eu # Test that "morph init" fails when given the name of an existing, # non-empty directory. -touch "$DATADIR/mine/foo" -"$SRCDIR/scripts/test-morph" init "$DATADIR/mine" +touch "$DATADIR/workspace/foo" +"$SRCDIR/scripts/test-morph" init "$DATADIR/workspace" diff --git a/tests.branching/init-nonempty.stderr b/tests.branching/init-nonempty.stderr index 4ed4bba..bc0ef0e 100644 --- a/tests.branching/init-nonempty.stderr +++ b/tests.branching/init-nonempty.stderr @@ -1 +1 @@ -ERROR: can only initialize empty directory: TMP/mine +ERROR: can only initialize empty directory as a workspace: TMP/workspace diff --git a/tests.branching/merge-explicitly-named-repos.script b/tests.branching/merge-explicitly-named-repos.script index 48705f8..a850904 100755 --- a/tests.branching/merge-explicitly-named-repos.script +++ b/tests.branching/merge-explicitly-named-repos.script @@ -22,7 +22,7 @@ set -eu # Create system branch. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch newbranch @@ -35,7 +35,7 @@ git add newfile.txt git commit -m foo --quiet # Merge changes to a new system branch. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch otherbranch cd otherbranch/morphs "$SRCDIR/scripts/test-morph" edit baserock:hello master diff --git a/tests.branching/minedir-not-found.script b/tests.branching/minedir-not-found.script index eb8c9d5..66e3336 100755 --- a/tests.branching/minedir-not-found.script +++ b/tests.branching/minedir-not-found.script @@ -14,6 +14,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -scripts/test-morph init "$DATADIR/mine" +scripts/test-morph init "$DATADIR/workspace" cd "$DATADIR" -"$SRCDIR/scripts/test-morph" minedir +"$SRCDIR/scripts/test-morph" workspace diff --git a/tests.branching/minedir-not-found.stderr b/tests.branching/minedir-not-found.stderr index 46dbd84..ea9fb16 100644 --- a/tests.branching/minedir-not-found.stderr +++ b/tests.branching/minedir-not-found.stderr @@ -1 +1 @@ -ERROR: Can't find the mine directory +ERROR: Can't find the workspace directory diff --git a/tests.branching/minedir.script b/tests.branching/minedir.script index 5f3574b..88a7b5e 100755 --- a/tests.branching/minedir.script +++ b/tests.branching/minedir.script @@ -14,7 +14,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -scripts/test-morph init "$DATADIR/mine" -mkdir -p "$DATADIR/mine/a/b/c" -cd "$DATADIR/mine/a/b/c" -"$SRCDIR/scripts/test-morph" minedir +scripts/test-morph init "$DATADIR/workspace" +mkdir -p "$DATADIR/workspace/a/b/c" +cd "$DATADIR/workspace/a/b/c" +"$SRCDIR/scripts/test-morph" workspace diff --git a/tests.branching/minedir.stdout b/tests.branching/minedir.stdout index 0fc25ee..14c44f7 100644 --- a/tests.branching/minedir.stdout +++ b/tests.branching/minedir.stdout @@ -1 +1 @@ -TMP/mine +TMP/workspace diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script index 303d7f7..02d5f1d 100755 --- a/tests.branching/petrify.script +++ b/tests.branching/petrify.script @@ -21,7 +21,7 @@ set -eu -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" update-gits baserock:morphs master \ hello-stratum.morph diff --git a/tests.branching/setup b/tests.branching/setup index 84d1d54..1705c9b 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -18,7 +18,7 @@ # Set up $DATADIR. # # - a morph.conf configuration file -# - an empty morph mine directory +# - an empty morph workspace directory # - a git repository called "morphs" for fake system, stratum morphologies # - a git repository calle "hello" for a dummy chunk @@ -41,7 +41,7 @@ GIT_COMMITTER_DATE="1343753514 +0000" cat <<EOF > "$DATADIR/morph.conf" [config] repo-alias = baserock=file://$DATADIR/%s#file://$DATADIR/%s -cachedir = $DATADIR/mine/.morph/cache +cachedir = $DATADIR/workspace/.morph/cache log = $DATADIR/morph.log keep-path = true no-distcc = true @@ -49,8 +49,8 @@ quiet = true EOF -# Create an empty directory to be used as a morph mine -mkdir "$DATADIR/mine" +# Create an empty directory to be used as a morph workspace +mkdir "$DATADIR/workspace" # Create a fake morphs repository diff --git a/tests.branching/show-system-branch-shows-name-correctly.script b/tests.branching/show-system-branch-shows-name-correctly.script index 38b2aa1..9bbbc27 100755 --- a/tests.branching/show-system-branch-shows-name-correctly.script +++ b/tests.branching/show-system-branch-shows-name-correctly.script @@ -22,7 +22,7 @@ set -eu # Create system branch. -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch newbranch diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index 6a365d8..0c4f857 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -21,7 +21,7 @@ set -eu -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch me/readme-fix cd me/readme-fix/morphs @@ -31,7 +31,7 @@ echo > README yoyoyo git add README git commit -m "Fix README, yo!" --quiet -cd "$DATADIR/mine" +cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" checkout master cd master/morphs "$SRCDIR/scripts/test-morph" edit baserock:hello master -- 1.7.11.4

There are mainly three situations to deal with: 1. We are outside a workspace and cannot deduce the system branch. 2. We are inside a workspace and inside a branch. We can detect this by walking up from the working directory towards the workspace. If we find a .morph-system-branch in one of the parent directories, we know the branch name. If we don't find one, something is wrong. 3. We are inside a workspace but outside a branch (or partially into a branch, e.g. in foo/ where the branch is foo/bar). We can deduce the branch if we recurse into subdirectories to find a .morph-system-branch directory. Care needs to be taken to not recurse infinitely. We may also not recurse if there are multiple subdirectories as these could belong to two different branches. This commit makes "morph show-system-branch" work in all of the above scenarios. It also adds tests for all of them. --- morphlib/plugins/branch_and_merge_plugin.py | 31 ++++++++++-- ...reates-new-system-branch-not-from-master.script | 8 +-- .../branch-creates-new-system-branch.script | 8 +-- .../branch-when-branchdir-exists-locally.script | 6 +-- tests.branching/checkout-existing-branch.script | 8 +-- .../edit-checkouts-existing-chunk.script | 6 +-- tests.branching/edit-clones-chunk.script | 6 +-- tests.branching/edit-updates-stratum.script | 6 +-- tests.branching/edit-uses-ref-from-stratum.script | 6 +-- tests.branching/init-cwd.script | 6 +-- tests.branching/init-default.script | 6 +-- tests.branching/init-existing.script | 6 +-- tests.branching/init-newdir.script | 6 +-- tests.branching/init-nonempty.script | 6 +-- .../merge-explicitly-named-repos.script | 6 +-- tests.branching/minedir-not-found.script | 6 +-- tests.branching/minedir.script | 6 +-- tests.branching/petrify.script | 6 +-- ...show-system-branch-fails-outside-workspace.exit | 1 + ...ow-system-branch-fails-outside-workspace.script | 33 +++++++++++++ ...ow-system-branch-fails-outside-workspace.stderr | 1 + ...stem-branch-fails-when-branch-is-ambiguous.exit | 1 + ...em-branch-fails-when-branch-is-ambiguous.script | 32 ++++++++++++ ...em-branch-fails-when-branch-is-ambiguous.stderr | 1 + .../show-system-branch-shows-name-correctly.script | 31 ------------ .../show-system-branch-shows-name-correctly.stdout | 1 - ...anch-works-anywhere-with-a-single-branch.script | 31 ++++++++++++ ...anch-works-anywhere-with-a-single-branch.stdout | 1 + ...rks-in-different-directories-in-a-branch.script | 57 ++++++++++++++++++++++ ...rks-in-different-directories-in-a-branch.stdout | 6 +++ tests.branching/workflow.script | 6 +-- 31 files changed, 249 insertions(+), 92 deletions(-) create mode 100644 tests.branching/show-system-branch-fails-outside-workspace.exit create mode 100755 tests.branching/show-system-branch-fails-outside-workspace.script create mode 100644 tests.branching/show-system-branch-fails-outside-workspace.stderr create mode 100644 tests.branching/show-system-branch-fails-when-branch-is-ambiguous.exit create mode 100755 tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script create mode 100644 tests.branching/show-system-branch-fails-when-branch-is-ambiguous.stderr delete mode 100755 tests.branching/show-system-branch-shows-name-correctly.script delete mode 100644 tests.branching/show-system-branch-shows-name-correctly.stdout create mode 100755 tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script create mode 100644 tests.branching/show-system-branch-works-anywhere-with-a-single-branch.stdout create mode 100755 tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script create mode 100644 tests.branching/show-system-branch-works-in-different-directories-in-a-branch.stdout diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 3145b77..cb97548 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -58,17 +58,42 @@ class BranchAndMergePlugin(cliapp.Plugin): dirname = os.path.dirname(dirname) raise cliapp.AppException("Can't find the workspace directory") + @staticmethod + def is_system_branch_directory(dirname): + return os.path.isdir(os.path.join(dirname, '.morph-system-branch')) + @classmethod def deduce_system_branch(cls): + # 1. Deduce the workspace. If this fails, we're not inside a workspace. workspace = cls.deduce_workspace() + # 2. We're in a workspace. Check if we're inside a system branch. + # If we are, return its name. dirname = os.getcwd() while dirname != workspace and dirname != '/': - system_branch_dir = os.path.join(dirname, '.morph-system-branch') - if os.path.isdir(system_branch_dir): - return os.path.dirname(system_branch_dir[len(workspace)+1:]) + if cls.is_system_branch_directory(dirname): + return os.path.relpath(dirname, workspace) dirname = os.path.dirname(dirname) + # 3. We're in a workspace but not inside a branch. Try to find a + # branch directory in the directories below the current working + # directory. Avoid ambiguousity by only recursing deeper if there + # is only one subdirectory. + visited = set() + for dirname, subdirs, files in os.walk(os.getcwd(), followlinks=True): + # Avoid infinite recursion. + if dirname in visited: + break + visited.add(dirname) + + if cls.is_system_branch_directory(dirname): + return os.path.relpath(dirname, workspace) + + # Do not recurse deeper if we have more than one + # non-hidden directory. + if len([x for x in subdirs if not x.startswith('.')]) > 1: + break + raise cliapp.AppException("Can't find the system branch directory") @staticmethod diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.script b/tests.branching/branch-creates-new-system-branch-not-from-master.script index 1116ae7..9356a70 100755 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.script +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -24,7 +24,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch newbranch origin/alfred echo "File tree:" -"$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | +"$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' echo "Current branches:" diff --git a/tests.branching/branch-creates-new-system-branch.script b/tests.branching/branch-creates-new-system-branch.script index 9f3b3b4..fa58796 100755 --- a/tests.branching/branch-creates-new-system-branch.script +++ b/tests.branching/branch-creates-new-system-branch.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -24,7 +24,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch newbranch echo "File tree:" -"$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | +"$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' echo "Current branches:" diff --git a/tests.branching/branch-when-branchdir-exists-locally.script b/tests.branching/branch-when-branchdir-exists-locally.script index 27d3206..7278e7e 100755 --- a/tests.branching/branch-when-branchdir-exists-locally.script +++ b/tests.branching/branch-when-branchdir-exists-locally.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/checkout-existing-branch.script b/tests.branching/checkout-existing-branch.script index 54697a1..643a3a5 100755 --- a/tests.branching/checkout-existing-branch.script +++ b/tests.branching/checkout-existing-branch.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -26,7 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" checkout master echo "File tree:" -"$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | +"$SRCDIR/scripts/list-tree" . | grep -v '/\.git/' | sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' echo "Current branches:" diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script index a3a8d01..9927685 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/edit-clones-chunk.script b/tests.branching/edit-clones-chunk.script index 38f2cd7..20f62a2 100755 --- a/tests.branching/edit-clones-chunk.script +++ b/tests.branching/edit-clones-chunk.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/edit-updates-stratum.script b/tests.branching/edit-updates-stratum.script index 4a2f6a1..7b81f59 100755 --- a/tests.branching/edit-updates-stratum.script +++ b/tests.branching/edit-updates-stratum.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/edit-uses-ref-from-stratum.script b/tests.branching/edit-uses-ref-from-stratum.script index 8b952b0..ce3e0cc 100755 --- a/tests.branching/edit-uses-ref-from-stratum.script +++ b/tests.branching/edit-uses-ref-from-stratum.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/init-cwd.script b/tests.branching/init-cwd.script index 61a62b1..2d14586 100755 --- a/tests.branching/init-cwd.script +++ b/tests.branching/init-cwd.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/init-default.script b/tests.branching/init-default.script index f6abf7d..de4627e 100755 --- a/tests.branching/init-default.script +++ b/tests.branching/init-default.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/init-existing.script b/tests.branching/init-existing.script index b403108..e713b9d 100755 --- a/tests.branching/init-existing.script +++ b/tests.branching/init-existing.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/init-newdir.script b/tests.branching/init-newdir.script index 70c8bb8..5e79ce8 100755 --- a/tests.branching/init-newdir.script +++ b/tests.branching/init-newdir.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/init-nonempty.script b/tests.branching/init-nonempty.script index 3bcb8e8..959da02 100755 --- a/tests.branching/init-nonempty.script +++ b/tests.branching/init-nonempty.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/merge-explicitly-named-repos.script b/tests.branching/merge-explicitly-named-repos.script index a850904..9052cd3 100755 --- a/tests.branching/merge-explicitly-named-repos.script +++ b/tests.branching/merge-explicitly-named-repos.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/minedir-not-found.script b/tests.branching/minedir-not-found.script index 66e3336..690f45d 100755 --- a/tests.branching/minedir-not-found.script +++ b/tests.branching/minedir-not-found.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/minedir.script b/tests.branching/minedir.script index 88a7b5e..f872a37 100755 --- a/tests.branching/minedir.script +++ b/tests.branching/minedir.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/petrify.script b/tests.branching/petrify.script index 02d5f1d..921eb04 100755 --- a/tests.branching/petrify.script +++ b/tests.branching/petrify.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/tests.branching/show-system-branch-fails-outside-workspace.exit b/tests.branching/show-system-branch-fails-outside-workspace.exit new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests.branching/show-system-branch-fails-outside-workspace.exit @@ -0,0 +1 @@ +1 diff --git a/tests.branching/show-system-branch-fails-outside-workspace.script b/tests.branching/show-system-branch-fails-outside-workspace.script new file mode 100755 index 0000000..fc3f3db --- /dev/null +++ b/tests.branching/show-system-branch-fails-outside-workspace.script @@ -0,0 +1,33 @@ +#!/bin/sh +# Copyright (C) 2012 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +# Check that 'morph show-system-branch' shows the name of the current system +# branch correctly. + + +set -eu + +# Create a workspace and branch. +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" init +"$SRCDIR/scripts/test-morph" branch testbranch + +# Leave the workspace. +cd .. + +# Try to show the current branch. +"$SRCDIR/scripts/test-morph" show-system-branch diff --git a/tests.branching/show-system-branch-fails-outside-workspace.stderr b/tests.branching/show-system-branch-fails-outside-workspace.stderr new file mode 100644 index 0000000..ea9fb16 --- /dev/null +++ b/tests.branching/show-system-branch-fails-outside-workspace.stderr @@ -0,0 +1 @@ +ERROR: Can't find the workspace directory diff --git a/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.exit b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.exit new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.exit @@ -0,0 +1 @@ +1 diff --git a/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script new file mode 100755 index 0000000..f6fc464 --- /dev/null +++ b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.script @@ -0,0 +1,32 @@ +#!/bin/sh +# Copyright (C) 2012 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +# Check that 'morph show-system-branch' fails when the system branch +# is not obvious. + + +set -eu + +# Create a workspace and two system branches +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" init +"$SRCDIR/scripts/test-morph" branch first/branch +"$SRCDIR/scripts/test-morph" branch second/branch + +# Try to find out the branch from the workspace directory. +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" show-system-branch diff --git a/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.stderr b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.stderr new file mode 100644 index 0000000..7c78473 --- /dev/null +++ b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.stderr @@ -0,0 +1 @@ +ERROR: Can't find the system branch directory diff --git a/tests.branching/show-system-branch-shows-name-correctly.script b/tests.branching/show-system-branch-shows-name-correctly.script deleted file mode 100755 index 9bbbc27..0000000 --- a/tests.branching/show-system-branch-shows-name-correctly.script +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# Copyright (C) 2012 Codethink Limited -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -# Check that 'morph show-system-branch' shows the name of the current system -# branch correctly. - - -set -eu - -# Create system branch. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch newbranch - -cd newbranch/morphs -"$SRCDIR/scripts/test-morph" show-system-branch - diff --git a/tests.branching/show-system-branch-shows-name-correctly.stdout b/tests.branching/show-system-branch-shows-name-correctly.stdout deleted file mode 100644 index 467e488..0000000 --- a/tests.branching/show-system-branch-shows-name-correctly.stdout +++ /dev/null @@ -1 +0,0 @@ -newbranch diff --git a/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script b/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script new file mode 100755 index 0000000..66b2a01 --- /dev/null +++ b/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script @@ -0,0 +1,31 @@ +#!/bin/sh +# Copyright (C) 2012 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +# Check that 'morph show-system-branch' works even outside a branch +# if there only is one in the workspcae. + + +set -eu + +# Create a workspace and a system branch. +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" init +"$SRCDIR/scripts/test-morph" branch first/branch + +# Show the branch even when outside the branch. +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" show-system-branch diff --git a/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.stdout b/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.stdout new file mode 100644 index 0000000..b934ad8 --- /dev/null +++ b/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.stdout @@ -0,0 +1 @@ +first/branch diff --git a/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script new file mode 100755 index 0000000..1391f0e --- /dev/null +++ b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.script @@ -0,0 +1,57 @@ +#!/bin/sh +# Copyright (C) 2012 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +# Check that 'morph show-system-branch' shows the name of the +# current system branch correctly from various working directories. + + +set -eu + +# Create a workspace and two system branches. +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" init +"$SRCDIR/scripts/test-morph" branch first/branch +"$SRCDIR/scripts/test-morph" branch second/branch + +# Create a few subdirectories in the first branch. +mkdir -p "$DATADIR/workspace/first/branch/foo" +mkdir -p "$DATADIR/workspace/first/branch/bar" +mkdir -p "$DATADIR/workspace/first/branch/foo/bar/baz" + +# Show the first branch when partially inside the branch. +cd "$DATADIR/workspace/first" +"$SRCDIR/scripts/test-morph" show-system-branch + +# Show the first branch when inside the main branch directory. +cd "$DATADIR/workspace/first/branch" +"$SRCDIR/scripts/test-morph" show-system-branch + +# Show the first branch when somewhere inside the branch. +cd "$DATADIR/workspace/first/branch/foo" +"$SRCDIR/scripts/test-morph" show-system-branch + +# Show the first branch when somewhere else inside the branch. +cd "$DATADIR/workspace/first/branch/foo/bar/baz" +"$SRCDIR/scripts/test-morph" show-system-branch + +# Show the second branch when partially inside the branch. +cd "$DATADIR/workspace/second" +"$SRCDIR/scripts/test-morph" show-system-branch + +# Show the second branch when inside the main branch directory. +cd "$DATADIR/workspace/second/branch" +"$SRCDIR/scripts/test-morph" show-system-branch diff --git a/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.stdout b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.stdout new file mode 100644 index 0000000..f9cc3ae --- /dev/null +++ b/tests.branching/show-system-branch-works-in-different-directories-in-a-branch.stdout @@ -0,0 +1,6 @@ +first/branch +first/branch +first/branch +first/branch +second/branch +second/branch diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index 0c4f857..ca626cd 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- 1.7.11.4

With this commit, "morph branch" and "morph checkout" remember the repository that was branched off from (the "branch root") in a special file called $workspace/$branch/.morph-system-branch/branch-root This information is later used when checking out individual repositories using "morph edit" instead of using the previously hard-coded "$workspace/$branch/morphs" repository as the branch root. This commit also updates the "morph merge" code to handle repositories specified with aliases or as full URLs in the same way "morph checkout" does. All affected tests are updated. --- morphlib/plugins/branch_and_merge_plugin.py | 81 ++++++++++++++-------- ...reates-new-system-branch-not-from-master.stdout | 1 + .../branch-creates-new-system-branch.stdout | 1 + tests.branching/checkout-existing-branch.stdout | 1 + tests.branching/checkout-non-aliased-repos.stdout | 2 + .../edit-checkouts-existing-chunk.script | 4 +- tests.branching/edit-clones-chunk.script | 5 +- tests.branching/edit-uses-ref-from-stratum.script | 2 +- .../merge-explicitly-named-repos.script | 4 +- tests.branching/workflow.script | 4 +- 10 files changed, 69 insertions(+), 36 deletions(-) diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 098546c..7406920 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -98,6 +98,20 @@ class BranchAndMergePlugin(cliapp.Plugin): raise cliapp.AppException("Can't find the system branch directory") @staticmethod + def write_branch_root(branch_dir, repo): + filename = os.path.join(branch_dir, '.morph-system-branch', + 'branch-root') + with open(filename, 'w') as f: + f.write('%s\n' % repo) + + @staticmethod + def read_branch_root(branch_dir): + filename = os.path.join(branch_dir, '.morph-system-branch', + 'branch-root') + with open(filename, 'r') as f: + return f.read().strip() + + @staticmethod def clone_to_directory(app, dirname, reponame, ref): '''Clone a repository below a directory. @@ -259,6 +273,9 @@ class BranchAndMergePlugin(cliapp.Plugin): # this directory as a morph system branch. os.mkdir(os.path.join(new_branch, '.morph-system-branch')) + # Remember the repository we branched off from. + self.write_branch_root(new_branch, self.system_repo_base) + # Clone into system branch directory. new_repo = os.path.join(new_branch, self.system_repo_base) self.clone_to_directory(self.app, new_repo, self.system_repo_name, @@ -301,6 +318,9 @@ class BranchAndMergePlugin(cliapp.Plugin): # this directory as a morph system branch. os.mkdir(os.path.join(system_branch, '.morph-system-branch')) + # Remember the repository we branched off from. + self.write_branch_root(system_branch, repo) + # Clone into system branch directory. repo_dir = os.path.join(system_branch, self._convert_uri_to_path(repo)) self.clone_to_directory(self.app, repo_dir, repo, system_branch) @@ -313,21 +333,22 @@ class BranchAndMergePlugin(cliapp.Plugin): def merge(self, args): '''Merge specified repositories from another system branch.''' - if len(args) == 0: + if len(args) < 2: raise cliapp.AppException('morph merge must get a branch name ' 'and some repo names as arguments') - app = self.app other_branch = args[0] workspace = self.deduce_workspace() this_branch = self.deduce_system_branch() for repo in args[1:]: - repo = self.resolve_reponame(app, repo) - basename = os.path.basename(repo) - pull_from = os.path.join(workspace, other_branch, basename) - repo_dir = os.path.join(workspace, this_branch, basename) - app.runcmd(['git', 'pull', pull_from, other_branch], cwd=repo_dir) + repo_url = self.resolve_reponame(self.app, repo) + repo_path = self._convert_uri_to_path(repo) + pull_from = 'file://' + os.path.join(workspace, other_branch, + repo_path) + repo_dir = os.path.join(workspace, this_branch, repo_path) + self.app.runcmd(['git', 'pull', pull_from, other_branch], + cwd=repo_dir) def edit(self, args): '''Edit a component in a system branch.''' @@ -336,43 +357,49 @@ class BranchAndMergePlugin(cliapp.Plugin): raise cliapp.AppException('morph edit must get a repository name ' 'and commit ref as argument') - app = self.app workspace = self.deduce_workspace() system_branch = self.deduce_system_branch() - morphs_dirname = os.path.join(workspace, system_branch, 'morphs') - if morphs_dirname is None: - raise morphlib.Error('Can not find morphs directory') + # Find out which repository we branched off from. + branch_dir = os.path.join(workspace, system_branch) + branch_root = self.read_branch_root(branch_dir) + + # Convert it to a local directory in the branch. + branch_root_path = self._convert_uri_to_path(branch_root) + branch_root_dir = os.path.join(branch_dir, branch_root_path) - repo = self.resolve_reponame(app, args[0]) + # Find out which repository to edit. + repo, repo_url = args[0], self.resolve_reponame(self.app, args[0]) + # Find out which ref of the edit repo to check out. if len(args) == 2: ref = args[1] else: - ref = self.find_edit_ref(app, morphs_dirname, repo) + ref = self.find_edit_ref(self.app, branch_root_dir, repo_url) if ref is None: raise morphlib.Error('Cannot deduce commit to start edit from') - new_repo = os.path.join(workspace, system_branch, - os.path.basename(repo)) - self.clone_to_directory(app, new_repo, args[0], ref) + # Clone the repository to be edited. + repo_dir = os.path.join(branch_dir, self._convert_uri_to_path(repo)) + self.clone_to_directory(self.app, repo_dir, repo, ref) if system_branch == ref: - app.runcmd(['git', 'checkout', system_branch], - cwd=new_repo) + self.app.runcmd(['git', 'checkout', system_branch], + cwd=repo_dir) else: - app.runcmd(['git', 'checkout', '-b', system_branch, ref], - cwd=new_repo) + self.app.runcmd(['git', 'checkout', '-b', system_branch, ref], + cwd=repo_dir) - for filename, morph in self.morphs_for_repo(app, morphs_dirname, repo): + for filename, morph in \ + self.morphs_for_repo(self.app, branch_root_dir, repo_url): changed = False for spec in morph['sources']: - spec_repo = self.resolve_reponame(app, spec['repo']) - if spec_repo == repo and spec['ref'] != system_branch: - app.status(msg='Replacing ref "%(ref)s" with "%(branch)s"' - 'in %(filename)s', - ref=spec['ref'], branch=system_branch, - filename=filename, chatty=True) + spec_repo = self.resolve_reponame(self.app, spec['repo']) + if spec_repo == repo_url and spec['ref'] != system_branch: + self.app.status(msg='Replacing ref "%(ref)s" with ' + '"%(branch)s" in %(filename)s', + ref=spec['ref'], branch=system_branch, + filename=filename, chatty=True) spec['ref'] = system_branch changed = True if changed: diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout index af1ad6c..7dc55cc 100644 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout @@ -9,6 +9,7 @@ d ./newbranch d ./newbranch/.morph-system-branch d ./newbranch/morphs d ./newbranch/morphs/.git +f ./newbranch/.morph-system-branch/branch-root f ./newbranch/morphs/hello-stratum.morph f ./newbranch/morphs/hello-system.morph f ./newbranch/morphs/this.is.alfred diff --git a/tests.branching/branch-creates-new-system-branch.stdout b/tests.branching/branch-creates-new-system-branch.stdout index e22ef30..c37fb0e 100644 --- a/tests.branching/branch-creates-new-system-branch.stdout +++ b/tests.branching/branch-creates-new-system-branch.stdout @@ -9,6 +9,7 @@ d ./newbranch d ./newbranch/.morph-system-branch d ./newbranch/morphs d ./newbranch/morphs/.git +f ./newbranch/.morph-system-branch/branch-root f ./newbranch/morphs/hello-stratum.morph f ./newbranch/morphs/hello-system.morph Current branches: diff --git a/tests.branching/checkout-existing-branch.stdout b/tests.branching/checkout-existing-branch.stdout index 7ac4a14..1af2900 100644 --- a/tests.branching/checkout-existing-branch.stdout +++ b/tests.branching/checkout-existing-branch.stdout @@ -9,6 +9,7 @@ d ./master d ./master/.morph-system-branch d ./master/baserock:morphs d ./master/baserock:morphs/.git +f ./master/.morph-system-branch/branch-root f ./master/baserock:morphs/hello-stratum.morph f ./master/baserock:morphs/hello-system.morph Current branches: diff --git a/tests.branching/checkout-non-aliased-repos.stdout b/tests.branching/checkout-non-aliased-repos.stdout index 75dcd63..872d74a 100644 --- a/tests.branching/checkout-non-aliased-repos.stdout +++ b/tests.branching/checkout-non-aliased-repos.stdout @@ -12,6 +12,7 @@ d ./master/TEMP_DIR d ./master/DATADIR d ./master/DATADIR/morphs d ./master/DATADIR/morphs/.git +f ./master/.morph-system-branch/branch-root f ./master/DATADIR/morphs/hello-stratum.morph f ./master/DATADIR/morphs/hello-system.morph Current branches of repo with suffix: @@ -30,6 +31,7 @@ d ./master/TEMP_DIR d ./master/DATADIR d ./master/DATADIR/morphs d ./master/DATADIR/morphs/.git +f ./master/.morph-system-branch/branch-root f ./master/DATADIR/morphs/hello-stratum.morph f ./master/DATADIR/morphs/hello-system.morph Current branches of repo without suffix: diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script index b8480a5..1c8e66c 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -33,7 +33,7 @@ echo "Current branches, morphs:" "$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/alfred/baserock:morphs" branch echo "Current branches, hello:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/alfred/hello" branch +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/alfred/baserock:hello" branch echo "Files in hello:" -ls "$DATADIR/workspace/alfred/hello" +ls "$DATADIR/workspace/alfred/baserock:hello" diff --git a/tests.branching/edit-clones-chunk.script b/tests.branching/edit-clones-chunk.script index 20f62a2..d5e117c 100755 --- a/tests.branching/edit-clones-chunk.script +++ b/tests.branching/edit-clones-chunk.script @@ -38,9 +38,10 @@ echo "Current origin, morphs:" sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g' echo "Current branches, hello:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/newbranch/hello" branch +"$SRCDIR/scripts/run-git-in" \ + "$DATADIR/workspace/newbranch/baserock:hello" branch echo "Current origin, hello:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/newbranch/hello" \ +"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/newbranch/baserock:hello" \ remote show origin | \ sed 's,\(TMP/workspace/\.morph/cache/gits/file_\).*_,\1,g' diff --git a/tests.branching/edit-uses-ref-from-stratum.script b/tests.branching/edit-uses-ref-from-stratum.script index ce3e0cc..f2276f3 100755 --- a/tests.branching/edit-uses-ref-from-stratum.script +++ b/tests.branching/edit-uses-ref-from-stratum.script @@ -29,5 +29,5 @@ cd "$DATADIR/workspace" cd newbranch/morphs "$SRCDIR/scripts/test-morph" edit baserock:hello -cd ../hello +cd ../baserock:hello git branch diff --git a/tests.branching/merge-explicitly-named-repos.script b/tests.branching/merge-explicitly-named-repos.script index 9052cd3..5a0953a 100755 --- a/tests.branching/merge-explicitly-named-repos.script +++ b/tests.branching/merge-explicitly-named-repos.script @@ -29,7 +29,7 @@ cd "$DATADIR/workspace" # Make a change to a chunk. cd newbranch/morphs "$SRCDIR/scripts/test-morph" edit baserock:hello master -cd ../hello +cd ../baserock:hello touch newfile.txt git add newfile.txt git commit -m foo --quiet @@ -42,7 +42,7 @@ cd otherbranch/morphs "$SRCDIR/scripts/test-morph" merge newbranch baserock:hello # Check results. -cd ../hello +cd ../baserock:hello git status --short # make sure all changes are committed ls newfile.txt # make sure the new file is there diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index 64326e4..59c7b15 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -26,7 +26,7 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" branch me/readme-fix cd me/readme-fix/morphs "$SRCDIR/scripts/test-morph" edit baserock:hello master -cd ../hello +cd ../baserock:hello echo > README yoyoyo git add README git commit -m "Fix README, yo!" --quiet @@ -35,5 +35,5 @@ cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" checkout baserock:morphs master cd master/baserock:morphs "$SRCDIR/scripts/test-morph" edit baserock:hello master -"$SRCDIR/scripts/test-morph" merge me/readme-fix hello +"$SRCDIR/scripts/test-morph" merge me/readme-fix baserock:hello -- 1.7.11.4

--- morphlib/plugins/branch_and_merge_plugin.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 7800566..3aa997c 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -275,14 +275,14 @@ class BranchAndMergePlugin(cliapp.Plugin): self.write_branch_root(new_branch, repo) # Clone into system branch directory. - repo_dir = os.path.join(new_branch, self._convert_uri_to_path(repo)) + repo_dir = os.path.join(new_branch, self.convert_uri_to_path(repo)) self.clone_to_directory(self.app, repo_dir, repo, commit) # Create a new branch in the local morphs repository. self.app.runcmd(['git', 'checkout', '-b', new_branch, commit], cwd=repo_dir) - def _convert_uri_to_path(self, uri): + def convert_uri_to_path(self, uri): parts = urlparse.urlparse(uri) # If the URI path is relative, assume it is an aliased repo (e.g. @@ -319,7 +319,7 @@ class BranchAndMergePlugin(cliapp.Plugin): self.write_branch_root(system_branch, repo) # Clone into system branch directory. - repo_dir = os.path.join(system_branch, self._convert_uri_to_path(repo)) + repo_dir = os.path.join(system_branch, self.convert_uri_to_path(repo)) self.clone_to_directory(self.app, repo_dir, repo, system_branch) def show_system_branch(self, args): @@ -340,7 +340,7 @@ class BranchAndMergePlugin(cliapp.Plugin): for repo in args[1:]: repo_url = self.resolve_reponame(self.app, repo) - repo_path = self._convert_uri_to_path(repo) + repo_path = self.convert_uri_to_path(repo) pull_from = 'file://' + os.path.join(workspace, other_branch, repo_path) repo_dir = os.path.join(workspace, this_branch, repo_path) @@ -362,7 +362,7 @@ class BranchAndMergePlugin(cliapp.Plugin): branch_root = self.read_branch_root(branch_dir) # Convert it to a local directory in the branch. - branch_root_path = self._convert_uri_to_path(branch_root) + branch_root_path = self.convert_uri_to_path(branch_root) branch_root_dir = os.path.join(branch_dir, branch_root_path) # Find out which repository to edit. @@ -377,7 +377,7 @@ class BranchAndMergePlugin(cliapp.Plugin): raise morphlib.Error('Cannot deduce commit to start edit from') # Clone the repository to be edited. - repo_dir = os.path.join(branch_dir, self._convert_uri_to_path(repo)) + repo_dir = os.path.join(branch_dir, self.convert_uri_to_path(repo)) self.clone_to_directory(self.app, repo_dir, repo, ref) if system_branch == ref: -- 1.7.11.4