8:38 a.m.
Repository: git://git.baserock.org/baserock/morph
Branch: jannis/show-branch-root-and-cwd-fixes
SHA1: 5fa1ed849582adda95a94cbd99c10786b3099c28
The first patch adds a new command. The second patch allows branch and
checkout to be run from anywhere in the workspace.
Jannis Pohlmann (2):
Add "morph show-branch-root" command
Fix branch/checkout to always create branches in the workspace
directory
morphlib/plugins/branch_and_merge_plugin.py | 35 +++++---
.../branch-when-branchdir-exists-locally.stderr | 2 +-
tests.branching/branch-works-anywhere.script | 56 +++++++++++++
tests.branching/branch-works-anywhere.stdout | 98 ++++++++++++++++++++++
tests.branching/checkout-works-anywhere.stdout | 35 ++++++++
.../show-branch-root-in-branched-branch.script | 30 +++++++
.../show-branch-root-in-branched-branch.stdout | 1 +
.../show-branch-root-in-checked-out-branch.script | 30 +++++++
.../show-branch-root-in-checked-out-branch.stdout | 1 +
.../show-branch-root-with-repo-url.script | 30 +++++++
.../show-branch-root-with-repo-url.stdout | 1 +
11 files changed, 308 insertions(+), 11 deletions(-)
create mode 100755 tests.branching/branch-works-anywhere.script
create mode 100644 tests.branching/branch-works-anywhere.stdout
create mode 100644 tests.branching/checkout-works-anywhere.stdout
create mode 100755 tests.branching/show-branch-root-in-branched-branch.script
create mode 100644 tests.branching/show-branch-root-in-branched-branch.stdout
create mode 100755 tests.branching/show-branch-root-in-checked-out-branch.script
create mode 100644 tests.branching/show-branch-root-in-checked-out-branch.stdout
create mode 100755 tests.branching/show-branch-root-with-repo-url.script
create mode 100644 tests.branching/show-branch-root-with-repo-url.stdout
--
1.7.11.4
8:38 a.m.
New subject: [PATCH 1/2] Add "morph show-branch-root" command
This commit introduces a new "morph show-branch-root" command to print
the repository that the user branched off from with "morph branch" or
that he or she checked out with "morph checkout".
Also add tests for this new command.
---
morphlib/plugins/branch_and_merge_plugin.py | 11 ++++++++
.../show-branch-root-in-branched-branch.script | 30 ++++++++++++++++++++++
.../show-branch-root-in-branched-branch.stdout | 1 +
.../show-branch-root-in-checked-out-branch.script | 30 ++++++++++++++++++++++
.../show-branch-root-in-checked-out-branch.stdout | 1 +
.../show-branch-root-with-repo-url.script | 30 ++++++++++++++++++++++
.../show-branch-root-with-repo-url.stdout | 1 +
7 files changed, 104 insertions(+)
create mode 100755 tests.branching/show-branch-root-in-branched-branch.script
create mode 100644 tests.branching/show-branch-root-in-branched-branch.stdout
create mode 100755 tests.branching/show-branch-root-in-checked-out-branch.script
create mode 100644 tests.branching/show-branch-root-in-checked-out-branch.stdout
create mode 100755 tests.branching/show-branch-root-with-repo-url.script
create mode 100644 tests.branching/show-branch-root-with-repo-url.stdout
diff --git a/morphlib/plugins/branch_and_merge_plugin.py
b/morphlib/plugins/branch_and_merge_plugin.py
index dcadba7..ee8c812 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -38,6 +38,8 @@ class BranchAndMergePlugin(cliapp.Plugin):
arg_synopsis='BRANCH')
self.app.add_subcommand('show-system-branch', self.show_system_branch,
arg_synopsis='')
+ self.app.add_subcommand('show-branch-root', self.show_branch_root,
+ arg_synopsis='')
self.app.add_subcommand('merge', self.merge,
arg_synopsis='BRANCH REPO...')
self.app.add_subcommand('edit', self.edit,
@@ -327,6 +329,15 @@ class BranchAndMergePlugin(cliapp.Plugin):
self.app.output.write('%s\n' % self.deduce_system_branch())
+ def show_branch_root(self, args):
+ '''Print name of the repository that was branched off
from.'''
+
+ workspace = self.deduce_workspace()
+ system_branch = self.deduce_system_branch()
+ branch_dir = os.path.join(workspace, system_branch)
+ branch_root = self.read_branch_root(branch_dir)
+ self.app.output.write('%s\n' % branch_root)
+
def merge(self, args):
'''Merge specified repositories from another system
branch.'''
diff --git a/tests.branching/show-branch-root-in-branched-branch.script
b/tests.branching/show-branch-root-in-branched-branch.script
new file mode 100755
index 0000000..aeb06bf
--- /dev/null
+++ b/tests.branching/show-branch-root-in-branched-branch.script
@@ -0,0 +1,30 @@
+#!/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-branch-root' works when being run in a
+# local system branch created using 'morph branch ...'.
+
+
+set -eu
+
+# Create a workspace and branch.
+cd "$DATADIR/workspace"
+"$SRCDIR/scripts/test-morph" init
+"$SRCDIR/scripts/test-morph" branch baserock:morphs testbranch
+
+# Try to print the branch root repository.
+"$SRCDIR/scripts/test-morph" show-branch-root
diff --git a/tests.branching/show-branch-root-in-branched-branch.stdout
b/tests.branching/show-branch-root-in-branched-branch.stdout
new file mode 100644
index 0000000..53a8bc4
--- /dev/null
+++ b/tests.branching/show-branch-root-in-branched-branch.stdout
@@ -0,0 +1 @@
+baserock:morphs
diff --git a/tests.branching/show-branch-root-in-checked-out-branch.script
b/tests.branching/show-branch-root-in-checked-out-branch.script
new file mode 100755
index 0000000..ce76cc7
--- /dev/null
+++ b/tests.branching/show-branch-root-in-checked-out-branch.script
@@ -0,0 +1,30 @@
+#!/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-branch-root' works when being run in a
+# local system branch created using 'morph checkout ...'.
+
+
+set -eu
+
+# Create a workspace and branch.
+cd "$DATADIR/workspace"
+"$SRCDIR/scripts/test-morph" init
+"$SRCDIR/scripts/test-morph" checkout baserock:morphs master
+
+# Try to print the branch root repository.
+"$SRCDIR/scripts/test-morph" show-branch-root
diff --git a/tests.branching/show-branch-root-in-checked-out-branch.stdout
b/tests.branching/show-branch-root-in-checked-out-branch.stdout
new file mode 100644
index 0000000..53a8bc4
--- /dev/null
+++ b/tests.branching/show-branch-root-in-checked-out-branch.stdout
@@ -0,0 +1 @@
+baserock:morphs
diff --git a/tests.branching/show-branch-root-with-repo-url.script
b/tests.branching/show-branch-root-with-repo-url.script
new file mode 100755
index 0000000..1470e0a
--- /dev/null
+++ b/tests.branching/show-branch-root-with-repo-url.script
@@ -0,0 +1,30 @@
+#!/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-branch-root' works when being run in a
+# local system branch created from a full repository URL.
+
+
+set -eu
+
+# Create a workspace and branch.
+cd "$DATADIR/workspace"
+"$SRCDIR/scripts/test-morph" init
+"$SRCDIR/scripts/test-morph" branch "file://${DATADIR}/morphs.git"
testbranch
+
+# Try to print the branch root repository.
+"$SRCDIR/scripts/test-morph" show-branch-root
diff --git a/tests.branching/show-branch-root-with-repo-url.stdout
b/tests.branching/show-branch-root-with-repo-url.stdout
new file mode 100644
index 0000000..2d47eb4
--- /dev/null
+++ b/tests.branching/show-branch-root-with-repo-url.stdout
@@ -0,0 +1 @@
+file://TMP/morphs.git
--
1.7.11.4
8:38 a.m.
New subject: [PATCH 2/2] Fix branch/checkout to always create branches in the workspace directory
Doing this rather than creating the system branches in the current working
directory allows "morph branch" and "morph checkout" to be run
anywhere in
the workspace (e.g. in a different branch).
This commit also adds two tests to verify that new branches are always
created in the toplevel workspace directory.
---
morphlib/plugins/branch_and_merge_plugin.py | 24 +++---
.../branch-when-branchdir-exists-locally.stderr | 2 +-
tests.branching/branch-works-anywhere.script | 56 +++++++++++++
tests.branching/branch-works-anywhere.stdout | 98 ++++++++++++++++++++++
tests.branching/checkout-works-anywhere.stdout | 35 ++++++++
5 files changed, 204 insertions(+), 11 deletions(-)
create mode 100755 tests.branching/branch-works-anywhere.script
create mode 100644 tests.branching/branch-works-anywhere.stdout
create mode 100644 tests.branching/checkout-works-anywhere.stdout
diff --git a/morphlib/plugins/branch_and_merge_plugin.py
b/morphlib/plugins/branch_and_merge_plugin.py
index ee8c812..86e77d8 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -267,17 +267,19 @@ class BranchAndMergePlugin(cliapp.Plugin):
commit = 'master' if len(args) == 2 else args[2]
# Create the system branch directory.
- os.makedirs(new_branch)
+ workspace = self.deduce_workspace()
+ branch_dir = os.path.join(workspace, new_branch)
+ os.makedirs(branch_dir)
# Create a .morph-system-branch directory to clearly identify
# this directory as a morph system branch.
- os.mkdir(os.path.join(new_branch, '.morph-system-branch'))
+ os.mkdir(os.path.join(branch_dir, '.morph-system-branch'))
# Remember the repository we branched off from.
- self.write_branch_root(new_branch, repo)
+ self.write_branch_root(branch_dir, repo)
# Clone into system branch directory.
- repo_dir = os.path.join(new_branch, 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, commit)
# Create a new branch in the local morphs repository.
@@ -311,17 +313,19 @@ class BranchAndMergePlugin(cliapp.Plugin):
system_branch = args[1]
# Create the system branch directory.
- os.makedirs(system_branch)
+ workspace = self.deduce_workspace()
+ branch_dir = os.path.join(workspace, system_branch)
+ os.makedirs(branch_dir)
# Create a .morph-system-branch directory to clearly identify
# this directory as a morph system branch.
- os.mkdir(os.path.join(system_branch, '.morph-system-branch'))
+ os.mkdir(os.path.join(branch_dir, '.morph-system-branch'))
# Remember the repository we branched off from.
- self.write_branch_root(system_branch, repo)
+ self.write_branch_root(branch_dir, repo)
# Clone into system branch directory.
- repo_dir = os.path.join(system_branch, 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, system_branch)
def show_system_branch(self, args):
@@ -352,8 +356,8 @@ 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)
- pull_from = 'file://' + os.path.join(workspace, other_branch,
- repo_path)
+ pull_from = urlparse.urljoin(
+ '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)
diff --git a/tests.branching/branch-when-branchdir-exists-locally.stderr
b/tests.branching/branch-when-branchdir-exists-locally.stderr
index 6c56c25..e178cf2 100644
--- a/tests.branching/branch-when-branchdir-exists-locally.stderr
+++ b/tests.branching/branch-when-branchdir-exists-locally.stderr
@@ -1 +1 @@
-ERROR: newbranch: File exists
+ERROR: TMP/workspace/newbranch: File exists
diff --git a/tests.branching/branch-works-anywhere.script
b/tests.branching/branch-works-anywhere.script
new file mode 100755
index 0000000..85098f4
--- /dev/null
+++ b/tests.branching/branch-works-anywhere.script
@@ -0,0 +1,56 @@
+#!/bin/bash
+# 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.
+
+# Make sure "morph branch" works anywhere in a workspace or system branch.
+
+set -eu
+
+cd "$DATADIR/workspace"
+"$SRCDIR/scripts/test-morph" init
+
+# First, create a branch.
+"$SRCDIR/scripts/test-morph" branch baserock:morphs branch1
+
+echo "Workspace after creating the first branch:"
+"$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v
'/\.git/' |
+ sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,'
+
+# Now, create a nother branch from the workspace.
+"$SRCDIR/scripts/test-morph" branch baserock:morphs branch2
+
+echo "Workspace after creating the second branch:"
+"$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v
'/\.git/' |
+ sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,'
+
+# Now, enter the first branch and create a third branch, which
+# should not be created in the working directory but in the
+# workspace directory.
+cd "$DATADIR/workspace/branch1"
+"$SRCDIR/scripts/test-morph" branch baserock:morphs branch3
+
+echo "Workspace after creating the third branch:"
+"$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v
'/\.git/' |
+ sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,'
+
+# Now, go into the morphs repository of that third branch and
+# create a fourth system branch from in there. This, too, should
+# end up being created in the toplevel workspace directory.
+cd "$DATADIR/workspace/branch3/baserock:morphs"
+"$SRCDIR/scripts/test-morph" branch baserock:morphs branch4
+
+echo "Workspace after creating the fourth branch:"
+"$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v
'/\.git/' |
+ sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,'
diff --git a/tests.branching/branch-works-anywhere.stdout
b/tests.branching/branch-works-anywhere.stdout
new file mode 100644
index 0000000..cddc2d7
--- /dev/null
+++ b/tests.branching/branch-works-anywhere.stdout
@@ -0,0 +1,98 @@
+Workspace after creating the first branch:
+d .
+d ./.morph
+d ./.morph/cache
+d ./.morph/cache/gits
+d ./.morph/cache/gits/file_morphs
+d ./.morph/cache/gits/file_morphs/.git
+d ./branch1
+d ./branch1/.morph-system-branch
+d ./branch1/baserock:morphs
+d ./branch1/baserock:morphs/.git
+f ./branch1/.morph-system-branch/branch-root
+f ./branch1/baserock:morphs/hello-stratum.morph
+f ./branch1/baserock:morphs/hello-system.morph
+Workspace after creating the second branch:
+d .
+d ./.morph
+d ./.morph/cache
+d ./.morph/cache/gits
+d ./.morph/cache/gits/file_morphs
+d ./.morph/cache/gits/file_morphs/.git
+d ./branch1
+d ./branch1/.morph-system-branch
+d ./branch1/baserock:morphs
+d ./branch1/baserock:morphs/.git
+d ./branch2
+d ./branch2/.morph-system-branch
+d ./branch2/baserock:morphs
+d ./branch2/baserock:morphs/.git
+f ./branch1/.morph-system-branch/branch-root
+f ./branch1/baserock:morphs/hello-stratum.morph
+f ./branch1/baserock:morphs/hello-system.morph
+f ./branch2/.morph-system-branch/branch-root
+f ./branch2/baserock:morphs/hello-stratum.morph
+f ./branch2/baserock:morphs/hello-system.morph
+Workspace after creating the third branch:
+d .
+d ./.morph
+d ./.morph/cache
+d ./.morph/cache/gits
+d ./.morph/cache/gits/file_morphs
+d ./.morph/cache/gits/file_morphs/.git
+d ./branch1
+d ./branch1/.morph-system-branch
+d ./branch1/baserock:morphs
+d ./branch1/baserock:morphs/.git
+d ./branch2
+d ./branch2/.morph-system-branch
+d ./branch2/baserock:morphs
+d ./branch2/baserock:morphs/.git
+d ./branch3
+d ./branch3/.morph-system-branch
+d ./branch3/baserock:morphs
+d ./branch3/baserock:morphs/.git
+f ./branch1/.morph-system-branch/branch-root
+f ./branch1/baserock:morphs/hello-stratum.morph
+f ./branch1/baserock:morphs/hello-system.morph
+f ./branch2/.morph-system-branch/branch-root
+f ./branch2/baserock:morphs/hello-stratum.morph
+f ./branch2/baserock:morphs/hello-system.morph
+f ./branch3/.morph-system-branch/branch-root
+f ./branch3/baserock:morphs/hello-stratum.morph
+f ./branch3/baserock:morphs/hello-system.morph
+Workspace after creating the fourth branch:
+d .
+d ./.morph
+d ./.morph/cache
+d ./.morph/cache/gits
+d ./.morph/cache/gits/file_morphs
+d ./.morph/cache/gits/file_morphs/.git
+d ./branch1
+d ./branch1/.morph-system-branch
+d ./branch1/baserock:morphs
+d ./branch1/baserock:morphs/.git
+d ./branch2
+d ./branch2/.morph-system-branch
+d ./branch2/baserock:morphs
+d ./branch2/baserock:morphs/.git
+d ./branch3
+d ./branch3/.morph-system-branch
+d ./branch3/baserock:morphs
+d ./branch3/baserock:morphs/.git
+d ./branch4
+d ./branch4/.morph-system-branch
+d ./branch4/baserock:morphs
+d ./branch4/baserock:morphs/.git
+f ./branch1/.morph-system-branch/branch-root
+f ./branch1/baserock:morphs/hello-stratum.morph
+f ./branch1/baserock:morphs/hello-system.morph
+f ./branch2/.morph-system-branch/branch-root
+f ./branch2/baserock:morphs/hello-stratum.morph
+f ./branch2/baserock:morphs/hello-system.morph
+f ./branch3/.morph-system-branch/branch-root
+f ./branch3/baserock:morphs/hello-stratum.morph
+f ./branch3/baserock:morphs/hello-system.morph
+f ./branch4/.morph-system-branch/branch-root
+f ./branch4/baserock:morphs/hello-stratum.morph
+f ./branch4/baserock:morphs/hello-system.morph
diff --git a/tests.branching/checkout-works-anywhere.stdout
b/tests.branching/checkout-works-anywhere.stdout
new file mode 100644
index 0000000..0cd18b8
--- /dev/null
+++ b/tests.branching/checkout-works-anywhere.stdout
@@ -0,0 +1,35 @@
+Workspace after checking out master from the workspace directory:
+d .
+d ./.morph
+d ./.morph/cache
+d ./.morph/cache/gits
+d ./.morph/cache/gits/file_morphs
+d ./.morph/cache/gits/file_morphs/.git
+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
+Workspace after checking out master from within a new branch:
+d .
+d ./.morph
+d ./.morph/cache
+d ./.morph/cache/gits
+d ./.morph/cache/gits/file_morphs
+d ./.morph/cache/gits/file_morphs/.git
+d ./master
+d ./master/.morph-system-branch
+d ./master/baserock:morphs
+d ./master/baserock:morphs/.git
+d ./newbranch
+d ./newbranch/.morph-system-branch
+d ./newbranch/baserock:morphs
+d ./newbranch/baserock:morphs/.git
+f ./master/.morph-system-branch/branch-root
+f ./master/baserock:morphs/hello-stratum.morph
+f ./master/baserock:morphs/hello-system.morph
+f ./newbranch/.morph-system-branch/branch-root
+f ./newbranch/baserock:morphs/hello-stratum.morph
+f ./newbranch/baserock:morphs/hello-system.morph
--
1.7.11.4
9:29 a.m.
New subject: [PATCH 2/2] Fix branch/checkout to always create branches in the workspace directory
On 08/30/2012 02:38 PM, Jannis Pohlmann wrote:
Doing this rather than creating the system branches in the current
working
directory allows "morph branch" and "morph checkout" to be run
anywhere in
the workspace (e.g. in a different branch).
This commit also adds two tests to verify that new branches are always
created in the toplevel workspace directory.
---
morphlib/plugins/branch_and_merge_plugin.py | 24 +++---
.../branch-when-branchdir-exists-locally.stderr | 2 +-
tests.branching/branch-works-anywhere.script | 56 +++++++++++++
tests.branching/branch-works-anywhere.stdout | 98 ++++++++++++++++++++++
tests.branching/checkout-works-anywhere.stdout | 35 ++++++++
This patch is missing tests.branching/checkout-works-anywhere.script, so
I'll resend once again...
- Jannis
--
Jannis Pohlmann
Senior Software Developer
Codethink Limited
http://codethink.co.uk
3858
days inactive
3858
days old
3 comments
1 participants
participants (1)
-
Jannis Pohlmann