| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
This should help clear the way for the eventual removal of deprecated
workspace code and related commands: morph checkout etc
Change-Id: I66298c4f9f790848962bd70ab434bef96cf96cb9
|
|
|
|
| |
Change-Id: Icec7e948c60decefe5a8bab6141bc89603c265b7
|
|
|
|
| |
Change-Id: I6c45763fb4d9f304695c1894625ced36bda36f89
|
|
|
|
|
|
|
| |
This yarn was failing 'cause of a missing
chunk morph rather than a failure to push
Change-Id: I70d79b1b9ec972cebde825d90c039666867bb1fa
|
|
|
|
| |
Change-Id: I7c993aee22f8438c28566acce01c524d9b315951
|
|
|
|
| |
Change-Id: Iee611887c54f8b8b67504ae2ba0cd78be703e455
|
|
|
|
| |
Change-Id: I54d1a03ba37f7589783f41c02482c0ac1821508d
|
|
|
|
| |
Change-Id: If3f6abdaab6518e77da911bfe1952c8ffe4bda34
|
|
|
|
| |
Change-Id: I77a8a3aab887f5d14a372690502df3fdeba6db10
|
|
|
|
|
|
|
| |
"the user gets the repo" does not set exit-morph, so it is not valid to
check whether it exited successfully.
Change-Id: I05e2d5c1919eee6b714269642eb9c39bcf578bbc
|
|
|
|
| |
Change-Id: Ie0ac708946c3b1d65d2022638c02d6a2d288ad9d
|
|
|
|
|
|
|
|
|
|
| |
This test fails with latest Busybox. Since we plan on removing
workspaces anyway, I don't see a reason to fix it. The `morph foreach`
command does actually still work as expected.
Morph's ./check test suite now passes again in a 'build' reference
system built from commit 88eface4c72dab689bc409c77e209833a0acd038 or
newer.
|
|
|
|
|
|
| |
This commit fixes an issue where running morph's yarn tests would
leave behind a number of scripts/git-daemon-wrap processes due to
some tests not stopping their git server properly.
|
|
|
|
|
| |
When all the tests that use build-mode: test are gone, the build mode
can be removed.
|
|
|
|
|
|
|
|
|
|
|
| |
Previously we would use file: URIs to point to the git repositories.
This was fast and simple, but had the drawback that it bypassed all the
git cache logic, so changes to the git cache weren't adequately covered
by the test suite.
Now we spool up a simulated git server per scenario, and shut it down at
the end.
|
|
|
|
| |
This replaces an old cmdtest.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There was a check in it to see whether it needed to do the git branch
and git checkout based on whether the name of the branch matched that in
the morphology.
This had a couple of problems:
1. Now that we aren't always building from HEAD, we need to be able to
roll its commit back, so using the existing branch isn't always the
best idea.
2. It only checks the "ref" field, not "unpetrify-ref", so even though
we clone the right ref in there, it's checking the commit id against
the system branch name, so would always try to re-create the branch,
and fail when it already exists.
So now, we remove the original ref and re-create it with our preferred
HEAD.
A better solution might be to change the clone logic to not
automatically checkout HEAD, and instead require an explicit branch then
checkout, but the initial clone logic is shared with build, and I didn't
feel like tracking down all the different places that it was used.
|
|
|
|
|
|
|
|
|
| |
The help for the show-branch-root command said it returns a path, but
the command and the yarns just showed the aliased url it was cloned
from.
Given I found myself needing the path in some scripts, not the repo url,
I think it's more useful to reconcile the difference this way.
|
|
|
|
|
|
|
|
|
| |
This is closer to our current workflow, where we are always petrified
and update the ref field when we need to update a component.
This required rearranging the operations to create the chunk repository
before the definitions repository, and remove a check that assumes we
weren't already petrified.
|
|
|
|
|
|
|
| |
We don't use this any more, and instead prefer to always keep
definitions.git petrified, and update the refs ourselves.
branch-from-image still uses some of the remaining petrify code.
|
|\
| |
| |
| |
| |
| | |
'origin/baserock/richardmaw/S11416/no-unnecessary-temp-branches'
Reviewed-by: Daniel Silverstone
|
| | |
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We want to move our morphologies in our definitions repository into
subdirectories, so they're more organised.
We'd prefer to only refer to morphologies by file path, rather than a
name that loosely corresponds to the file path, but we need to support
that for backwards compatibility until we can move all of our
morphologies into the definitions repository.
However, since we want to eventually remove this, and we want to ensure
that file paths work, we change the yarn tests to use file paths.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
`morph merge` only worked for a small subset of cases, and has been left
to bit-rot, since we don't use it.
`morph tag` is just a `git tag` when we have petrified definitions
repository. We don't use it, nor do we need it, so it can go away rather
than take up valuable development time fixing it when requirements
change.
`old-foo` have all been superceded by newer versions and are no-longer
used.
|
|
|
|
|
|
|
| |
This was the wrong response to the problem of accidentally checking-out
morph when trying to check out morphs. Now that it's called definitions,
this is irrelevent, and aborting a checkout when this check fails is the
wrong thing to do.
|
| |
|
|
|
|
|
| |
These are _directory_ names, not chunk repo URLs, so a slash is correct
now.
|
|\
| |
| |
| |
| |
| |
| |
| | |
'origin/baserock/richardmaw/10312/ensure-not-add-repo-ref'
This includes a typo fix of Unpertify -> Unpetrify
Reviewed-by: Lars Wirzenius
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This now means that the system morphology is not altered when chunks are
altered, so some tests had to change.
Since this uses the python warnings API, these warnings can be ignored
by running
python -W ignore:"stratum morphology" \
-W ignore:"system morphology" \
"$(which morph)" ...`
or turned into errors with
python -W error:"stratum morphology" \
-W error:"system morphology" \
"$(which morph)" ...`
|
|
|
|
|
| |
Refs should be completely omitted, and this is now the standard
behaviour, so there's little value in testing the behaviour separately.
|
| |
|
|
|
|
| |
argument
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 2dc382a2a9ae977b1158002cd2631ec5593959c1, reversing
changes made to 89a019af088ff62459699a6efdadf8ac8fe35dd9.
We decided to restore the old commands for the release, as we weren't
confident the new implementations were correct yet.
To gain that confidence we need to use them, so the old versions are no
longer available, and the new edit code is used when the edit subcommand
is invoked.
Doing so also requires the test suite to use the edit command instead of
new-edit.
|
|
|
|
|
|
|
|
|
| |
This exposed a bug in yarn: it does not notice when two scenarios have
the same name, and uses the same DATADIR directory for two scenarios.
Oops.
Fixed this by changing one of the scenario names in the Morph test
suite. Yarn itself will be fixed separately.
|
| |
|
|
These scenarios test the basics of most of the subcommands the
branch and merge plugin provides. They don't purport to be complete,
but give some indication that things work, and form a basis upon
which further things can be built. Yarn also isn't included in a
Baserock release yet, so we need to keep the cmdtests until Baserock
10 has been released.
The existing cmdtest tests are not modified by this: they are left
intact, until they can analysed in detail for things to be added to
the scenarios. After that, the cmdtest tests will start to go away.
Merging is not covered by these tests: it is not clear how merge should
work, and the current code is known to do the wrong thing in many cases.
Scenarios for merge will be added later.
Building is also not covered. Testing builds well needs some additional,
careful thinking, and that isn't ready for this patch series. It will
be added later.
|