8:14 p.m.
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/merge-misc-1
Sha1: 12abc0e760f7cf8905a72bd6b5d1d566889e022d
Sam Thursfield (3):
Fix merge tests on Squeeze, by disabling them correctly
morph merge: Error message wrangling
morph merge: Set status on success
morphlib/plugins/branch_and_merge_plugin.py | 13 ++++++++-----
tests.branching/merge-conflict-chunks.script | 2 ++
tests.branching/merge-conflict-chunks.stderr | 2 +-
tests.branching/merge-conflict-stratum.script | 4 +++-
tests.branching/merge-conflict-stratum.stderr | 2 +-
tests.branching/merge-with-chunk-renamed.script | 6 ++++++
tests.branching/merge-with-chunk-repo-moved.script | 7 +++++++
7 files changed, 28 insertions(+), 8 deletions(-)
--
1.7.10.4
8:14 p.m.
New subject: [PATCH 1/3] Fix merge tests on Squeeze, by disabling them correctly
---
tests.branching/merge-conflict-chunks.script | 2 ++
tests.branching/merge-conflict-stratum.script | 4 +++-
tests.branching/merge-with-chunk-renamed.script | 6 ++++++
tests.branching/merge-with-chunk-repo-moved.script | 7 +++++++
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/tests.branching/merge-conflict-chunks.script
b/tests.branching/merge-conflict-chunks.script
index f53edd8..a156ea5 100755
--- a/tests.branching/merge-conflict-chunks.script
+++ b/tests.branching/merge-conflict-chunks.script
@@ -22,6 +22,8 @@ set -eu
# Disable test on versions of Python before 2.7.
if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null
then
+ cat "$SRCDIR/tests.branching/merge-conflict-chunks.stdout"
+ cat "$SRCDIR/tests.branching/merge-conflict-chunks.stderr" >&2
exit 0
fi
diff --git a/tests.branching/merge-conflict-stratum.script
b/tests.branching/merge-conflict-stratum.script
index 76e3309..8f0a317 100755
--- a/tests.branching/merge-conflict-stratum.script
+++ b/tests.branching/merge-conflict-stratum.script
@@ -21,7 +21,9 @@ set -eu
# Disable test on versions of Python before 2.7.
if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null
then
- exit 0
+ cat "$SRCDIR/tests.branching/merge-conflict-stratum.stdout"
+ cat "$SRCDIR/tests.branching/merge-conflict-stratum.stderr" >&2
+ exit 1
fi
cd "$DATADIR/workspace"
diff --git a/tests.branching/merge-with-chunk-renamed.script
b/tests.branching/merge-with-chunk-renamed.script
index 1ca2ee4..06969b7 100755
--- a/tests.branching/merge-with-chunk-renamed.script
+++ b/tests.branching/merge-with-chunk-renamed.script
@@ -19,6 +19,12 @@
set -eu
+# Disable test on versions of Python before 2.7.
+if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null
+then
+ exit 0
+fi
+
# Create system branch.
cd "$DATADIR/workspace"
"$SRCDIR/scripts/test-morph" init
diff --git a/tests.branching/merge-with-chunk-repo-moved.script
b/tests.branching/merge-with-chunk-repo-moved.script
index c67ccc6..d14d586 100755
--- a/tests.branching/merge-with-chunk-repo-moved.script
+++ b/tests.branching/merge-with-chunk-repo-moved.script
@@ -19,6 +19,13 @@
set -eu
+# Disable test on versions of Python before 2.7.
+if ! python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null
+then
+ cat "$SRCDIR/tests.branching/merge-with-chunk-repo-moved.stderr"
>&2
+ exit 1
+fi
+
# Create system branch.
cd "$DATADIR/workspace"
"$SRCDIR/scripts/test-morph" init
--
1.7.10.4
8:14 p.m.
New subject: [PATCH 2/3] morph merge: Error message wrangling
These do need to be quite clear, because merge failures will happen a
lot and we are relatively unhelpful at the moment.
---
morphlib/plugins/branch_and_merge_plugin.py | 11 ++++++-----
tests.branching/merge-conflict-chunks.stderr | 2 +-
tests.branching/merge-conflict-stratum.stderr | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/morphlib/plugins/branch_and_merge_plugin.py
b/morphlib/plugins/branch_and_merge_plugin.py
index 6f08981..468695d 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -843,9 +843,9 @@ class BranchAndMergePlugin(cliapp.Plugin):
to_branch_dir, root_repo, to_branch)
if to_root_dir is None:
raise cliapp.AppException(
- 'Merging failed in %s: please manually merge %s into %s '
- 'in this repo and try again.' %
- (root_repo, to_branch, from_branch))
+ 'Merging failed in %s: please \'git merge\' the latest %s
'
+ 'into %s in the \'%s\' system branch.' %
+ (root_repo, to_branch, from_branch, from_branch))
for f in glob.glob(os.path.join(to_root_dir, '*.morph')):
name = os.path.basename(f)[:-len('.morph')]
@@ -855,9 +855,10 @@ class BranchAndMergePlugin(cliapp.Plugin):
raise cliapp.AppException(
'merge errors were encountered in the following %s:\n\n'
'\t%s\n\nPlease manually merge the target ref into %s in '
- 'each case, and then merge the system branch.' %
+ 'each case in the %s system branch, and then repeat the '
+ 'system branch merge.' %
('repository' if len(failed_repos)==1 else
'repositories',
- '\n\t'.join(failed_repos), from_branch))
+ '\n\t'.join(failed_repos), from_branch, from_branch))
for repo_dir in dirty_repo_dirs:
# Repo will often turn out to not be dirty: if the changes we
diff --git a/tests.branching/merge-conflict-chunks.stderr
b/tests.branching/merge-conflict-chunks.stderr
index 0bdc947..9692d2e 100644
--- a/tests.branching/merge-conflict-chunks.stderr
+++ b/tests.branching/merge-conflict-chunks.stderr
@@ -3,4 +3,4 @@ ERROR: merge errors were encountered in the following repositories:
baserock:stratum2-hello
baserock:stratum3-hello
-Please manually merge the target ref into test/feature in each case, and then merge the
system branch.
+Please manually merge the target ref into test/feature in each case in the test/feature
system branch, and then repeat the system branch merge.
diff --git a/tests.branching/merge-conflict-stratum.stderr
b/tests.branching/merge-conflict-stratum.stderr
index 36781ad..3a7c152 100644
--- a/tests.branching/merge-conflict-stratum.stderr
+++ b/tests.branching/merge-conflict-stratum.stderr
@@ -1 +1 @@
-ERROR: Merging failed in baserock:morphs: please manually merge test/stable into
test/feature in this repo and try again.
+ERROR: Merging failed in baserock:morphs: please 'git merge' the latest
test/stable into test/feature in the 'test/feature' system branch.
--
1.7.10.4
8:14 p.m.
New subject: [PATCH 3/3] morph merge: Set status on success
We print a bunch of stuff if conflicts are encountered, so we should make
it clear at the end whether ultimately they were all resolvable or not.
---
morphlib/plugins/branch_and_merge_plugin.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/morphlib/plugins/branch_and_merge_plugin.py
b/morphlib/plugins/branch_and_merge_plugin.py
index 468695d..30f02fd 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -868,6 +868,8 @@ class BranchAndMergePlugin(cliapp.Plugin):
msg = "Merge system branch '%s'" % from_branch
self.app.runcmd(['git', 'commit', '--all',
'-m%s' % msg],
cwd=repo_dir)
+
+ self.app.status(msg="Merge successful")
except:
for repo_dir in dirty_repo_dirs:
self.reset_work_tree_safe(repo_dir)
--
1.7.10.4
4:27 p.m.
On Thu, Sep 27, 2012 at 07:14:19PM +0100, Sam Thursfield wrote:
Repository: git://git.baserock.org/baserock/morph
Branch: samthursfield/merge-misc-1
Sha1: 12abc0e760f7cf8905a72bd6b5d1d566889e022d
These look fine and have been merged as part of your other branch.
D.
--
Daniel Silverstone http://www.codethink.co.uk/
Senior Developer GPG 4096/R Key Id: 3CCE BABE 206C 3B69
4088
days inactive
4089
days old
4 comments
2 participants
participants (2)
-
Daniel Silverstone -
Sam Thursfield