[PATCH 0/3] Find repos using a morph.repository .git/config option
by Jannis Pohlmann
Repository: git://git.baserock.org/baserock/morph
Branch: jannis/remember-repos-using-git-config-option
SHA1: baf712aa198e0c6a7adab42e38e00a9df5d0adf3
Jannis Pohlmann (3):
Remember the repo that is cloned from during branch/checkout/edit
Fix branch dir search by not aborting when seeing a directory twice
Find branch root using the morph.repository option in .git/config
morphlib/plugins/branch_and_merge_plugin.py | 43 ++++++++++++++++----
...edit-works-after-branch-root-was-renamed.script | 34 ++++++++++++++++
...edit-works-after-branch-root-was-renamed.stdout | 18 +++++++++
...repository-stored-in-cloned-repositories.script | 47 ++++++++++++++++++++++
...repository-stored-in-cloned-repositories.stdout | 8 ++++
5 files changed, 142 insertions(+), 8 deletions(-)
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
create mode 100755 tests.branching/morph-repository-stored-in-cloned-repositories.script
create mode 100644 tests.branching/morph-repository-stored-in-cloned-repositories.stdout
--
1.7.11.4
11 years, 2 months
[PATCH] Store branch root in a different way
by Jannis Pohlmann
Repository: git://git.baserock.org/baserock/morph
Branch: jannis/git-config-for-branch-options
SHA1: 6935a3db514f1552c2ffd4d24b6521bb185dcd73
Jannis Pohlmann (1):
Use git config to store the branch root in
.morph-system-branch/config
morphlib/plugins/branch_and_merge_plugin.py | 24 +++++++++++++---------
...reates-new-system-branch-not-from-master.stdout | 2 +-
.../branch-creates-new-system-branch.stdout | 2 +-
tests.branching/branch-works-anywhere.stdout | 20 +++++++++---------
tests.branching/checkout-existing-branch.stdout | 2 +-
tests.branching/checkout-non-aliased-repos.stdout | 4 ++--
tests.branching/checkout-works-anywhere.stdout | 6 +++---
7 files changed, 32 insertions(+), 28 deletions(-)
--
1.7.11.4
11 years, 2 months
[PATCH] Improve the morph manual page
by Joel Dillon
A simple patch to update the morph manual page with a basic description
of what it does within the context of Baserock, and a pointer to the
Baserock wiki for more information.
* Repository: git://roadtrain.codethink.co.uk/baserock/morph
* Branch: joeldillon/documentation
* Commit: cf70941e16afe6f6b8509e25446bea441ac99353
Joel Dillon (1):
Modified man page to go into more detail about what morph does
morph.1.in | 34 +++++++++++++++++++++++++++++-----
1 file changed, 29 insertions(+), 5 deletions(-)
--
1.7.9.5
11 years, 2 months
[PATCH 0/2] Add show-branch-root, improve branch/checkout
by Jannis Pohlmann
Repository: git://git.baserock.org/baserock/morph
Branch: jannis/show-branch-root-and-cwd-fixes
SHA1: 5fa1ed849582adda95a94cbd99c10786b3099c28
Resending the previous patchset, this time including a missing
test script.
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
11 years, 3 months
[PATCH 0/2] Add "show-branch-root" command, improve branch/checkout
by Jannis Pohlmann
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
11 years, 3 months
[PATCH] Add "morph show-branch-root" command
by Jannis Pohlmann
Repository: git://git.baserock.org/baserock/morph
Branch: jannis/show-branch-root-command
SHA1: 4c1578f99604d7206ae8e1c4034b1863e59e0fe4
This patch depends on the changes in jannis/initial-branch-and-merge-work
being merged first.
Jannis Pohlmann (1):
Add "morph show-branch-root" 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
--
1.7.11.4
11 years, 3 months
[PATCH 0/8] Make branch/merge commands more flexible (revised)
by Jannis Pohlmann
Repsitory: git://git.baserock.org/baserock/morph
Branch: jannis/initial-branch-and-merge-work
SHA1: 17e4c4c0bad5589dabf67156afdfe9dc4e8f218b
This is a revised version of the previous patchset, the only
difference being that there are no whitespace issues in this
set.
These patches provide step by step improvements of various commands
related to branching and merging. Most importantly, it improves the
detection of the current system branch and makes it possible to branch
off other repositories rather than baserock:morphs, which had been
hard-coded so far.
Jannis Pohlmann (8):
Create mine directory if it does not exists when running "morph init"
Rename the "morph minedir" command to "morph workspace"
Use .morph-system-branch directories to identify branch directories
Make "morph show-system-branch" anywhere in a workspace, if possible
Make "morph checkout" require a repository parameter
Remember repository that was branched off from for merging and
editing
Add mandatory repository parameter to "morph branch"
Rename internal function added in a previous commit
doc/branching-merging-systems.mdwn | 28 +--
morphlib/plugins/branch_and_merge_plugin.py | 232 ++++++++++++++-------
...reates-new-system-branch-not-from-master.script | 18 +-
...reates-new-system-branch-not-from-master.stdout | 12 +-
.../branch-creates-new-system-branch.script | 18 +-
.../branch-creates-new-system-branch.stdout | 10 +-
.../branch-when-branchdir-exists-locally.script | 10 +-
tests.branching/checkout-existing-branch.script | 16 +-
tests.branching/checkout-existing-branch.stdout | 10 +-
tests.branching/checkout-non-aliased-repos.script | 61 ++++++
tests.branching/checkout-non-aliased-repos.stdout | 38 ++++
.../edit-checkouts-existing-chunk.script | 18 +-
tests.branching/edit-clones-chunk.script | 29 +--
tests.branching/edit-updates-stratum.script | 13 +-
tests.branching/edit-uses-ref-from-stratum.script | 13 +-
tests.branching/init-cwd.script | 10 +-
tests.branching/init-default.script | 10 +-
tests.branching/init-existing.script | 10 +-
tests.branching/init-newdir.exit | 1 -
tests.branching/init-newdir.script | 12 +-
tests.branching/init-newdir.stderr | 1 -
tests.branching/init-newdir.stdout | 2 +
tests.branching/init-nonempty.script | 10 +-
tests.branching/init-nonempty.stderr | 2 +-
.../merge-explicitly-named-repos.script | 21 +-
tests.branching/minedir-not-found.script | 10 +-
tests.branching/minedir-not-found.stderr | 2 +-
tests.branching/minedir.script | 14 +-
tests.branching/minedir.stdout | 2 +-
tests.branching/petrify.script | 12 +-
tests.branching/setup | 11 +-
...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 | 21 +-
44 files changed, 594 insertions(+), 279 deletions(-)
create mode 100755 tests.branching/checkout-non-aliased-repos.script
create mode 100644 tests.branching/checkout-non-aliased-repos.stdout
delete mode 100644 tests.branching/init-newdir.exit
delete mode 100644 tests.branching/init-newdir.stderr
create mode 100644 tests.branching/init-newdir.stdout
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
--
1.7.11.4
11 years, 3 months
[PATCH 0/4] Miscellaneous fixes
by Sam Thursfield
Repository: git://roadtrain.codethink.co.uk/baserock/morph
Branch: samthursfield/misc-1
Sha1: e176b1949c311b79eb2b4190fe5976c9497f12c0
Here are a few random cleanups, nothing of great importance.
Sam Thursfield (4):
Warn if creating an empty stratum
Display expected filename in "Failed to determine build system" error
ArtifactResolverTests: use keyword args for FakeStratumMorphology
Remove unused files in test/
morphlib/artifactresolver_tests.py | 77 ++++++++++++++++++++----------------
morphlib/builder2.py | 2 +
morphlib/morphologyfactory.py | 6 +-
tests/hello-chunk.tar.gz | Bin 12596 -> 0 bytes
tests/hello-stratum.morph | 10 -----
5 files changed, 48 insertions(+), 47 deletions(-)
delete mode 100644 tests/hello-chunk.tar.gz
delete mode 100644 tests/hello-stratum.morph
--
1.7.7.6
11 years, 3 months
[PATCH] Use full triplet to specify strata in systems
by Sam Thursfield
Repository: git://roadtrain.codethink.co.uk/baserock/morph
Branch: samthursfield/S4218-full-triplet-to-specify-strata
Sha1: fac2d0297d16d7021ff67bcf851d1aadb28265bc
We previously required all system and stratum morphologies to be
contained inside one repository. To avoid this, systems now refer
to their constituent strata in much the same way that strata refer
to chunks: a repo / ref / morph triplet.
A branch of the same name exists in baserock:morphs which I will merge
once this branch is merged, containing fixes for all core morphologies.
Merge after previous branch samthursfield/stratum-sources-to-chunks.
Sam Thursfield (1):
Systems should refer to strata as full repo/ref/morph triplets
morphlib/app.py | 2 +-
morphlib/artifactresolver.py | 9 +++++----
morphlib/artifactresolver_tests.py | 12 ++++++++++--
morphlib/cachekeycomputer_tests.py | 12 ++++++++++--
tests.as-root/archless-system-fails.script | 6 +++++-
tests.as-root/disk-builds-rootfs-and-kernel.script | 6 +++++-
.../rootfs-tarball-builds-rootfs-and-kernel.script | 6 +++++-
tests.as-root/setup | 6 +++++-
.../syslinux-disk-builds-rootfs-and-kernel.script | 6 +++++-
.../syslinux-fails-if-no-mbr-found.script | 6 +++++-
tests.as-root/system-overlap.script | 12 ++++++++++--
tests.branching/edit-updates-stratum.stdout | 4 ++--
tests.branching/setup | 8 ++++++--
tests/setup | 6 +++++-
14 files changed, 79 insertions(+), 22 deletions(-)
--
1.7.7.6
11 years, 3 months
