summaryrefslogtreecommitdiff
path: root/tests.branching
Commit message (Collapse)AuthorAgeFilesLines
* Rename the "morph minedir" command to "morph workspace"Jannis Pohlmann2012-08-2922-46/+48
| | | | | | | | | | | | Mine may be a nice metaphor but it is not very intuitive. Hence, this commit renames "mine" to "workspace". This affects not just the branch and merge plugin (the only code that changes) but also documentation and tests, which are updated along with the code in this commit. I decided to omit the "dir" suffix in the command because I think people know well that a workspace will be a directory in this case and that allows us to refer to this concept with one word ("workspace") instead of two words ("workspace directory").
* Create mine directory if it does not exists when running "morph init"Jannis Pohlmann2012-08-284-5/+5
| | | | | Until now, morph failed when the mine directory did not exist. However, there is no good reason why it can't attempt to create it.
* Consolidate morphology writing code in pluginRichard Maw2012-08-011-1/+3
| | | | | As simple as it is to dump json files, it is convenient to use the same function, so the format can be kept the same.
* Add test for petrifying strataRichard Maw2012-08-013-0/+56
| | | | | | | | | | | | | | This test checks if the same morphology json is generated during petrification. Because commits include the author and date, the sha1 sum will differ if a different user commits at a different time. This can be overridden by the environment variables GIT_{AUTHOR,COMMITTER}_{NAME,EMAIL,DATE}. The date chosen was just something recent at the time the work was done, since a too-early timestamp is rejected by git as invalid.
* Refactor system building to use syskind specific classLars Wirzenius2012-07-261-1/+1
|
* Require system-kind on system morphologiesLars Wirzenius2012-07-191-0/+1
|
* Add check for missing build depends in strataLars Wirzenius2012-06-282-5/+9
| | | | | | | This will make a build fail if the morphology is missing explicit build dependencies. Also fix test causes so that ./check passes.
* Fix test suite to deal with morph output changesLars Wirzenius2012-06-261-0/+1
| | | | | | | | Also, some bug fixes. Also, when handling a BaseException, log the exception (with traceback) that we're handling, in case there is an error while handling it, because the second error will otherwise mask the first one.
* Allow "morph edit" to have a default ref to branch off fromLars Wirzenius2012-05-172-0/+35
|
* Add test case for "morph edit" updating strataLars Wirzenius2012-05-172-0/+54
|
* Fix filenames of test morphologiesLars Wirzenius2012-05-175-10/+10
|
* Use repo alias prefixes properly in testsLars Wirzenius2012-05-044-7/+7
|
* Set repo-alias with %s and use baserock: prefixLars Wirzenius2012-05-041-2/+2
|
* Make cmdtests set up repo-aliases and use prefixed reponamesLars Wirzenius2012-05-041-2/+3
|
* Make morph's _clone_to_directory use CachedRepo.checkoutLars Wirzenius2012-05-042-1/+4
| | | | | | | | | This requires changing CachedRepo.checkout to handle non-sha1 refs, which resulted in some further changes in tests and their expected outputs. Also, a fix to CachedRepo to use the cwd keyword argument instead of pwd.
* Add test for branching off not from masterLars Wirzenius2012-04-305-6/+69
|
* Add test script to test the whole branch+merge processLars Wirzenius2012-03-261-0/+39
|
* Change "checkout existing branch" test to not check out masterLars Wirzenius2012-03-265-14/+34
| | | | Checking out another branch exposed a bunch of bugs.
* Do not create a cache directory in the mineLars Wirzenius2012-03-263-3/+0
| | | | | It wasn't being used, anyway. And there's no real point in having a per-mine cache directory.
* Verify that "morph edit" checks out a working treeLars Wirzenius2012-03-232-0/+4
|
* Make "morph edit" work when chunk already has the branchLars Wirzenius2012-03-232-0/+41
|
* Modify "morph edit" test to verify origin is set correctlyLars Wirzenius2012-03-232-0/+30
|
* Add cmdtest for morph branch to set origin correctlyLars Wirzenius2012-03-232-0/+15
|
* Add "morph checkout" commandLars Wirzenius2012-03-232-0/+45
|
* Add "morph merge" subcommandLars Wirzenius2012-03-232-0/+49
| | | | | This is highly simplisitic, and it's going to be highly painful to use, but it does the very basics of what we need, I think.
* Add "morph edit", "morph show-system-branch" subcommandsLars Wirzenius2012-03-234-0/+74
|
* Implement "morph branch"Lars Wirzenius2012-03-222-0/+46
|
* Create a morph config file in the test setup scriptLars Wirzenius2012-03-221-0/+12
|
* Add test for "morph branch" when system branch directory already existsLars Wirzenius2012-03-223-0/+29
|
* Create dummy git repositories for morphs, helloLars Wirzenius2012-03-221-0/+55
|
* Add test case for minedir when a minedir is not in the ancestorsLars Wirzenius2012-03-223-0/+21
|
* Implement the "morph mine" subcommandLars Wirzenius2012-03-221-0/+1
|
* Add test for "morph minedir"Lars Wirzenius2012-03-221-0/+20
|
* Implement "morph init" and fix tests accordinglyLars Wirzenius2012-03-2211-8/+42
|
* Add test cases for "morph init"Lars Wirzenius2012-03-228-0/+144