summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Unrevert "Make system-integration commands use containerised_cmdline"baserock/richardmaw/fixup-ro-integrationsRichard Maw2014-11-121-55/+5
* Make invert_paths work more reliably for writable-allRichard Maw2014-11-122-41/+51
* yarns: Report stderr on morph failureRichard Maw2014-11-122-3/+8
* test-shell: Report write failuresRichard Maw2014-11-121-2/+9
* Revert "Make system-integration commands use containerised_cmdline"Richard Maw2014-11-111-5/+55
* Merge branch 'sam/fix-deploy'baserock-14.46Sam Thursfield2014-11-111-1/+0
|\
| * Allow `morph deploy` to cache missing Git repos if it needs toSam Thursfield2014-11-111-1/+0
|/
* Merge branch 'sam/source-resolver-cleanup'Sam Thursfield2014-11-108-148/+217
|\
| * Add docstring to SourceResolver class.Sam Thursfield2014-11-101-1/+22
| * Set the 'update' flag in the SourceResolver constructorSam Thursfield2014-11-101-12/+14
| * Move create_source_pool code into new 'sourceresolver' moduleSam Thursfield2014-11-106-136/+189
| * Remove one place where we pass the Application instance aroundSam Thursfield2014-11-063-14/+7
|/
* Merge branch 'sam/gitdir-fixes-v2'Sam Thursfield2014-11-064-14/+39
|\
| * Improve documentation of GitDirectory classSam Thursfield2014-11-051-5/+13
| * Only search for repository root in GitDirectory constructor if told toSam Thursfield2014-11-054-9/+26
* | Merge branch 'sam/gitdir-ref-exists'Sam Thursfield2014-11-062-0/+14
|\ \
| * | Add GitDirectory.ref_exists() methodSam Thursfield2014-11-052-0/+14
| |/
* | Merge branch 'baserock/pedroalvarez/upgrades-to-default'Pedro Alvarez2014-11-052-3/+3
|\ \
| * | Use the default symlink when creating the orig subvolume.Pedro Alvarez2014-11-052-3/+3
|/ /
* | Merge branch 'baserock/franred/check-for-commit-object-in-submodule-path'Francisco Redondo Marchena2014-11-051-1/+1
|\ \ | |/ |/|
| * Check for commit object in submodule pathbaserock/franred/check-for-commit-object-in-submodule-pathFrancisco Redondo Marchena2014-11-041-1/+1
|/
* Merge remote-tracking branch 'origin/sam/transfer-status'Sam Thursfield2014-10-314-15/+45
|\
| * Echo stderr of subcommands that do network IO when --verbose is usedSam Thursfield2014-10-294-9/+42
| * Remove workaround for an old version of GitSam Thursfield2014-10-291-6/+2
| * Don't say 'Updating git repository xxx' unless we actually areSam Thursfield2014-10-291-1/+2
* | Merge branch 'baserock/richardmaw-os/unify-namespace-logic'Richard Maw2014-10-305-112/+141
|\ \ | |/ |/|
| * stagingarea: Remove vestigial pre-command mounting logicRichard Maw2014-10-301-22/+2
| * Make build commands use containerised_cmdlineRichard Maw2014-10-301-31/+14
| * Make deployment extensions use unshared_cmdlineRichard Maw2014-10-301-4/+1
| * Make system-integration commands use containerised_cmdlineRichard Maw2014-10-301-55/+5
| * Move unsharing and containerising logic to utilRichard Maw2014-10-301-0/+114
| * Allow invert_paths to skip the top level directoryRichard Maw2014-10-291-0/+5
|/
* Fix lines longer than 79 charactersSam Thursfield2014-10-292-3/+4
* Merge remote-tracking branch 'origin/sam/build-fix-3'Sam Thursfield2014-10-295-17/+38
|\
| * Fix distbuild to allow passing a commit instead of a named ref to be builtSam Thursfield2014-10-275-17/+38
* | Make pushed_build_branch always return (url, commit, ref)Richard Ipsum2014-10-281-2/+7
|/
* Merge branch 'baserock/ps/message-fix'Sam Thursfield2014-10-271-1/+1
|\
| * Fix confusing messagebaserock/ps/message-fixPaul Sherwood2014-10-271-1/+1
| * Merge branch 'master' of git://git.baserock.org/baserock/baserock/morph into ...Paul Sherwood2014-10-2713-100/+229
| |\ | |/ |/|
* | Merge branch 'sam/build-fix-2'Sam Thursfield2014-10-275-26/+49
|\ \
| * | build: Resolve the ref being built in the user's local definitions.gitSam Thursfield2014-10-243-7/+18
| * | build: Allow passing in the name of the original ref to create_source_pool()Sam Thursfield2014-10-242-7/+15
| * | build: Restructure how BuildCommand.build() is calledSam Thursfield2014-10-242-15/+19
|/ /
* | Merge branch 'baserock/richardmaw/parallelism-improvements'Richard Maw2014-10-243-11/+23
|\ \
| * | stagingarea: Mount proc and ccache inside the namespaceRichard Maw2014-10-242-10/+18
| * | deploy extensions: Don't crash if someone builds at the same timeRichard Maw2014-10-241-1/+3
|/ /
* | Merge branch 'baserock/richardmaw/test-system-integrations'Richard Maw2014-10-245-54/+152
|\ \
| * | yarns: Add yarns for system-integrationsRichard Maw2014-10-242-0/+38
| * | Run system-integrations in a namespaceRichard Maw2014-10-241-23/+53
| * | yarns: Fix missing FINALLYRichard Maw2014-10-241-0/+1