summaryrefslogtreecommitdiff
path: root/morphlib/plugins/branch_and_merge_new_plugin.py
Commit message (Expand)AuthorAgeFilesLines
* Allow omitting repo and ref when referring to strataRichard Maw2014-02-131-3/+3
* Modify morph to strip .morph extensions from parametersBen Brown2013-12-161-3/+5
* sysbranchdir: Move load_all_morphologies helper hereRichard Maw2013-11-291-9/+2
* GitDir: Add GitIndex classRichard Maw2013-11-221-1/+1
* GitDir: Provide more specific object access than cat-fileRichard Maw2013-11-221-2/+2
* Remove unused invent_new_branch methodRichard Maw2013-11-221-12/+0
* Added scenario test to prevent morph edit from being used without a system ar...Daniel Firth2013-11-011-0/+2
* Don't remove an existing branch in 'morph branch'Pedro Alvarez2013-10-311-0/+3
* Merge branch 'danielfirth/RT193'Daniel Firth2013-10-111-1/+1
|\
| * Added chunkname prefix to some elements of the debug log.Dan Firth2013-10-111-1/+1
* | Merge remote-tracking branch 'origin/danielfirth/RT189'Lars Wirzenius2013-10-081-10/+0
|\ \ | |/ |/|
| * Re-enabled validation for morph editDan Firth2013-10-011-10/+0
* | Merge branch 'baserock/richardmaw/S8847/branch-from-image-v3'Jonathan Maw2013-09-301-36/+146
|\ \
| * | B&M: refactor branch-from-imageRichard Maw2013-09-251-0/+104
| * | b&m: checkout and branch use context managerRichard Maw2013-09-251-36/+7
| * | b&m: Add system branch initializing context managerRichard Maw2013-09-251-0/+35
| |/
* | Make branch commands work with null refsRichard Maw2013-09-261-1/+6
|/
* b&m: Use new MorphSet api in unpetrifyRichard Maw2013-09-241-23/+1
* b&m: Refactor petrify to use new morphset methodsRichard Maw2013-09-241-17/+12
* b&m: Use new-status as the defaultRichard Maw2013-09-171-1/+1
* b&m: morph new-status provides per-branch statusRichard Maw2013-09-171-1/+23
* b&m: Add new-status subcommandRichard Maw2013-09-171-0/+48
* Merge branch 'baserock/richardmaw/S8717/refactor-petrify-v4'Richard Maw2013-09-161-0/+137
|\
| * b&m: re-implement morph unpetrifyRichard Maw2013-09-051-1/+47
| * b&m: Re-implement morph petrifyRichard Maw2013-09-051-0/+91
* | foreach: sort repositories asciibeticallyRichard Maw2013-09-161-1/+1
|/
* b&m: Re-implement morph foreachRichard Maw2013-09-041-0/+58
* edit: Unset defaults before writingRichard Maw2013-08-301-0/+1
* morph edit: Check for sufficient argumentsRichard Maw2013-08-301-0/+5
* Revert "Merge branch 'liw/restore-old-cmds'"Richard Maw2013-08-291-1/+1
* Restore old branch and merge subcommandsLars Wirzenius2013-08-191-1/+1
* Clarify _get_stratum_triplets codeLars Wirzenius2013-08-151-1/+15
* Fix "morph edit" to load morphologies from git when neededLars Wirzenius2013-08-151-1/+32
* Re-implement "morph edit" using new infrastructureLars Wirzenius2013-08-141-0/+204
* Load morphologies using the new mechanisms, not the oldLars Wirzenius2013-08-141-4/+4
* Remove unused argument from SystemBranchDirectory.clone_cached_repoLars Wirzenius2013-08-141-3/+2
* workflow-tools: check branch roots have systemsRichard Maw2013-08-081-0/+25
* workflow-tools: Fix typo in `morph help branch`Richard Maw2013-08-071-1/+1
* Re-implement "morph branch" using new infrastructureLars Wirzenius2013-08-061-0/+73
* Re-implement "morph show-branch-root" using new infrastructureLars Wirzenius2013-08-061-0/+18
* Re-implement "morph show-system-branch" using new infrastructureLars Wirzenius2013-08-061-0/+9
* Re-implement "morph checkout" using new infrastructureLars Wirzenius2013-08-061-0/+99
* Re-implement "morph workspace" using the Workspace classLars Wirzenius2013-07-311-0/+7
* Re-implement "morph init" using the new Workspace classLars Wirzenius2013-07-311-0/+63
View Lorry Controller Status