summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename morph3 to morphologybaserock/adamcoldrick/remove-morph2-tweakedAdam Coldrick2014-08-146-57/+57
* Revert "Ensure that none of the _orig_* fields are in the cache key"Adam Coldrick2014-08-141-4/+1
* Remove morph2 and its testsAdam Coldrick2014-08-143-705/+0
* edit-morph: Use morphloader rather than morph2Adam Coldrick2014-08-141-52/+8
* cmdtests: Use YAML not JSON to represent morphologiesAdam Coldrick2014-08-1421-867/+549
* cmdtests: Change the error messages to be detectedAdam Coldrick2014-08-144-4/+4
* unittests: Make the unittests use morphloaderAdam Coldrick2014-08-146-297/+254
* buildsystem: Generate a Morphology not textAdam Coldrick2014-08-144-30/+29
* morphologyfactory: Use morphloader not morph2Adam Coldrick2014-08-142-166/+75
* morphloader: Get commands when loading morphologyAdam Coldrick2014-08-144-3/+14
* morphloader: Add and remove some default valuesAdam Coldrick2014-08-142-12/+21
* morphset: Don't expect to be able to find `morph` or `name`Adam Coldrick2014-08-131-3/+5
* show-dependencies: Use sanitise_morphology_path instead of stripping `.morph`Adam Coldrick2014-08-132-3/+3
* cachedrepo: Remove unused load_morphology methodAdam Coldrick2014-08-082-13/+0
* Merge branch 'baserock/adamcoldrick/no-orig-fields-in-cache-key'Adam Coldrick2014-08-011-1/+4
|\
| * Ensure that none of the _orig_* fields are in the cache keybaserock/adamcoldrick/no-orig-fields-in-cache-keybaserock/adamcoldrick/no-fake-morphAdam Coldrick2014-08-011-1/+2
* | Merge remote-tracking branch 'remotes/origin/baserock/richardmaw/bugfix/distb...Lars Wirzenius2014-08-011-2/+2
|\ \
| * | StagingArea: Ensure staging are paths are bytestringsbaserock/richardmaw/bugfix/distbuild-eglibcRichard Maw2014-07-251-2/+2
* | | Merge branch 'liw/distbuild-fixes-ripsum-only'Lars Wirzenius2014-08-011-1/+1
|\ \ \
| * | | Use sanitise_morphology_path in serialise_artifactRichard Ipsum2014-07-311-1/+1
|/ / /
* | | Merge remote-tracking branch 'origin/baserock/richardmaw/bugfix/yaml-multi-li...Lars Wirzenius2014-07-303-3/+60
|\ \ \ | |_|/ |/| |
| * | Dump multi-line strings in yaml documents in '|' formbaserock/richardmaw/bugfix/yaml-multi-line-dumpRichard Maw2014-07-303-3/+60
|/ /
* | Merge branch 'baserock/richardmaw/bugfix/fix-list-artifacts'Adam Coldrick2014-07-291-1/+1
|\ \
| * | Fix list-artifacts post chunks-in-definitionsbaserock/richardmaw/bugfix/fix-list-artifactsRichard Maw2014-07-281-1/+1
* | | Merge branch 'baserock/richardmaw/bugfix/symlink-include'Adam Coldrick2014-07-291-1/+1
|\ \ \ | |/ / |/| |
| * | Fix not including symlinks in chunks if they exist on the hostbaserock/richardmaw/bugfix/symlink-includeRichard Maw2014-07-291-1/+1
|/ /
* | Merge branch 'sam/remote-git-cache-fixes'Sam Thursfield2014-07-231-1/+1
|\ \
| * | Fix an incorrect log message when using remote Git cacheSam Thursfield2014-07-231-1/+1
* | | Merge branch 'baserock/richardmaw-os/chunks-in-defs-v3'Richard Maw2014-07-2217-306/+133
|\ \ \ | |/ / |/| |
| * | yarns: Make test-chunk use files from its source repoRichard Maw2014-07-221-3/+16
| * | yarns: Test building and deployment of a system with a chunk in definitionsAdam Coldrick2014-07-223-23/+26
| * | Rewrite traverse_morphs to be able to load chunk morphologies from definitionsRichard Maw2014-07-222-33/+54
| * | Don't set 'morph' field by default, and don't expect to find itAdam Coldrick2014-07-224-6/+6
| * | unittests: Test that the description field is ignored for chunksAdam Coldrick2014-07-221-3/+6
| * | Use chunk morpholgy contents in cache keysRichard Maw2014-07-221-9/+19
| * | Remove update-gits commandRichard Maw2014-07-226-222/+0
| * | Remove use of "morph" field in chunk specs in yarnsRichard Maw2014-07-223-7/+6
| * | Tidy deploy_plugin a littleRichard Maw2014-07-221-5/+5
| * | Use run_morph in yarnsRichard Maw2014-07-221-1/+1
|/ /
* | Revert distbuild parts of "Make our use of json binary path safe"baserock/richardmaw/bugfix/stop-decoding-distbuild-commsRichard Maw2014-07-183-6/+6
|/
* Fix JSON file handling to be binary filename safeLars Wirzenius2014-07-1510-30/+47
|\
| * Allow non-unicode paths to be hardlinked into staging areasbaserock/richardmaw/bugfix/unicode-safe-pathsRichard Maw2014-07-112-8/+17
| * Make our use of json binary path safebaserock/richardmaw/bugfix/unicode-safe-jsonRichard Maw2014-07-118-22/+30
* | Fix bug in list-artifacts pluginRichard Ipsum2014-07-111-1/+1
* | Log the address we attempt to bindRichard Ipsum2014-07-111-0/+1
|/
* Merge remote-tracking branch 'origin/baserock/richardmaw/S11284/morphologies-...Richard Maw2014-07-1162-5495/+2626
|\
| * yarns: Adapt to put morphologies in subdirsbaserock/richardmaw/S11284/morphologies-by-path-v4Richard Maw2014-07-108-195/+191
| * Don't check if a file exists before trying to read itRichard Maw2014-07-101-28/+28
| * Use exact filenames to refer to morphology filesRichard Maw2014-07-1014-1757/+1768
| * Don't attempt to load symlinks as morphologiesRichard Maw2014-07-073-1/+49