opendev/git-restack
Code Issues Proposed changes

Merge "Improve windows support for git-review --setup"

Browse Source
This commit is contained in:
Jenkins
2014-08-05 13:17:47 +00:00
committed by Gerrit Code Review
parent 549d54afe1 8f50043a24
commit 499a2f3dbc
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git_review/cmd.py
View File

@@ -274,7 +274,9 @@ def set_hooks_commit_msg(remote, target_file):
userhost = hostname userhost = hostname
else: else:
userhost = "%s@%s" % (username, hostname) userhost = "%s@%s" % (username, hostname)
cmd = ["scp", userhost + ":hooks/commit-msg", target_file] # OS independent target file
scp_target_file = target_file.replace(os.sep, "/")
cmd = ["scp", userhost + ":hooks/commit-msg", scp_target_file]
if port is not None: if port is not None:
cmd.insert(1, "-P%s" % port) cmd.insert(1, "-P%s" % port)

4
git_review/tests/__init__.py
View File

@@ -122,8 +122,8 @@ class GerritHelpers(object):
def _run_git_review(self, *args, **kwargs): def _run_git_review(self, *args, **kwargs):
"""Run git-review utility from source.""" """Run git-review utility from source."""
git_review = utils.run_cmd('which', 'git-review') git_review = utils.run_cmd('which', 'git-review')
return utils.run_cmd(git_review, *args, kwargs.setdefault('chdir', self.test_dir)
chdir=self.test_dir, **kwargs) return utils.run_cmd(git_review, *args, **kwargs)
class BaseGitReviewTestCase(testtools.TestCase, GerritHelpers): class BaseGitReviewTestCase(testtools.TestCase, GerritHelpers):

8
git_review/tests/test_git_review.py
View File

@@ -19,6 +19,7 @@ import os
import shutil import shutil
from git_review import tests from git_review import tests
from git_review.tests import utils
class GitReviewTestCase(tests.BaseGitReviewTestCase): class GitReviewTestCase(tests.BaseGitReviewTestCase):
@@ -59,6 +60,13 @@ class GitReviewTestCase(tests.BaseGitReviewTestCase):
self._simple_change('test file modified', 'test commit message 2') self._simple_change('test file modified', 'test commit message 2')
self.assertIn('Change-Id:', self._run_git('log', '-1')) self.assertIn('Change-Id:', self._run_git('log', '-1'))
def test_git_review_s_from_subdirectory(self):
"""Test git-review -s from subdirectory."""
self._run_git('remote', 'rm', 'gerrit')
utils.run_cmd('mkdir', 'subdirectory', chdir=self.test_dir)
self._run_git_review(
'-s', chdir=os.path.join(self.test_dir, 'subdirectory'))
def test_git_review_d(self): def test_git_review_d(self):
"""Test git-review -d.""" """Test git-review -d."""
self._run_git_review('-s') self._run_git_review('-s')