summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Give Morph a version numberLars Wirzenius2012-09-252-1/+4
* Merge remote-tracking branch 'origin/samthursfield/S4905-edit-chunk-morpholog...Lars Wirzenius2012-09-241-1/+1
|\
| * Lookup chunks within strata by 'morph' field, not 'name'Sam Thursfield2012-09-241-1/+1
|/
* Merge remote-tracking branch 'origin/samthursfield/S4715-update-status-when-c...Lars Wirzenius2012-09-241-1/+1
|\
| * morph branch, checkout, edit: Print message when updating git cacheSam Thursfield2012-09-241-0/+2
* | Merge branch 'samthursfield/S4845-fix-tests-on-squeeze'Lars Wirzenius2012-09-246-1/+30
|\ \ | |/ |/|
| * Disable tests on Debian Squeeze that require Python 2.7Sam Thursfield2012-09-245-1/+28
| * morph edit: Print message when updating local cacheSam Thursfield2012-09-241-0/+2
|/
* Merge branch 'baserock/radiofree/check_mtime'Lars Wirzenius2012-09-241-0/+15
|\
| * Small coding standards/message fixesJames Thomas2012-09-211-2/+2
| * Check the mtime of the app.py to make sure it is not in the futureJames Thomas2012-09-211-0/+15
* | Merge branch 'samthursfield/S4679-morph-petrify' of git://git.baserock.org/ba...Richard Maw2012-09-2110-195/+581
|\ \ | |/ |/|
| * Test that 'petrify' is safe against multiple invocationsSam Thursfield2012-09-212-0/+54
| * Add petrify/unpetrify workflow testSam Thursfield2012-09-214-112/+355
| * morph edit: unpetrify before editing, if need beSam Thursfield2012-09-211-0/+4
| * morph petrify: Handle strata in external reposSam Thursfield2012-09-211-49/+52
| * Add 'morph unpetrify'Sam Thursfield2012-09-213-0/+65
| * morph petrify: Rewrite in the style of todaySam Thursfield2012-09-214-39/+56
| * morph foreach: Fix with cliapp < 1.20120630Sam Thursfield2012-09-212-10/+6
| * Always cache artifacts locally and report filenames during build.Daniel Silverstone2012-09-211-0/+7
| * Add .artifact_filename() to external API of LocalArtifactCacheDaniel Silverstone2012-09-212-4/+13
* | Merge branch 'samthursfield/misc-2' of git://git.baserock.org/baserock/morphRichard Maw2012-09-211-4/+18
|\ \
| * | Give better error when reading a morphology file failsSam Thursfield2012-09-211-4/+9
| * | Warn when we edit morphologies where filename != nameSam Thursfield2012-09-211-0/+4
| * | morph foreach: Mention -- in docstringSam Thursfield2012-09-211-0/+5
|/ /
* | Merge remote branch 'origin/samthursfield/S4872-fix-foreach-errors'Lars Wirzenius2012-09-212-10/+6
|\ \
| * | morph foreach: Fix with cliapp < 1.20120630Sam Thursfield2012-09-212-10/+6
* | | Merge branch 'master' of git://git.baserock.org/baserock/morphLars Wirzenius2012-09-213-4/+20
|\ \ \
| * \ \ Merge branch 'danielsilverstone/report-artifact-name' of git://git.baserock.o...Richard Maw2012-09-213-4/+20
| |\ \ \ | | |/ / | |/| |
| | * | Always cache artifacts locally and report filenames during build.Daniel Silverstone2012-09-211-0/+7
| | * | Add .artifact_filename() to external API of LocalArtifactCacheDaniel Silverstone2012-09-212-4/+13
| |/ /
* | | Merge remote branch 'origin/danielsilverstone/log-bundle-download'Lars Wirzenius2012-09-211-11/+18
|\ \ \ | |/ / |/| / | |/
| * Refactor _fetch() and log bundle fetches.Daniel Silverstone2012-09-211-11/+18
|/
* morph foreach: Use self.app.output.write(), not printSam Thursfield2012-09-181-2/+2
* Merge branch 'samthursfield/S4717-morph-foreach' of git://git.baserock.org/ba...Richard Maw2012-09-189-31/+102
|\
| * Update branching tests to use 'morph foreach'Sam Thursfield2012-09-174-31/+27
| * Add failure test for 'morph foreach'Sam Thursfield2012-09-174-0/+32
| * Add 'morph foreach'Sam Thursfield2012-09-171-0/+43
|/
* Merge branch 'samthursfield/complex-merges-2' of git://roadtrain.codethink.co...Richard Maw2012-09-1716-69/+444
|\
| * tests.branching: Make workflow test to use system branches moreSam Thursfield2012-09-171-9/+39
| * tests.branching: Add complex merge testsSam Thursfield2012-09-1711-0/+265
| * morph merge: Don't make a merge commit if only the refs changedSam Thursfield2012-09-144-4/+24
| * morph merge: Give full dir instead of repo name in merge errorsSam Thursfield2012-09-141-1/+1
| * morph merge: Merge changes in morphology contentsSam Thursfield2012-09-141-31/+76
| * morph merge: Only update refs that were pointing at the 'from' branchSam Thursfield2012-09-141-3/+9
| * morph edit: Be more permissive checking out repos for system branchesSam Thursfield2012-09-141-27/+36
* | Merge branch 'danielsilverstone/bare-caches'Sam Thursfield2012-09-1428-68/+221
|\ \ | |/
| * Script for converting git cache.Daniel Silverstone2012-09-141-0/+51
| * Update the stderr and stdout files for the tests.Daniel Silverstone2012-09-1410-21/+6
| * Rework the blackbox tests for bare caches.Daniel Silverstone2012-09-149-13/+25
View Lorry Controller Status