summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'baserock/adamcoldrick/remove-morph2-tweaked'Adam Coldrick2014-08-1450-2212/+1016
|\ \
| * | Rename morph3 to morphologyAdam 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-141-3/+5
| * | show-dependencies: Use sanitise_morphology_path instead of stripping `.morph`Adam Coldrick2014-08-142-3/+3
| * | cachedrepo: Remove unused load_morphology methodAdam Coldrick2014-08-142-13/+0
|/ /
* | Merge branch 'baserock/richardmaw/misc-fixups'baserock/richardmaw/tmpRichard Maw2014-08-1225-848/+105
|\ \
| * | Fix `morph edit` when repo has the same ref as system branchRichard Maw2014-08-123-6/+32
| * | Make morph show-branch-root print the pathRichard Maw2014-08-1210-114/+36
| * | yarns: Start from petrified refsRichard Maw2014-08-124-30/+36
| * | Remove petrify and unpetrify commandsRichard Maw2014-08-1215-698/+1
|/ /
* | Merge remote-tracking branch 'origin/baserock/richardmaw/S11416/no-unnecessar...Richard Maw2014-08-1210-133/+403
|\ \ | |/ |/|
| * Add yarns for checking the state of temporary build branchesbaserock/richardmaw/S11416/no-unnecessary-temp-branchesRichard Maw2014-08-122-0/+239
| * Yarns: Preserve the output of morph foo in out-fooRichard Maw2014-08-121-2/+3
| * Yarns: implement pushing a whole system branchRichard Maw2014-08-121-2/+1
| * Yarns: misc fixesRichard Maw2014-08-122-3/+3
| * Avoid creating and pushing temporary build branches when they aren't necessary.Richard Maw2014-08-124-99/+129
| * Treat untracked morphologies as uncommitted changesRichard Maw2014-08-121-2/+3
| * Cut BuildBranch out of morphlib.extensionsRichard Maw2014-08-123-30/+20
| * Turn BuildBranch methods into regular functionsRichard Maw2014-08-123-18/+28
|/
* 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
View Lorry Controller Status