summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
| * Update unit tests for bare repo caches.Daniel Silverstone2012-09-142-11/+31
| * Rework git caches to be bare mirrors of the repos.Daniel Silverstone2012-09-145-23/+107
| * Update .gitignore to ignore tilde files.Daniel Silverstone2012-09-141-0/+1
|/
* Fix tests for previous commitSam Thursfield2012-09-132-2/+2
* Merge branch 'samthursfield/lrc-error-improvements'Sam Thursfield2012-09-132-21/+28
|\
| * Give more useful errors when cloning from local cache failsSam Thursfield2012-09-132-21/+28
* | Merge branch 'samthursfield/S4770-fix-tests-for-git-pre-1.7.9'Lars Wirzenius2012-09-1311-43/+95
|\ \ | |/ |/|
| * Fix things so test suite works on Debian squeezeLars Wirzenius2012-09-139-38/+90
| * Fix whitespace errorSam Thursfield2012-09-131-3/+3
| * morph build: Use pre-v1.7.9 form of git commit-treeSam Thursfield2012-09-131-2/+2
|/
* Merge branch 'samthursfield/S4712-handle-no-git-user-info' of git://roadtrain...Richard Maw2012-09-1310-39/+51
|\
| * tests: Always use fixed git committer infoSam Thursfield2012-09-138-37/+37
| * build: Fail if user hasn't set user.name (or GIT_AUTHOR_NAME)Sam Thursfield2012-09-132-2/+14
|/
* Merge branch 'samthursfield/S4713-merge-message-for-chunks' of git://roadtrai...Richard Maw2012-09-133-16/+25
|\
| * morph merge: Give consistent commit message in chunk reposSam Thursfield2012-09-113-16/+25
* | Fix code format for unicode fixRichard Maw2012-09-131-1/+2
* | Merge branch 'samthursfield/S4556-triplet-consistency' of git://roadtrain.cod...Richard Maw2012-09-1335-182/+177
|\ \
| * | Don't use .morph extension when printing name of tripletsSam Thursfield2012-09-123-127/+128
| * | Don't require .morph in triplet argumentsSam Thursfield2012-09-1232-52/+46
| * | bootstrap: Fix to use morph build-morphologySam Thursfield2012-09-121-3/+3
* | | Encode the root path for os.walk()Daniel Silverstone2012-09-121-1/+1
* | | Merge branch 'danielsilverstone/trove-host-and-prefixes'Daniel Silverstone2012-09-124-10/+178
|\ \ \ | |_|/ |/| |
| * | Test the trove-* support.Daniel Silverstone2012-09-122-0/+103
| * | Add support for Trove hosted content to morph configuration.Daniel Silverstone2012-09-123-10/+75
|/ /
* | Merge branch 'jannis/edit-morphs-less-destructively'Sam Thursfield2012-09-118-126/+199
|\ \ | |/
| * Preserve sort order of morphologies, so they can be edited by MorphSam Thursfield2012-09-108-110/+174
| * Morphology: Only set defaults specific to the morphology kindSam Thursfield2012-09-101-15/+24
|/