summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Rename 'minedir' to 'workspace' in testsSam Thursfield2012-08-305-0/+0
* Merge branch 'jannis/show-branch-root-and-cwd-fixes'Sam Thursfield2012-08-3012-11/+354
|\
| * Fix branch/checkout to always create branches in the workspace directoryJannis Pohlmann2012-08-306-11/+250
| * Add "morph show-branch-root" commandJannis Pohlmann2012-08-307-0/+104
|/
* Avoid editing a list while iterating itSam Thursfield2012-08-301-1/+2
* Correctly ignore hidden dirs when searching for system branchSam Thursfield2012-08-301-1/+4
* Fix spelling errorSam Thursfield2012-08-301-1/+1
* Merge branch 'jannis/initial-branch-and-merge-work'Sam Thursfield2012-08-3042-257/+572
|\
| * Rename internal function added in a previous commitJannis Pohlmann2012-08-291-6/+6
| * Add mandatory repository parameter to "morph branch"Jannis Pohlmann2012-08-2915-54/+51
| * Remember repository that was branched off from for merging and editingJannis Pohlmann2012-08-2910-36/+69
| * Make "morph checkout" require a repository parameterJannis Pohlmann2012-08-299-21/+143
| * Make "morph show-system-branch" anywhere in a workspace, if possibleJannis Pohlmann2012-08-2930-68/+225
| * Use .morph-system-branch directories to identify branch directoriesJannis Pohlmann2012-08-294-25/+22
| * Rename the "morph minedir" command to "morph workspace"Jannis Pohlmann2012-08-2924-84/+88
| * Create mine directory if it does not exists when running "morph init"Jannis Pohlmann2012-08-285-7/+12
* | Remove unused files in test/Sam Thursfield2012-08-302-10/+0
* | ArtifactResolverTests: use keyword args for FakeStratumMorphologySam Thursfield2012-08-301-34/+43
* | Display expected filename in "Failed to determine build system" errorSam Thursfield2012-08-301-3/+3
* | Log a clear error if creating an empty stratumSam Thursfield2012-08-301-0/+2
* | Strata should be referred to with full repo/ref/morph tripletsSam Thursfield2012-08-3016-48/+124
* | Strata contain "chunks", not "sources"Sam Thursfield2012-08-2926-57/+57
|/
* Break long lineLars Wirzenius2012-08-281-1/+2
* Merge remote branch 'origin/samthursfield/S4350-faster-build-system-autodetect'Lars Wirzenius2012-08-288-115/+159
|\
| * Always ls-tree before trying to cat-fileSam Thursfield2012-08-242-36/+35
| * Refactor build system code for easier testingSam Thursfield2012-08-242-31/+16
| * Use git ls-tree to autodetect build systemSam Thursfield2012-08-244-72/+41
| * Support 'git ls-tree' in local and remote reposSam Thursfield2012-08-244-0/+91
| * buildsystem: Fix incorrect testcaseSam Thursfield2012-08-241-2/+2
* | Expand TAB charactersLars Wirzenius2012-08-281-41/+41
|/
* scripts/clean-git-cache: Fix 2 small issuesSam Thursfield2012-08-231-2/+4