summaryrefslogtreecommitdiff
path: root/morphlib
Commit message (Expand)AuthorAgeFilesLines
* morph status: Sort list of system branches in a workspaceSam Thursfield2012-10-181-2/+3
* morph status, foreach: Find root repo in correct waySam Thursfield2012-10-121-5/+8
* Factor out common function iterate_branch_repos()Sam Thursfield2012-10-121-10/+14
* morph status: Add initial version of commandSam Thursfield2012-10-121-0/+57
* Reorder branch and merge plumbing commands to end of fileSam Thursfield2012-10-121-25/+30
* Fix use of GzipFile to not assume "with" protocolLars Wirzenius2012-10-122-5/+7
* Merge remote-tracking branch 'origin/samthursfield/S4873-warn-when-merge-caus...Daniel Silverstone2012-10-111-8/+83
|\
| * morph merge: Warn if a merge will cause unexpected petrificationSam Thursfield2012-10-111-8/+83
* | Validate that systems, strata reference correct kindsLars Wirzenius2012-10-111-0/+43
* | Warn about unknown morphology fieldsLars Wirzenius2012-10-111-0/+32
* | Add morphology validation to branch+mergeLars Wirzenius2012-10-111-0/+35
* | Handle ValueErrors from JSON libraryLars Wirzenius2012-10-111-1/+7
|/
* morph foreach: Handle repos addressed by full URLs correctlySam Thursfield2012-10-101-3/+5
* Make hardlink paths relativeRichard Maw2012-10-091-0/+3
* Use os.path.relpath for fixing paths in tarball system builderRichard Maw2012-10-091-4/+2
* Use standard library function for relative pathsRichard Maw2012-10-091-9/+3
* foldmeDaniel Silverstone2012-10-091-2/+7
* Fix up make-patchDaniel Silverstone2012-10-091-34/+56
* Add a sparse-aware (for writing) copyfileobj.Daniel Silverstone2012-10-091-0/+39
* Correct a few long lines.Daniel Silverstone2012-10-091-3/+6
* Merge branch 'danielsilverstone/compress-disk-images'Daniel Silverstone2012-10-081-29/+45
|\
| * Compress system disk imagesDaniel Silverstone2012-10-081-29/+45
* | Fix typoLars Wirzenius2012-10-081-1/+1
|/
* Merge branch 'master' of git://git.baserock.org/baserock/morphLars Wirzenius2012-10-082-1/+20
|\
| * Handle branch name kind changes more gracefully.Daniel Silverstone2012-10-081-1/+5
| * Merge branch 'danielsilverstone/tarball-rootfs-fix'Daniel Silverstone2012-10-051-0/+15
| |\
| | * Actually construct a tarball for the rootfs-tarball system kind.Daniel Silverstone2012-10-051-0/+15
* | | Change the time sanity checkLars Wirzenius2012-10-081-13/+6
|/ /
* | Add a way for a local artifact cache to clear itselfLars Wirzenius2012-10-052-0/+26
|/
* 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
View Lorry Controller Status