summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* tests.branching: Make defined systems buildableRichard Maw2013-09-242-2/+2
* Merge branch 'jonathan/fix-cross-bootstrap-rebase'Jonathan Maw2013-09-241-7/+14
|\
| * Make cross-bootstrap successfully build everythingJonathan Maw2013-09-241-7/+14
|/
* Merge branch 'baserock/richardmaw/S8847/cleanup-petrify-v3'Richard Maw2013-09-244-69/+215
|\
| * b&m: Use new MorphSet api in unpetrifyRichard Maw2013-09-241-23/+1
| * MorphSet: add unpetrify_all() methodRichard Maw2013-09-242-0/+27
| * b&m: Refactor petrify to use new morphset methodsRichard Maw2013-09-241-17/+12
| * MorphSet: Add method for changing refs en-masseRichard Maw2013-09-242-0/+34
| * MorphSet: Add petrify_chunks() methodRichard Maw2013-09-242-1/+48
| * MorphSet: add a list_refs() methodRichard Maw2013-09-242-0/+26
| * MorphSet: Factor traversal logic out of change_refRichard Maw2013-09-242-21/+69
| * Rename test to fix name clashRichard Maw2013-09-231-1/+1
| * Remove duplicate yarnRichard Maw2013-09-231-9/+0
|/
* Merge branch 'liw/fix-graphing'Lars Wirzenius2013-09-231-3/+2
|\
| * Fix the graphing_plugin so it actually worksLars Wirzenius2013-09-231-3/+2
|/
* Merge branch 'liw/S8701-drop-useless-options'Lars Wirzenius2013-09-182-38/+0
|\
| * Remove --staging-chroot, --staging-filler optionsLars Wirzenius2013-09-172-38/+0
|/
* Merge remote-tracking branch 'origin/baserock/richardmaw/S8511/refactor-statu...Lars Wirzenius2013-09-179-22/+164
|\
| * b&m: Use new-status as the defaultRichard Maw2013-09-172-2/+2
| * b&m: morph new-status provides per-branch statusRichard Maw2013-09-171-1/+23
| * gitdir: Add method for getting uncommitted changesRichard Maw2013-09-172-0/+37
| * gitdir: add HEAD property to find the current branchRichard Maw2013-09-172-0/+15
| * b&m: Add new-status subcommandRichard Maw2013-09-171-0/+48
| * workspace: add method for listing system branchesRichard Maw2013-09-172-0/+15
| * util: add find_leaves() supplimenting find_leaf()Richard Maw2013-09-173-21/+26
|/
* Merge branch 'baserock/richardmaw/S8717/refactor-petrify-v4'Richard Maw2013-09-1614-22/+495
|\
| * b&m: re-implement morph unpetrifyRichard Maw2013-09-053-3/+49
| * b&m: Re-implement morph petrifyRichard Maw2013-09-053-2/+93
| * morphlib: Add MorphologyFinder classRichard Maw2013-09-053-0/+183
| * gitdir: Add methods to inspect contentsRichard Maw2013-09-052-0/+142
| * MorphSet: keep old ref as unpetrify-refRichard Maw2013-09-055-12/+24
| * morphlib.git: Refactor is_valid_sha1Richard Maw2013-09-051-2/+2
| * sysbranchdir: simplify prefix / stripRichard Maw2013-09-051-2/+1
| * Fix MorphologySet bug: right Morphology object changedLars Wirzenius2013-09-051-4/+4
* | Merge branch 'baserock/richardmaw/S8740/fix-tests-with-tmpfs'Richard Maw2013-09-166-19/+19
|\ \
| * | foreach: sort repositories asciibeticallyRichard Maw2013-09-165-18/+18
| * | exts: Remove tab from vdaboot.configureRichard Maw2013-09-161-1/+1
|/ /
* | Merge branch 'baserock/pedroalvarez/S8631/openstack-configure-write' of ssh:/...Pedro Alvarez2013-09-112-0/+174
|\ \ | |/ |/|
| * exts: Add openstack configure/write extsPedro Alvarez2013-09-112-0/+174
|/
* Merge branch 'baserock/richardmaw/S8740/refactor-foreach' of git://git.basero...Richard Maw2013-09-057-1/+68
|\
| * b&m: Re-implement morph foreachRichard Maw2013-09-047-1/+68
|/
* Merge branch 'baserock/richardmaw/S8694/edit-no-write-defaults-v3'Richard Maw2013-08-3021-241/+148
|\
| * edit: Unset defaults before writingRichard Maw2013-08-305-56/+26
| * morphloader: Add method to unset default valuesRichard Maw2013-08-302-2/+94
| * morph edit: Check for sufficient argumentsRichard Maw2013-08-301-0/+5
| * Revert "Merge branch 'liw/restore-old-cmds'"Richard Maw2013-08-2916-181/+21
* | Merge remote-tracking branch 'origin/baserock/richardmaw/S8697/fixup-building...Lars Wirzenius2013-08-282-15/+44
|\ \ | |/ |/|
| * rootfs-protection: Fix building with tempdir=/tmpRichard Maw2013-08-282-15/+44
|/
* Merge branch 'baserock/richardmaw/S8646/edit-odd-submodules' of git://git.bas...Richard Maw2013-08-2711-84/+145
|\
| * Use Submodules class to read submodule configRichard Maw2013-08-231-6/+6