summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * morphologyfactory: move empty stratum check hereRichard Maw2013-08-073-10/+28
| * morphologyfactory: refactor chunk bdeps exceptionsRichard Maw2013-08-072-6/+30
* | workflow-tools: Fix typo in `morph help branch`Richard Maw2013-08-071-1/+1
|/
* Merge branch 'liw/refactor-checkout-etc-v2'Lars Wirzenius2013-08-0712-114/+985
|\
| * Re-implement "morph branch" using new infrastructureLars Wirzenius2013-08-062-42/+73
| * Re-implement "morph show-branch-root" using new infrastructureLars Wirzenius2013-08-062-20/+18
| * Re-implement "morph show-system-branch" using new infrastructureLars Wirzenius2013-08-062-8/+9
| * Re-implement "morph checkout" using new infrastructureLars Wirzenius2013-08-062-37/+99
| * Add SystemBranchDirectory classLars Wirzenius2013-08-063-0/+433
| * Add GitDirectory classLars Wirzenius2013-08-063-0/+198
| * Add LocalRepoCache.get_updated_repo methodLars Wirzenius2013-08-061-1/+13
| * Add Workspace.create_system_branch_directory methodLars Wirzenius2013-08-062-0/+27
| * Add Workspace.get_default_system_branch_directory_name methodLars Wirzenius2013-08-062-0/+23
| * Add morphlib.util.find_root and find_leaf functionsLars Wirzenius2013-08-062-6/+92
* | Merge remote-tracking branch 'origin/baserock/richardmaw/S8530/atomic-hl-cach...Lars Wirzenius2013-08-064-12/+39
|\ \ | |/ |/|
| * stagingarea: move to failed on construction failRichard Maw2013-08-063-6/+21
| * stagingarea: Construct hardlink cache atomicallyRichard Maw2013-08-061-6/+14
| * stagingarea tests: create chunks subdirectoryRichard Maw2013-08-061-0/+4
|/
* Merge commit '95a4918a471ad1dc7110d3d64eb7e6a89dea34a5'Lars Wirzenius2013-08-011-3/+9
|\
| * Set build-ref-prefix to be based on trove-id if the setting existsTiago Gomes2013-07-311-3/+9
* | Merge branch 'liw/refactor-init-workspace'Lars Wirzenius2013-07-316-52/+264
|\ \ | |/ |/|
| * Re-implement "morph workspace" using the Workspace classLars Wirzenius2013-07-313-8/+11
| * Re-implement "morph init" using the new Workspace classLars Wirzenius2013-07-313-45/+64
| * Add a Workspace classLars Wirzenius2013-07-313-0/+190
|/
* Merge branch 'liw/b-and-m-yarns'Lars Wirzenius2013-07-315-0/+875
|\
| * Refactor code for clarityLars Wirzenius2013-07-311-4/+4
| * Remove commented out debug statementsLars Wirzenius2013-07-311-2/+0
| * Add scenario (yarn) tests for most of branching and mergingLars Wirzenius2013-07-305-0/+877
* | Fix copyright yearLars Wirzenius2013-07-311-1/+1
* | Merge remote-tracking branch 'origin/jonathan/cross-bootstrap-rebase'Lars Wirzenius2013-07-3119-217/+641
|\ \
| * | Add morph cross-bootstrapSam Thursfield2013-07-3019-217/+641
|/ /
* | Merge branch 'jonathan/check-lorried-gitmodules-3'Jonathan Maw2013-07-251-0/+121
|\ \ | |/ |/|
| * Add a script to check every .gitmodules file in a system branchJonathan Maw2013-07-251-0/+121
|/
* Add ARGS to the foreach argument synopsisTiago Gomes2013-07-221-2/+2
* Fix up code formattingLars Wirzenius2013-07-221-3/+4
* show short sha of local cached artifactPaul Sherwood2013-07-221-2/+3
* Merge branch 'liw/copyright-years'Lars Wirzenius2013-07-183-3/+3
|\
| * Fix copyright yearsLars Wirzenius2013-07-183-3/+3
|/
* Merge branch 'liw/fix-localhost-in-tests'Lars Wirzenius2013-07-185-5/+5
|\
| * Use 127.0.0.1 instead of localhostLars Wirzenius2013-07-183-3/+3
| * Add missing copyright yearLars Wirzenius2013-07-181-1/+1
| * Add missing copyright yearLars Wirzenius2013-07-181-1/+1
* | Merge branch 'baserock/richardmaw/bugfix/trovectl-cannot-add-sshkey'Richard Maw2013-07-181-1/+1
|\ \ | |/ |/|
| * Pass stdin to ssh command, so trovectl can add ssh keysRichard Maw2013-07-181-1/+1
* | Import morphlib as we are using morphlib.ErrorTiago Gomes2013-07-171-0/+1
* | Merge branch 'baserock/tiagogomes/gen-anifest2'Tiago Gomes2013-07-121-1/+2
|\ \
| * | Fixups for the Manifest generatorTiago Gomes2013-07-121-1/+2
|/ /
* | Strip trailing whitespace in READMEbaserock-9Jonathan Maw2013-07-091-14/+14
|/
* Merge branch 'liw/subcommand-docs-2'Lars Wirzenius2013-07-0510-41/+618
|\
| * Improve docstring for "morph generate-manifest"Lars Wirzenius2013-07-051-2/+29