summaryrefslogtreecommitdiff
path: root/morphlib/plugins/branch_and_merge_plugin.py
Commit message (Expand)AuthorAgeFilesLines
* Make writing morphologies back out properly non-destructiveSam Thursfield2013-02-181-55/+47
* Merge branch 'baserock/richardmaw/fix-edit-build-depends'Sam Thursfield2013-02-131-33/+66
|\
| * morph edit: Recursively edit strataRichard Maw2013-02-131-33/+66
* | Merge branch 'liw/deployment-refactor' of git://git.baserock.org/baserock/bas...Richard Maw2013-02-121-0/+1
|\ \
| * | Add deployment pluginLars Wirzenius2013-02-061-0/+1
| |/
* | branch and merge: add branch-from-image commandRichard Maw2013-02-111-0/+128
* | branch and merge: combine checkout and branch logicRichard Maw2013-02-111-48/+37
* | Make petrify more versatile than just making tagsRichard Maw2013-02-111-8/+18
|/
* Merge branch 'jjardon/yaml-v2'Sam Thursfield2013-01-281-1/+0
|\
| * Remove unneded json module importsJavier Jardón2013-01-281-1/+0
* | Make temporary build refs count changes against HEADRichard Maw2013-01-251-3/+4
|/
* Merge remote-tracking branch 'origin/jonathanmaw/ccache-local-fix'Lars Wirzenius2013-01-031-1/+1
|\
* | Fix sporadic test failures caused by the unstable ordering of glob.glob()Sam Thursfield2013-01-031-2/+2
|/
* morph build: Update repo and ref in stratum build-depends fieldsSam Thursfield2012-12-181-0/+3
* morph edit: Update build-depends that refer to the edited stratumSam Thursfield2012-12-181-73/+84
* Drop committer info from git tag environment; update tag test outputsJannis Pohlmann2012-12-171-6/+0
* Merge remote-tracking branch 'remotes/origin/samthursfield/ambiguous-refs' in...Jannis Pohlmann2012-12-131-8/+7
|\
| * morph branch: Check if the ref already exists before anything elseSam Thursfield2012-12-131-6/+5
| * Always use `git rev-parse --verify` to resolve refsSam Thursfield2012-12-131-2/+2
* | Fix morph tag usage of git commit-tree; fix detecting existing tagsJannis Pohlmann2012-12-131-12/+23
* | Merge remote-tracking branch 'origin/jannispohlmann/morph-tag-v2'Sam Thursfield2012-12-131-0/+203
|\ \ | |/ |/|
| * Add an initial implementation of "morph tag"Jannis Pohlmann2012-12-131-0/+203
|/
* Merge branch 'samthursfield/build-without-push' of git://git.baserock.org/bas...Richard Maw2012-11-121-12/+31
|\
| * morph build: Allow forcing build branches to be pushedSam Thursfield2012-11-121-4/+5
| * morph build: Use the user's own repos when buildingSam Thursfield2012-11-121-9/+18
| * Add docstrings for some build functionsSam Thursfield2012-11-121-0/+9
* | Fix spelling mistakesSam Thursfield2012-11-121-3/+3
|/
* Process systems for merging in a fixed orderSam Thursfield2012-11-051-1/+1
* Fix use of variable before assignmentSam Thursfield2012-11-021-0/+1
* Improve command descriptions in --helpSam Thursfield2012-10-261-31/+25
* Merge branch 'samthursfield/morph-status-in-workspace-sorted'Sam Thursfield2012-10-181-2/+3
|\
| * morph status: Sort list of system branches in a workspaceSam Thursfield2012-10-181-2/+3
* | Merge branch 'samthursfield/petrify-avoid-edited-chunks' of git://git.baseroc...Richard Maw2012-10-181-18/+39
|\ \ | |/ |/|
| * morph petrify: Avoid petrifying chunks that have already been editedSam Thursfield2012-10-181-18/+39
|/
* 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
* 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
* | 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
* Fix typoLars Wirzenius2012-10-081-1/+1
* Handle submodules in 'morph edit'Sam Thursfield2012-10-031-6/+6
* 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-031-71/+61
* Use origin/ref for all refs other than the system branch ref itselfSam Thursfield2012-10-031-1/+15
View Lorry Controller Status