From de019ebba77fc54ddfce9759fada9731625336f7 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Fri, 31 Aug 2012 15:44:07 +0000 Subject: Remember the repo that is cloned from during branch/checkout/edit We do this by storing a morph.repository option in the local clone's .git/config file. This way the user can rename local repositories or move them around in a system branch in whatever way he or she likes and we can still find the repository later by the same name. Previously, we could only identify repositories in a system branch by their directory name. Now things are more flexible and tolerant of "unexpected" user behavior. --- ...repository-stored-in-cloned-repositories.script | 47 ++++++++++++++++++++++ ...repository-stored-in-cloned-repositories.stdout | 8 ++++ 2 files changed, 55 insertions(+) create mode 100755 tests.branching/morph-repository-stored-in-cloned-repositories.script create mode 100644 tests.branching/morph-repository-stored-in-cloned-repositories.stdout (limited to 'tests.branching') diff --git a/tests.branching/morph-repository-stored-in-cloned-repositories.script b/tests.branching/morph-repository-stored-in-cloned-repositories.script new file mode 100755 index 00000000..bfc5499b --- /dev/null +++ b/tests.branching/morph-repository-stored-in-cloned-repositories.script @@ -0,0 +1,47 @@ +#!/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. + +# Verify that morph branch/checkout/edit create repositories that have +# a "git config morph.repository" option set so that we can +# identify these repositories later even when the user has renamed or +# moved their local directories. + +set -eu + +cd "$DATADIR/workspace" + +"$SRCDIR/scripts/test-morph" init +"$SRCDIR/scripts/test-morph" branch baserock:morphs newbranch + +echo "morph.repository in branch root repository:" +cd "$DATADIR/workspace/newbranch/baserock:morphs" +git config morph.repository +echo + +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" checkout baserock:morphs master + +echo "morph.repository in branch root repository of a checkout:" +cd "$DATADIR/workspace/master/baserock:morphs" +git config morph.repository +echo + +cd "$DATADIR/workspace/master" +"$SRCDIR/scripts/test-morph" edit baserock:hello master + +echo "morph.repository of an edited repository:" +cd "$DATADIR/workspace/master/baserock:hello" +git config morph.repository diff --git a/tests.branching/morph-repository-stored-in-cloned-repositories.stdout b/tests.branching/morph-repository-stored-in-cloned-repositories.stdout new file mode 100644 index 00000000..b57f0c1f --- /dev/null +++ b/tests.branching/morph-repository-stored-in-cloned-repositories.stdout @@ -0,0 +1,8 @@ +morph.repository in branch root repository: +baserock:morphs + +morph.repository in branch root repository of a checkout: +baserock:morphs + +morph.repository of an edited repository: +baserock:hello -- cgit v1.2.1 From f9718b4dcc172763c1dd46bc805b6bde03ec3706 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Fri, 31 Aug 2012 16:24:54 +0000 Subject: Find branch root using the morph.repository option in .git/config This is more flexible than relying on the branch root repository directory to have the original name. The user might rename the branch root directory and we still want to be able to find it. Add a test that this new functionality works. --- ...edit-works-after-branch-root-was-renamed.script | 34 ++++++++++++++++++++++ ...edit-works-after-branch-root-was-renamed.stdout | 18 ++++++++++++ 2 files changed, 52 insertions(+) create mode 100755 tests.branching/edit-works-after-branch-root-was-renamed.script create mode 100644 tests.branching/edit-works-after-branch-root-was-renamed.stdout (limited to 'tests.branching') diff --git a/tests.branching/edit-works-after-branch-root-was-renamed.script b/tests.branching/edit-works-after-branch-root-was-renamed.script new file mode 100755 index 00000000..da8fb0b7 --- /dev/null +++ b/tests.branching/edit-works-after-branch-root-was-renamed.script @@ -0,0 +1,34 @@ +#!/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. + +# Verify that the branch root repository created by "morph branch" or +# "morph checkout" can be renamed and "morph edit" still finds the +# branch root repo and works. + +set -eu + +cd "$DATADIR/workspace" + +"$SRCDIR/scripts/test-morph" init +"$SRCDIR/scripts/test-morph" checkout baserock:morphs master + +cd "$DATADIR/workspace/master" +mv baserock:morphs my-renamed-morphs + +"$SRCDIR/scripts/test-morph" edit baserock:hello master + +"$SRCDIR/scripts/list-tree" "$DATADIR/workspace" | grep -v '/\.git/' | + sed 's,/cache/gits/file_[^/]*_,/cache/gits/file_,' diff --git a/tests.branching/edit-works-after-branch-root-was-renamed.stdout b/tests.branching/edit-works-after-branch-root-was-renamed.stdout new file mode 100644 index 00000000..5554e08b --- /dev/null +++ b/tests.branching/edit-works-after-branch-root-was-renamed.stdout @@ -0,0 +1,18 @@ +d . +d ./.morph +d ./.morph/cache +d ./.morph/cache/gits +d ./.morph/cache/gits/file_hello +d ./.morph/cache/gits/file_hello/.git +d ./.morph/cache/gits/file_morphs +d ./.morph/cache/gits/file_morphs/.git +d ./master +d ./master/.morph-system-branch +d ./master/baserock:hello +d ./master/baserock:hello/.git +d ./master/my-renamed-morphs +d ./master/my-renamed-morphs/.git +f ./master/.morph-system-branch/branch-root +f ./master/baserock:hello/hello.morph +f ./master/my-renamed-morphs/hello-stratum.morph +f ./master/my-renamed-morphs/hello-system.morph -- cgit v1.2.1