summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't require .morph in triplet argumentsSam Thursfield2012-09-1232-52/+46
* bootstrap: Fix to use morph build-morphologySam Thursfield2012-09-121-3/+3
* Preserve sort order of morphologies, so they can be edited by MorphSam Thursfield2012-09-108-110/+174
* Morphology: Only set defaults specific to the morphology kindSam Thursfield2012-09-101-15/+24
* Reorder branch & merge utility functions to top of the classSam Thursfield2012-09-101-40/+40
* Git rid of morphlib.git methods that are not neededSam Thursfield2012-09-102-9/+1
* morph merge: Complain if 'from' branch is not checked outSam Thursfield2012-09-103-0/+35
* morph branch: Fail if branch already exists in the system repoSam Thursfield2012-09-104-0/+53
* morph branch,checkout: Clean up the branch dir on failureSam Thursfield2012-09-105-30/+117
* morph merge: Remove quotes from merge commit messageSam Thursfield2012-09-101-1/+1
* tests.branching: Add test with strata outside the main morphs repoSam Thursfield2012-09-101-0/+149
* Rewrite 'merge' commandSam Thursfield2012-09-105-33/+103
* Reorder functionsSam Thursfield2012-09-101-19/+19
* Merge branch 'jannis/commit-and-push-for-build'Sam Thursfield2012-09-0737-65/+726
|\
| * Add test to verify that building a branch picks up uncommitted changesJannis Pohlmann2012-09-072-0/+80
| * Make commits in root tests reproducible by fixing git meta dataJannis Pohlmann2012-09-071-0/+13
| * Add test to verify that 'morph build' can be run multiple timesJannis Pohlmann2012-09-072-0/+83
| * Add test to verify that 'morph build' creates the right build refsJannis Pohlmann2012-09-072-0/+90
| * Add a new 'morph build' for building from a system branchJannis Pohlmann2012-09-076-31/+409
| * Add 'build-prefix-ref' setting for creating temporary build refsJannis Pohlmann2012-09-071-0/+6
| * Rename 'morph build' command to 'morph build-morphology'Jannis Pohlmann2012-09-0724-34/+45
|/
* Merge remote-tracking branch 'origin/jannis/use-tree-sha1-for-cache-key'Daniel Silverstone2012-09-0514-83/+110
|\
| * Compute cache keys using tree SHA1s instead of commit SHA1sJannis Pohlmann2012-09-051-1/+1
| * Resolve tree SHA1 along with commit SHA1 when resolving refsJannis Pohlmann2012-09-0513-82/+109
|/
* Merge branch 'jannis/rewrite-edit-command'Sam Thursfield2012-09-0412-191/+303
|\
| * Remember system branch name and allow branch to be renamedJannis Pohlmann2012-09-041-21/+32
| * Update synposis for branch, checkout and edit commandsJannis Pohlmann2012-09-041-3/+3
| * Add convenience method for traversing a directory treeJannis Pohlmann2012-09-041-36/+27
| * Make "morph edit" print the changes for the user, rework static methodsJannis Pohlmann2012-09-041-48/+84
| * Rewrite edit command to expect SYSTEM STRATUM [CHUNK] parametersJannis Pohlmann2012-09-0411-119/+190
| * Allow 'disk-size' in system morphologies to be an integerJannis Pohlmann2012-09-041-8/+11
* | README: describe systems.strata correctlySam Thursfield2012-09-041-2/+5
|/
* Merge branch 'jannis/implement-chunk-strata-lookup-differently'Sam Thursfield2012-09-042-30/+61
|\
| * Rework morphology child lookup to be more useful for branch/mergeJannis Pohlmann2012-09-042-30/+61
|/
* Morph: index component morphologies by nameSam Thursfield2012-09-042-12/+123
* ArtifactResolver: chunks cannot be duplicated in a stratumSam Thursfield2012-09-042-57/+54
* Warning instead of error for empty strata, temporarilySam Thursfield2012-09-031-1/+1
* Merge branch 'jannis/find-repos-using-git-config-option'Sam Thursfield2012-09-035-8/+142
|\
| * Find branch root using the morph.repository option in .git/configJannis Pohlmann2012-09-033-4/+78
| * Fix branch dir search by not aborting when seeing a directory twiceJannis Pohlmann2012-08-311-4/+3
| * Remember the repo that is cloned from during branch/checkout/editJannis Pohlmann2012-08-313-0/+61
* | Merge branch 'jannis/git-config-for-branch-options'Sam Thursfield2012-09-037-28/+32
|\ \
| * | Use git config to store the branch root in .morph-system-branch/configJannis Pohlmann2012-08-317-28/+32
| |/
* | README: Hopefully we won't silently ignore invalid keys foreverSam Thursfield2012-09-031-1/+1
* | README: Fix example system to use full triples for strataSam Thursfield2012-09-031-2/+10
* | README: Fix example stratum to use "repo" for chunksSam Thursfield2012-09-031-1/+4
* | Merge remote-tracking branch 'origin/liw/joe-ioerror-filenames'Daniel Silverstone2012-09-031-7/+6
|\ \
| * | Fix error reporting from tar extract errorsLars Wirzenius2012-08-311-7/+6
| |/
* | Merge branch 'joeldillon/documentation'Lars Wirzenius2012-08-311-5/+35
|\ \ | |/ |/|
| * Modified man page to go into more detail about what morph doesJoel Dillon2012-08-311-5/+29
|/
View Lorry Controller Status