summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remember repository that was branched off from for merging and editingJannis Pohlmann2012-08-2910-36/+69
* Make "morph checkout" require a repository parameterJannis Pohlmann2012-08-299-21/+143
* Make "morph show-system-branch" anywhere in a workspace, if possibleJannis Pohlmann2012-08-2930-68/+225
* Use .morph-system-branch directories to identify branch directoriesJannis Pohlmann2012-08-294-25/+22
* Rename the "morph minedir" command to "morph workspace"Jannis Pohlmann2012-08-2924-84/+88
* Create mine directory if it does not exists when running "morph init"Jannis Pohlmann2012-08-285-7/+12
* Break long lineLars Wirzenius2012-08-281-1/+2
* Merge remote branch 'origin/samthursfield/S4350-faster-build-system-autodetect'Lars Wirzenius2012-08-288-115/+159
|\
| * Always ls-tree before trying to cat-fileSam Thursfield2012-08-242-36/+35
| * Refactor build system code for easier testingSam Thursfield2012-08-242-31/+16
| * Use git ls-tree to autodetect build systemSam Thursfield2012-08-244-72/+41
| * Support 'git ls-tree' in local and remote reposSam Thursfield2012-08-244-0/+91
| * buildsystem: Fix incorrect testcaseSam Thursfield2012-08-241-2/+2
* | Expand TAB charactersLars Wirzenius2012-08-281-41/+41
|/
* scripts/clean-git-cache: Fix 2 small issuesSam Thursfield2012-08-231-2/+4
* Add scripts/clean-git-cacheSam Thursfield2012-08-221-0/+238
* Add scripts/clean-artifact-cacheSam Thursfield2012-08-221-0/+94
* Allow setting ARCH explicitly for bootstrappingSam Thursfield2012-08-221-1/+13
* Fix test coverage for squeeze coverage.pyLars Wirzenius2012-08-151-3/+3
* Merge remote branch 'origin/danielsilverstone/repo-alias-update'Lars Wirzenius2012-08-151-5/+5
|\
| * Change default repo-aliases to git.baserock.orgDaniel Silverstone2012-08-151-5/+5
|/
* Merge branch 'danielsilverstone/no-syslinux-disk-image' of git://git.baserock...Richard Maw2012-08-145-134/+269
|\
| * Add a non-x86 disk image testDaniel Silverstone2012-08-141-0/+94
| * Make SyslinuxDiskBuilder inherit from DiskImageBuilderDaniel Silverstone2012-08-141-134/+11
| * Initial non-syslinux disk image kindDaniel Silverstone2012-08-143-0/+164
|/
* Add support for autogen in addition to autogen.shLars Wirzenius2012-08-081-1/+3
* Merge branch 'liw/fix-deprecation'Lars Wirzenius2012-08-071-1/+1
|\
| * Fix deprecation message when showing error messageLars Wirzenius2012-08-071-1/+1
|/
* Merge remote branch 'origin/baserock/bugfix/S4086-sync-before-snapshot'Lars Wirzenius2012-08-071-0/+3
|\
| * SyslinuxDiskBuilder: sync before snapshottingRichard Maw2012-08-071-0/+3
|/
* Merge remote branch 'origin/baserock/bugfix/S4069-fail-on-missing-syslinux-mbr'Lars Wirzenius2012-08-065-10/+110
|\
| * Raise Error if install_mbr failsRichard Maw2012-08-061-0/+8
| * Add test for failing to install mbrRichard Maw2012-08-063-0/+92
| * systembuilder: select mbr search paths from configRichard Maw2012-08-061-2/+6
| * Move install_syslinux_mbr into syslinux pluginRichard Maw2012-08-062-10/+6
|/
* Merge branch 'liw/no-hashbangs' of git://roadtrain.codethink.co.uk/baserock/m...Richard Maw2012-08-022-1/+10
|\
| * Remove #! from setup.pyLars Wirzenius2012-08-021-1/+0
| * Add check for #! in *.py filesLars Wirzenius2012-08-021-0/+10
|/
* Merge branch 'master' of roadtrain.codethink.co.uk:baserock/morphLars Wirzenius2012-08-012-1/+13
|\
| * Merge branch 'samthursfield/clearer-morphology-parse-errors' of git://roadtra...Richard Maw2012-08-012-2/+13
| |\
| | * Raise clearer error on morphology parse errorsSam Thursfield2012-07-312-2/+12
| |/
* | Merge remote branch 'origin/baserock/feature/S2791-move-commands-to-plugins'Lars Wirzenius2012-08-0174-1947/+2225
|\ \ | |/ |/|
| * Move cmd_build to a separate pluginRichard Maw2012-08-013-17/+48
| * Move BuildCommand from app into its own moduleRichard Maw2012-08-015-280/+302
| * Consolidate morphology writing code in pluginRichard Maw2012-08-012-5/+6
| * Move edit to plugin and remove dead code from appRichard Maw2012-08-012-156/+94
| * Move merge command to pluginRichard Maw2012-08-012-18/+29
| * Add test for petrifying strataRichard Maw2012-08-013-0/+56
| * Move command petrify to branch_and_merge pluginRichard Maw2012-08-012-35/+33
| * move command show-system-branch to pluginRichard Maw2012-08-012-13/+29