c195b69c6b
Switch rebase editor class to exec rebase so that it takes over the console to allow the user to continue/skip/abort as they would normally. Update the instruction set for rebase to re-call git-upstream as a final step for user convenience to finish the import. When the EDITOR or GIT_EDITOR is defined to change what editor is used to edit the sequence of instructions to git-rebase, git will recall the same editor in those variables if one of the instructions is 'reword', 'edit', or 'squash' in order to amend the commit message. Change the rebaseeditor script to be able to handle being called with a COMMIT_EDITMSG file when this occurs. This allows the 'edit', 'reword', 'squash' & 'fixup' commands to git rebase to function as expected by the user irrespective of whether a conflict has been encountered first or not. Still results in git rebase outputting additional information after the import has completed, but avoids the main issue of the interactive mode being unusable due to ignoring the result of the git-rebase call unless it exits with an error, which only occurs for conflicts. Change-Id: Ic125c85b868d816ef13fac6f503092ac3142b4de Closes-Bug: #1402032
155 lines
6.3 KiB
Python
155 lines
6.3 KiB
Python
# Copyright (c) 2012, 2013, 2014 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
"""Tests for the 'import' command"""
|
|
|
|
import inspect
|
|
import os
|
|
|
|
import mock
|
|
from testscenarios import TestWithScenarios
|
|
from testtools.content import text_content
|
|
from testtools.matchers import Contains
|
|
from testtools.matchers import Equals
|
|
|
|
from git_upstream.lib.pygitcompat import Commit
|
|
from git_upstream import main
|
|
from git_upstream.tests.base import BaseTestCase
|
|
from git_upstream.tests.base import get_scenarios
|
|
|
|
|
|
@mock.patch.dict('os.environ',
|
|
{'TEST_GIT_UPSTREAM_REBASE_EDITOR': '1'})
|
|
class TestImportCommand(TestWithScenarios, BaseTestCase):
|
|
|
|
commands, parser = main.build_parsers()
|
|
scenarios = get_scenarios(os.path.join(os.path.dirname(__file__),
|
|
"scenarios"))
|
|
|
|
def setUp(self):
|
|
# add description in case parent setup fails.
|
|
self.addDetail('description', text_content(self.desc))
|
|
|
|
# builds the tree to be tested
|
|
super(TestImportCommand, self).setUp()
|
|
|
|
def test_command(self):
|
|
upstream_branch = self.branches['upstream'][0]
|
|
target_branch = self.branches['head'][0]
|
|
|
|
self.git.tag(inspect.currentframe().f_code.co_name, upstream_branch)
|
|
args = self.parser.parse_args(self.parser_args)
|
|
self.assertThat(args.cmd.run(args), Equals(True),
|
|
"import command failed to complete successfully")
|
|
|
|
expected = getattr(self, 'expect_found', None)
|
|
# even if empty want to confirm that find no changes applied,
|
|
# otherwise confirm we find the expected number of changes.
|
|
if expected is not None:
|
|
if len(list(Commit.new(self.repo, target_branch).parents)) > 1:
|
|
changes = list(Commit.iter_items(
|
|
self.repo, '%s..%s^2' % (upstream_branch, target_branch),
|
|
topo_order=True))
|
|
else:
|
|
# allow checking that nothing was rebased
|
|
changes = []
|
|
self.assertThat(
|
|
len(changes), Equals(len(expected)),
|
|
"should only have seen %s changes, got: %s" %
|
|
(len(expected),
|
|
", ".join(["%s:%s" % (commit.hexsha,
|
|
commit.message.splitlines()[0])
|
|
for commit in changes])))
|
|
|
|
# expected should be listed in order from oldest to newest, so
|
|
# reverse changes to match as it would be newest to oldest.
|
|
changes.reverse()
|
|
for commit, node in zip(changes, expected):
|
|
if node == "MERGE":
|
|
continue
|
|
subject = commit.message.splitlines()[0]
|
|
node_subject = self.gittree.graph[node].message.splitlines()[0]
|
|
self.assertThat(subject, Equals(node_subject),
|
|
"subject '%s' of commit '%s' does not match "
|
|
"subject '%s' of node '%s'" % (
|
|
subject, commit.hexsha, node_subject,
|
|
node))
|
|
|
|
# allow disabling of checking the merge commit contents
|
|
# as some tests won't result in an import
|
|
if getattr(self, 'check_merge', True):
|
|
commit_message = self.git.log(target_branch, n=1)
|
|
self.assertThat(commit_message,
|
|
Contains("of '%s' into '%s'" % (upstream_branch,
|
|
target_branch)))
|
|
|
|
# allow additional test specific verification methods below
|
|
extra_test_func = getattr(self, '_verify_%s' % self.name, None)
|
|
if extra_test_func:
|
|
extra_test_func()
|
|
|
|
def _verify_basic(self):
|
|
|
|
self.assertThat(self.git.log(n=1), Contains("Merge branch 'import/"))
|
|
|
|
def _verify_basic_additional_missed(self):
|
|
"""Additional verification that test produces a warning"""
|
|
|
|
self.assertThat(self.logger.output,
|
|
Contains("Previous import merged additional"))
|
|
|
|
def _verify_import_finish(self):
|
|
"""Additional verification for the finished results"""
|
|
|
|
self.assertThat(self.repo.git.rev_parse('master^{tree}'),
|
|
Equals(self.repo.git.rev_parse('import/F^{tree}')),
|
|
"--finish option failed to merge correctly")
|
|
commit = self.git.rev_list('master', parents=True, max_count=1).split()
|
|
parents = commit[1:]
|
|
self.assertThat(parents, Equals([self.gittree.graph['D'].hexsha,
|
|
self.gittree.graph['D1'].hexsha]),
|
|
"import --finish merge does contain the correct "
|
|
"parents")
|
|
|
|
def _verify_import_same_as_previous_upstream(self):
|
|
"""Additional verification for the finished results"""
|
|
self.assertThat(
|
|
self.logger.output,
|
|
Contains("already at latest upstream commit"))
|
|
self.assertThat(
|
|
self.logger.output,
|
|
Contains("Nothing to be imported"))
|
|
|
|
def _verify_same_previous_with_same_additional(self):
|
|
"""Additional verification for the finished results"""
|
|
|
|
self.assertThat(
|
|
self.logger.output,
|
|
Contains("already at latest upstream commit"))
|
|
self.assertThat(
|
|
self.logger.output,
|
|
Contains("No updated additional branch given, nothing to be done"))
|
|
|
|
def _verify_import_everything_already_upstreamed(self):
|
|
"""Additional verification for the finished results"""
|
|
|
|
self.assertThat(
|
|
self.logger.output,
|
|
Contains("All carried changes gone upstream"))
|
|
self.assertThat(
|
|
self.logger.output,
|
|
Contains("Creating branch 'import/test_command' from specified "
|
|
"commit 'upstream/master'"))
|