def setUp(self):
if not is_exe_in_path('git'):
raise nose.SkipTest('git not found in path')
self.orig_dir = os.getcwd()
self.git_dir = _get_tmpdir()
os.chdir(self.git_dir)
self._gitcmd(['init'], git_dir=self.git_dir)
foo = open(os.path.join(self.git_dir, 'foo.txt'), 'w')
foo.write(FOO)
foo.close()
self._gitcmd(['add', 'foo.txt'])
self._gitcmd(['commit', '-m', 'initial commit'])
self.clone_dir = _get_tmpdir()
os.rmdir(self.clone_dir)
self._gitcmd(['clone', self.git_dir, self.clone_dir])
self.client = GitClient(options=postreview.options)
os.chdir(self.orig_dir)
postreview.user_config = {}
postreview.configs = []
self.client.user_config = postreview.user_config
self.client.configs = postreview.configs
postreview.options.parent_branch = None
def setUp(self):
super(GitClientTests, self).setUp()
if not self.is_exe_in_path('git'):
raise SkipTest('git not found in path')
self.git_dir = self.chdir_tmp()
self._gitcmd(['init'], git_dir=self.git_dir)
foo = open(os.path.join(self.git_dir, 'foo.txt'), 'w')
foo.write(FOO)
foo.close()
self._gitcmd(['add', 'foo.txt'])
self._gitcmd(['commit', '-m', 'initial commit'])
self.clone_dir = self.chdir_tmp(self.git_dir)
self._gitcmd(['clone', self.git_dir, self.clone_dir])
self.client = GitClient(options=self.options)
self.user_config = {}
self.configs = []
self.client.user_config = self.user_config
self.client.configs = self.configs
self.options.parent_branch = None
def load_scmclients(options):
global SCMCLIENTS
from rbtools.clients.clearcase import ClearCaseClient
from rbtools.clients.cvs import CVSClient
from rbtools.clients.git import GitClient
from rbtools.clients.mercurial import MercurialClient
from rbtools.clients.perforce import PerforceClient
from rbtools.clients.plastic import PlasticClient
from rbtools.clients.svn import SVNClient
SCMCLIENTS = [
CVSClient(options=options),
ClearCaseClient(options=options),
GitClient(options=options),
MercurialClient(options=options),
PerforceClient(options=options),
PlasticClient(options=options),
SVNClient(options=options),
]
def setUp(self):
super(GitClientTests, self).setUp()
if not self.is_exe_in_path('git'):
raise SkipTest('git not found in path')
self.git_dir = self.chdir_tmp()
self._gitcmd(['init'], git_dir=self.git_dir)
foo = open(os.path.join(self.git_dir, 'foo.txt'), 'w')
foo.write(FOO)
foo.close()
self._gitcmd(['add', 'foo.txt'])
self._gitcmd(['commit', '-m', 'initial commit'])
self.clone_dir = self.chdir_tmp(self.git_dir)
self._gitcmd(['clone', self.git_dir, self.clone_dir])
self.client = GitClient(options=self.options)
self.user_config = {}
self.configs = []
self.client.user_config = self.user_config
self.client.configs = self.configs
self.options.parent_branch = None
class GitClientTests(unittest.TestCase):
TESTSERVER = "http://127.0.0.1:8080"
def _gitcmd(self, command, env=None, split_lines=False,
ignore_errors=False, extra_ignore_errors=(),
translate_newlines=True, git_dir=None):
if git_dir:
full_command = ['git', '--git-dir=%s/.git' % git_dir]
else:
full_command = ['git']
full_command.extend(command)
return execute(full_command, env, split_lines, ignore_errors,
extra_ignore_errors, translate_newlines)
def _git_add_file_commit(self, file, data, msg):
"""Add a file to a git repository with the content of data
and commit with msg.
"""
foo = open(file, 'w')
foo.write(data)
foo.close()
self._gitcmd(['add', file])
self._gitcmd(['commit', '-m', msg])
def setUp(self):
if not is_exe_in_path('git'):
raise nose.SkipTest('git not found in path')
self.orig_dir = os.getcwd()
self.git_dir = _get_tmpdir()
os.chdir(self.git_dir)
self._gitcmd(['init'], git_dir=self.git_dir)
foo = open(os.path.join(self.git_dir, 'foo.txt'), 'w')
foo.write(FOO)
foo.close()
self._gitcmd(['add', 'foo.txt'])
self._gitcmd(['commit', '-m', 'initial commit'])
self.clone_dir = _get_tmpdir()
os.rmdir(self.clone_dir)
self._gitcmd(['clone', self.git_dir, self.clone_dir])
self.client = GitClient(options=postreview.options)
os.chdir(self.orig_dir)
postreview.user_config = {}
postreview.configs = []
self.client.user_config = postreview.user_config
self.client.configs = postreview.configs
postreview.options.parent_branch = None
def tearDown(self):
os.chdir(self.orig_dir)
shutil.rmtree(self.git_dir)
shutil.rmtree(self.clone_dir)
def test_get_repository_info_simple(self):
"""Test GitClient get_repository_info, simple case"""
os.chdir(self.clone_dir)
ri = self.client.get_repository_info()
self.assert_(isinstance(ri, RepositoryInfo))
self.assertEqual(ri.base_path, '')
self.assertEqual(ri.path.rstrip("/.git"), self.git_dir)
self.assertTrue(ri.supports_parent_diffs)
self.assertFalse(ri.supports_changesets)
def test_scan_for_server_simple(self):
"""Test GitClient scan_for_server, simple case"""
os.chdir(self.clone_dir)
ri = self.client.get_repository_info()
server = self.client.scan_for_server(ri)
self.assert_(server is None)
def test_scan_for_server_reviewboardrc(self):
"Test GitClient scan_for_server, .reviewboardrc case"""
os.chdir(self.clone_dir)
rc = open(os.path.join(self.clone_dir, '.reviewboardrc'), 'w')
rc.write('REVIEWBOARD_URL = "%s"' % self.TESTSERVER)
rc.close()
self.client.user_config = load_config_files(self.clone_dir)
ri = self.client.get_repository_info()
server = self.client.scan_for_server(ri)
self.assertEqual(server, self.TESTSERVER)
def test_scan_for_server_property(self):
"""Test GitClient scan_for_server using repo property"""
os.chdir(self.clone_dir)
self._gitcmd(['config', 'reviewboard.url', self.TESTSERVER])
ri = self.client.get_repository_info()
self.assertEqual(self.client.scan_for_server(ri), self.TESTSERVER)
def test_diff_simple(self):
"""Test GitClient simple diff case"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..5e98e9540e1b741b5be24fcb33c40c1c8069c1fb 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -6,7 +6,4 @@ multa quoque et bello passus, dum conderet urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
os.chdir(self.clone_dir)
self.client.get_repository_info()
self._git_add_file_commit('foo.txt', FOO1, 'delete and modify stuff')
self.assertEqual(self.client.diff(None), (diff, None))
def test_diff_simple_multiple(self):
"""Test GitClient simple diff with multiple commits case"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..63036ed3fcafe870d567a14dd5884f4fed70126c 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -1,12 +1,11 @@\n" \
" ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
" Italiam, fato profugus, Laviniaque venit\n" \
" litora, multum ille et terris iactatus et alto\n" \
" vi superum saevae memorem Iunonis ob iram;\n" \
"-multa quoque et bello passus, dum conderet urbem,\n" \
"+dum conderet urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
"+Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
os.chdir(self.clone_dir)
self.client.get_repository_info()
self._git_add_file_commit('foo.txt', FOO1, 'commit 1')
self._git_add_file_commit('foo.txt', FOO2, 'commit 1')
self._git_add_file_commit('foo.txt', FOO3, 'commit 1')
self.assertEqual(self.client.diff(None), (diff, None))
def test_diff_branch_diverge(self):
"""Test GitClient diff with divergent branches"""
diff1 = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..e619c1387f5feb91f0ca83194650bfe4f6c2e347 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -1,4 +1,6 @@\n" \
" ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
" Italiam, fato profugus, Laviniaque venit\n" \
" litora, multum ille et terris iactatus et alto\n" \
" vi superum saevae memorem Iunonis ob iram;\n" \
"@@ -6,7 +8,4 @@ multa quoque et bello passus, dum conderet urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
diff2 = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..5e98e9540e1b741b5be24fcb33c40c1c8069c1fb 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -6,7 +6,4 @@ multa quoque et bello passus, dum conderet urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
os.chdir(self.clone_dir)
self._git_add_file_commit('foo.txt', FOO1, 'commit 1')
self._gitcmd(['checkout', '-b', 'mybranch', '--track', 'origin/master'])
self._git_add_file_commit('foo.txt', FOO2, 'commit 2')
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff1, None))
self._gitcmd(['checkout', 'master'])
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff2, None))
def test_diff_tracking_no_origin(self):
"""Test GitClient diff with a tracking branch, but no origin remote"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..5e98e9540e1b741b5be24fcb33c40c1c8069c1fb 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -6,7 +6,4 @@ multa quoque et bello passus, dum conderet urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
os.chdir(self.clone_dir)
self._gitcmd(['remote', 'add', 'quux', self.git_dir])
self._gitcmd(['fetch', 'quux'])
self._gitcmd(['checkout', '-b', 'mybranch', '--track', 'quux/master'])
self._git_add_file_commit('foo.txt', FOO1, 'delete and modify stuff')
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff, None))
def test_diff_local_tracking(self):
"""Test GitClient diff with a local tracking branch"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..e619c1387f5feb91f0ca83194650bfe4f6c2e347 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -1,4 +1,6 @@\n" \
" ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
" Italiam, fato profugus, Laviniaque venit\n" \
" litora, multum ille et terris iactatus et alto\n" \
" vi superum saevae memorem Iunonis ob iram;\n" \
"@@ -6,7 +8,4 @@ multa quoque et bello passus, dum conderet urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
os.chdir(self.clone_dir)
self._git_add_file_commit('foo.txt', FOO1, 'commit 1')
self._gitcmd(['checkout', '-b', 'mybranch', '--track', 'master'])
self._git_add_file_commit('foo.txt', FOO2, 'commit 2')
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff, None))
def test_diff_tracking_override(self):
"""Test GitClient diff with option override for tracking branch"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..5e98e9540e1b741b5be24fcb33c40c1c8069c1fb 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -6,7 +6,4 @@ multa quoque et bello passus, dum conderet urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
os.chdir(self.clone_dir)
postreview.options.tracking = 'origin/master'
self._gitcmd(['remote', 'add', 'bad', self.git_dir])
self._gitcmd(['fetch', 'bad'])
self._gitcmd(['checkout', '-b', 'mybranch', '--track', 'bad/master'])
self._git_add_file_commit('foo.txt', FOO1, 'commit 1')
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff, None))
def test_diff_slash_tracking(self):
"""Test GitClient diff with tracking branch that has slash in its name"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 5e98e9540e1b741b5be24fcb33c40c1c8069c1fb..e619c1387f5feb91f0ca83194650bfe4f6c2e347 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -1,4 +1,6 @@\n" \
" ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
" Italiam, fato profugus, Laviniaque venit\n" \
" litora, multum ille et terris iactatus et alto\n" \
" vi superum saevae memorem Iunonis ob iram;\n"
os.chdir(self.git_dir)
self._gitcmd(['checkout', '-b', 'not-master'])
self._git_add_file_commit('foo.txt', FOO1, 'commit 1')
os.chdir(self.clone_dir)
self._gitcmd(['fetch', 'origin'])
self._gitcmd(['checkout', '-b', 'my/branch', '--track', 'origin/not-master'])
self._git_add_file_commit('foo.txt', FOO2, 'commit 2')
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff, None))
def __init__(self, root):
tool = GitClient()
tool.get_repository_info()
super(GitDiffer, self).__init__(tool)
class GitClientTests(SCMClientTests):
TESTSERVER = "http://127.0.0.1:8080"
def _gitcmd(self, command, env=None, split_lines=False,
ignore_errors=False, extra_ignore_errors=(),
translate_newlines=True, git_dir=None):
if git_dir:
full_command = ['git', '--git-dir=%s/.git' % git_dir]
else:
full_command = ['git']
full_command.extend(command)
return execute(full_command, env, split_lines, ignore_errors,
extra_ignore_errors, translate_newlines)
def _git_add_file_commit(self, file, data, msg):
"""Add a file to a git repository with the content of data
and commit with msg.
"""
foo = open(file, 'w')
foo.write(data)
foo.close()
self._gitcmd(['add', file])
self._gitcmd(['commit', '-m', msg])
def setUp(self):
super(GitClientTests, self).setUp()
if not self.is_exe_in_path('git'):
raise SkipTest('git not found in path')
self.git_dir = self.chdir_tmp()
self._gitcmd(['init'], git_dir=self.git_dir)
foo = open(os.path.join(self.git_dir, 'foo.txt'), 'w')
foo.write(FOO)
foo.close()
self._gitcmd(['add', 'foo.txt'])
self._gitcmd(['commit', '-m', 'initial commit'])
self.clone_dir = self.chdir_tmp(self.git_dir)
self._gitcmd(['clone', self.git_dir, self.clone_dir])
self.client = GitClient(options=self.options)
self.user_config = {}
self.configs = []
self.client.user_config = self.user_config
self.client.configs = self.configs
self.options.parent_branch = None
def test_get_repository_info_simple(self):
"""Test GitClient get_repository_info, simple case"""
ri = self.client.get_repository_info()
self.assert_(isinstance(ri, RepositoryInfo))
self.assertEqual(ri.base_path, '')
self.assertEqual(ri.path.rstrip("/.git"), self.git_dir)
self.assertTrue(ri.supports_parent_diffs)
self.assertFalse(ri.supports_changesets)
def test_scan_for_server_simple(self):
"""Test GitClient scan_for_server, simple case"""
ri = self.client.get_repository_info()
server = self.client.scan_for_server(ri)
self.assert_(server is None)
def test_scan_for_server_reviewboardrc(self):
"Test GitClient scan_for_server, .reviewboardrc case"""
rc = open(os.path.join(self.clone_dir, '.reviewboardrc'), 'w')
rc.write('REVIEWBOARD_URL = "%s"' % self.TESTSERVER)
rc.close()
self.client.user_config, configs = load_config_files(self.clone_dir)
ri = self.client.get_repository_info()
server = self.client.scan_for_server(ri)
self.assertEqual(server, self.TESTSERVER)
def test_scan_for_server_property(self):
"""Test GitClient scan_for_server using repo property"""
self._gitcmd(['config', 'reviewboard.url', self.TESTSERVER])
ri = self.client.get_repository_info()
self.assertEqual(self.client.scan_for_server(ri), self.TESTSERVER)
def test_diff_simple(self):
"""Test GitClient simple diff case"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..5e98e9540e1" \
"b741b5be24fcb33c40c1c8069c1fb 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -6,7 +6,4 @@ multa quoque et bello passus, dum conderet u" \
"rbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
self.client.get_repository_info()
self._git_add_file_commit('foo.txt', FOO1, 'delete and modify stuff')
self.assertEqual(self.client.diff(None), (diff, None))
def test_diff_simple_multiple(self):
"""Test GitClient simple diff with multiple commits case"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..63036ed3fca" \
"fe870d567a14dd5884f4fed70126c 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -1,12 +1,11 @@\n" \
" ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
" Italiam, fato profugus, Laviniaque venit\n" \
" litora, multum ille et terris iactatus et alto\n" \
" vi superum saevae memorem Iunonis ob iram;\n" \
"-multa quoque et bello passus, dum conderet urbem,\n" \
"+dum conderet urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
"+Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
self.client.get_repository_info()
self._git_add_file_commit('foo.txt', FOO1, 'commit 1')
self._git_add_file_commit('foo.txt', FOO2, 'commit 1')
self._git_add_file_commit('foo.txt', FOO3, 'commit 1')
self.assertEqual(self.client.diff(None), (diff, None))
def test_diff_branch_diverge(self):
"""Test GitClient diff with divergent branches"""
diff1 = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..e619c1387f" \
"5feb91f0ca83194650bfe4f6c2e347 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -1,4 +1,6 @@\n" \
" ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
" Italiam, fato profugus, Laviniaque venit\n" \
" litora, multum ille et terris iactatus et alto\n" \
" vi superum saevae memorem Iunonis ob iram;\n" \
"@@ -6,7 +8,4 @@ multa quoque et bello passus, dum conderet " \
"urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
diff2 = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..5e98e9540e1" \
"b741b5be24fcb33c40c1c8069c1fb 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -6,7 +6,4 @@ multa quoque et bello passus, dum conderet "\
"urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
self._git_add_file_commit('foo.txt', FOO1, 'commit 1')
self._gitcmd(['checkout', '-b', 'mybranch', '--track',
'origin/master'])
self._git_add_file_commit('foo.txt', FOO2, 'commit 2')
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff1, None))
self._gitcmd(['checkout', 'master'])
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff2, None))
def test_diff_tracking_no_origin(self):
"""Test GitClient diff with a tracking branch, but no origin remote"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..5e98e9540e1b" \
"741b5be24fcb33c40c1c8069c1fb 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -6,7 +6,4 @@ multa quoque et bello passus, dum conderet " \
"urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
self._gitcmd(['remote', 'add', 'quux', self.git_dir])
self._gitcmd(['fetch', 'quux'])
self._gitcmd(['checkout', '-b', 'mybranch', '--track', 'quux/master'])
self._git_add_file_commit('foo.txt', FOO1, 'delete and modify stuff')
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff, None))
def test_diff_local_tracking(self):
"""Test GitClient diff with a local tracking branch"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..e619c1387f5" \
"feb91f0ca83194650bfe4f6c2e347 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -1,4 +1,6 @@\n" \
" ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
" Italiam, fato profugus, Laviniaque venit\n" \
" litora, multum ille et terris iactatus et alto\n" \
" vi superum saevae memorem Iunonis ob iram;\n" \
"@@ -6,7 +8,4 @@ multa quoque et bello passus, dum conderet " \
"urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
self._git_add_file_commit('foo.txt', FOO1, 'commit 1')
self._gitcmd(['checkout', '-b', 'mybranch', '--track', 'master'])
self._git_add_file_commit('foo.txt', FOO2, 'commit 2')
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff, None))
def test_diff_tracking_override(self):
"""Test GitClient diff with option override for tracking branch"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 634b3e8ff85bada6f928841a9f2c505560840b3a..5e98e9540e1" \
"b741b5be24fcb33c40c1c8069c1fb 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -6,7 +6,4 @@ multa quoque et bello passus, dum conderet " \
"urbem,\n" \
" inferretque deos Latio, genus unde Latinum,\n" \
" Albanique patres, atque altae moenia Romae.\n" \
" Musa, mihi causas memora, quo numine laeso,\n" \
"-quidve dolens, regina deum tot volvere casus\n" \
"-insignem pietate virum, tot adire labores\n" \
"-impulerit. Tantaene animis caelestibus irae?\n" \
" \n"
self.options.tracking = 'origin/master'
self._gitcmd(['remote', 'add', 'bad', self.git_dir])
self._gitcmd(['fetch', 'bad'])
self._gitcmd(['checkout', '-b', 'mybranch', '--track', 'bad/master'])
self._git_add_file_commit('foo.txt', FOO1, 'commit 1')
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff, None))
def test_diff_slash_tracking(self):
"""
Test GitClient diff with tracking branch that has slash in its name.
"""
diff = "diff --git a/foo.txt b/foo.txt\n" \
"index 5e98e9540e1b741b5be24fcb33c40c1c8069c1fb..e619c1387f5f" \
"eb91f0ca83194650bfe4f6c2e347 100644\n" \
"--- a/foo.txt\n" \
"+++ b/foo.txt\n" \
"@@ -1,4 +1,6 @@\n" \
" ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
"+ARMA virumque cano, Troiae qui primus ab oris\n" \
" Italiam, fato profugus, Laviniaque venit\n" \
" litora, multum ille et terris iactatus et alto\n" \
" vi superum saevae memorem Iunonis ob iram;\n"
os.chdir(self.git_dir)
self._gitcmd(['checkout', '-b', 'not-master'])
self._git_add_file_commit('foo.txt', FOO1, 'commit 1')
os.chdir(self.clone_dir)
self._gitcmd(['fetch', 'origin'])
self._gitcmd(['checkout', '-b', 'my/branch', '--track',
'origin/not-master'])
self._git_add_file_commit('foo.txt', FOO2, 'commit 2')
self.client.get_repository_info()
self.assertEqual(self.client.diff(None), (diff, None))
