summaryrefslogtreecommitdiff
path: root/morphlib
Commit message (Expand)AuthorAgeFilesLines
* Handle submodules in 'morph edit'Sam Thursfield2012-10-032-6/+28
* Fix after reviewSam Thursfield2012-10-031-3/+2
* morph merge: Rework how we interact with gitSam Thursfield2012-10-031-165/+105
* Use repository cache for git access other than current system branchSam Thursfield2012-10-033-73/+82
* Use origin/ref for all refs other than the system branch ref itselfSam Thursfield2012-10-032-6/+19
* Extract is_valid_sha1() to morphlib.gitSam Thursfield2012-10-032-9/+9
* No need for iterable when initializing the setJames Thomas2012-10-011-1/+1
* Only update repos onceJames Thomas2012-10-011-1/+5
* Merge branch 'danielsilverstone/remote-artifact-cache-chat'Daniel Silverstone2012-09-282-2/+18
|\
| * Increase verbosity regarding the remote artifact cache.Daniel Silverstone2012-09-282-2/+18
| * Merge remote-tracking branch 'origin/richardmaw/S4750-arm-to-armv7'Daniel Silverstone2012-09-264-6/+6
| |\
| | * Rename arm to armv7 and be consistentRichard Maw2012-09-204-6/+6
* | | 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
View Lorry Controller Status