summaryrefslogtreecommitdiff
path: root/morphlib
Commit message (Expand)AuthorAgeFilesLines
* morph merge: Use a special git merge driver for morphology filesSam Thursfield2012-09-271-7/+121
* morph merge: Set status on successSam Thursfield2012-09-271-0/+2
* morph merge: Error message wranglingSam Thursfield2012-09-271-5/+6
* Rename arm to armv7 and be consistentRichard Maw2012-09-274-6/+6
* morph merge: Clean up on failureSam Thursfield2012-09-251-50/+72
* morph merge: Handle merge conflicts more helpfullySam Thursfield2012-09-251-9/+35
* morph merge: Consolidate more functionality in merge_repo()Sam Thursfield2012-09-251-29/+33
* morph merge: Always pull --no-commit, so we can roll back more easilySam Thursfield2012-09-251-11/+12
* morph merge: Better errors from checkout_repository()Sam Thursfield2012-09-251-2/+8
* Merge remote-tracking branch 'origin/danielsilverstone/tarballs-instead-of-bu...Daniel Silverstone2012-09-256-43/+78
|\
| * Use tarballs instead of bundlesDaniel Silverstone2012-09-256-43/+78
* | Catch URLError so that missing cache-servers don't cause morph to die.Daniel Silverstone2012-09-251-1/+1
|/
* Merge branch 'master' of git://git.baserock.org/baserock/morphLars Wirzenius2012-09-251-3/+13
|\
| * Default bundle-server and cache-server based on trove-host.Daniel Silverstone2012-09-251-3/+13
* | Give Morph a version numberLars Wirzenius2012-09-251-0/+3
|/
* Lookup chunks within strata by 'morph' field, not 'name'Sam Thursfield2012-09-241-1/+1
* morph branch, checkout, edit: Print message when updating git 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-212-81/+149
|\ \ | |/ |/|
| * 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-211-0/+44
| * morph petrify: Rewrite in the style of todaySam Thursfield2012-09-212-36/+53
| * morph foreach: Fix with cliapp < 1.20120630Sam Thursfield2012-09-211-9/+5
| * 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
* | 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-211-9/+5
|\ \
| * | morph foreach: Fix with cliapp < 1.20120630Sam Thursfield2012-09-211-9/+5
* | | Merge branch 'master' of git://git.baserock.org/baserock/morphLars Wirzenius2012-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
| |/
* | 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
* Add 'morph foreach'Sam Thursfield2012-09-171-0/+43
* morph merge: Don't make a merge commit if only the refs changedSam Thursfield2012-09-142-3/+21
* 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
* 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
* 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
* | Fix things so test suite works on Debian squeezeLars Wirzenius2012-09-132-36/+51
* | morph build: Use pre-v1.7.9 form of git commit-treeSam Thursfield2012-09-131-2/+2
|/
View Lorry Controller Status