[PATCH] morph merge now reports all uncommitted source and target chunk repositories to the user
by Daniel Firth
Sorry, send the same thing out twice.
repo: git.baserock.org:baserock/baserock/morph
branch: danielfirth/RT45
sha1: 7175d087f0b2370cdbcdbefc9522cc4814e596b0
Daniel Firth (1):
morph merge reports all uncommitted source and target chunk
repositories to the user
morphlib/plugins/branch_and_merge_plugin.py | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
--
1.8.1.2
8 years, 7 months
[PATCH 0/5] Add API for managing refs
by Richard Maw
Repo: git://git.baserock.org/baserock/baserock/morph.git
Ref: baserock/richardmaw/S9475/ref-api
SHA1: a22a819ebc63a9cac9a5d08a04fb4f5f59b70f13
Base: baserock/richardmaw/S9475/commit-api
Land: master
This adds the Remote and RefSpec abstractions for handling git pushes.
In addition, there's a pair of context managers for aiding the cleanup
of branches in repositories.
LocalRefManager will keep the refs around after it leaves the scope,
RemoteRefManager handles temporary build branches, so deletes them after
they leave the scope.
Richard Maw (5):
GitDir: Add methods for ref management
GitDir: Split out Remote object
GitDir: Add support for push urls in Remote
GitDir: Add remote.push(RefSpec...)
morphlib: Add branch context managers
morphlib/__init__.py | 1 +
morphlib/branchmanager.py | 98 ++++++++++++
morphlib/branchmanager_tests.py | 323 ++++++++++++++++++++++++++++++++++++++
morphlib/gitdir.py | 333 ++++++++++++++++++++++++++++++++++++++--
morphlib/gitdir_tests.py | 255 ++++++++++++++++++++++++++++--
morphlib/sysbranchdir.py | 3 +-
6 files changed, 989 insertions(+), 24 deletions(-)
create mode 100644 morphlib/branchmanager.py
create mode 100644 morphlib/branchmanager_tests.py
--
1.8.5.rc2
8 years, 7 months
[PATCH 0/4] Refactored localcacherepo
by Daniel Firth
repo: git.baserock.org:baserock/baserock/morph
branch: danielfirth/RT44
sha1: e8186e11259ab35967e51528edc877a274df5214
Daniel Firth (4):
Partially-cached gits are now cleaned up instead of persisting.
Changed localrepocache to use pyfilesystem
Removed filesystem boilerplate
Refactored tarball unpacking
morphlib/localrepocache.py | 120 ++++++++++-----------------------------
morphlib/localrepocache_tests.py | 53 ++++++-----------
2 files changed, 47 insertions(+), 126 deletions(-)
--
1.8.1.2
8 years, 7 months
[PATCHv4] Character and block device scenarios
by Ben Brown
Repo: baserock:baserock/tbdiff
Ref: benbrown/S9462/convert-device-tests
Sha1: 9585ad83652220527be88afda05d719781e14f16
Card: S9462
Ben Brown (1):
Chardev and blockdev scenarios added
yarns/create-deploy.yarn | 65 +++++++++++++++++++++++++++++++++++++++-------
1 file changed, 55 insertions(+), 10 deletions(-)
--
1.7.10.4
8 years, 7 months
[PATCH] Standardizes language in yarn
by Daniel Firth
repo: git.baserock.org:baserock/baserock/morph
branch: danielfirth/language-changes
sha1: 38aaaece7175e2062e3e76999256225b95f06a0a
Daniel Firth (1):
Standardizes more of the implementations language in yarn
yarns/architecture.yarn | 2 +-
yarns/branches-workspaces.yarn | 53 +++++++++---------
yarns/building.yarn | 2 +-
yarns/deployment.yarn | 2 +-
yarns/implementations.yarn | 122 ++++++++++++++++++-----------------------
yarns/regression.yarn | 5 +-
6 files changed, 86 insertions(+), 100 deletions(-)
--
1.8.1.2
8 years, 7 months
[PATCH v2] S9532 Fix morph edit behaviour
by Richard Ipsum
repo: git.baserock.org:baserock/baserock/morph
sha1: 2cf5f0691241fa0e771cd7e7a8999961dc7250e8
ref: richardipsum/s9532/fix_morph_edit_behaviour
land: origin/master
Version 2 updates the commit message to something more informative.
Richard Ipsum (1):
Use contents of working tree, regardless of which ref is checked out
morphlib/plugins/branch_and_merge_new_plugin.py | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
--
1.7.10.4
8 years, 7 months
[PATCH] morph merge reports all uncommitted source and target chunk repositories to the user
by Daniel Firth
repo: git.baserock.org:baserock/baserock/morph
branch: danielfirth/RT45
sha1: 6d98546b40d9522323b4db61cc5f6e61d0888f86
Note: This is not scenario tested yet because it requires a larger volume of merging implementations behaviour. It hasn't been forgotten about and will come as a consequence of addressing RT49, whose scenario tests encompass this.
Daniel Firth (1):
morph merge reports all uncommitted source and target chunk
repositories to the user
morphlib/plugins/branch_and_merge_plugin.py | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
--
1.8.1.2
8 years, 7 months
[PATCH] S9579 Fix for RT #275
by Richard Ipsum
This fixes the conflicting strata issue.
This section of the code isn't very nice, can I try and clean it up?
Richard Ipsum (1):
Fix conflicting strata problem
morphlib/morphset.py | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
--
1.7.10.4
8 years, 7 months
[PATCHv2] Modified language used in tbdiff yarn
by Ben Brown
Repo: baserock:baserock/tbdiff
Ref: benbrown/S9561/scenario-language
Sha1: d0e33c0ad97e0355536fd772831075360a0f92f5
Card: S9561
v2: Duplicate IMPLEMENTS for changing group ownership or mtimes squashed,
scenarios changed accordingly (removal of '@' from timestamps)
Reverted changes that created more ambiguity.
Changed generic use of 'file(s)' to be more informative
Ben Brown (1):
Modified yarn to be more readable, IMPLEMENTS made "cleaner"
yarns/create-deploy.yarn | 348 +++++++++++++++++++++++-----------------------
1 file changed, 172 insertions(+), 176 deletions(-)
--
1.7.10.4
8 years, 7 months
