summaryrefslogtreecommitdiff
path: root/tests.branching/show-system-branch-works-anywhere-with-a-single-branch.script
Commit message (Collapse)AuthorAgeFilesLines
* Tidy up command testsSam Thursfield2012-11-141-3/+3
| | | | Be consistent about placement of test description, blank lines, etc.
* tests: Use test: URL prefix instead of baserock: throughoutSam Thursfield2012-11-071-1/+1
| | | | | | | | | | Some tests already used test: and in order to be able to share the scripts/setup-3rd-party-strata script they need to all use the same prefix. Using baserock: implies that we are using real code from Baserock, so I picked test: because the tests only ever use mock morphologies and no real code.
* Add mandatory repository parameter to "morph branch"Jannis Pohlmann2012-08-291-1/+1
| | | | | | | | | This is complementary to adding a repository parameter to the "morph checkout" command. It allows to branch off arbitrary repositories rather than always branching off baserock:morphs. All affected tests are updated to provide and work with this new parameter.
* Make "morph show-system-branch" anywhere in a workspace, if possibleJannis Pohlmann2012-08-291-0/+31
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.