| Index: tests/git_cl_test.py
|
| ===================================================================
|
| --- tests/git_cl_test.py (revision 250376)
|
| +++ tests/git_cl_test.py (working copy)
|
| @@ -204,6 +204,7 @@
|
| ((['git',
|
| 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
|
| (('', None), 0)),
|
| + ((['git', 'rev-parse', '--show-cdup'],), ''),
|
| ((['git', 'svn', 'info'],), ''),
|
| ((['git',
|
| 'config', 'branch.master.rietveldissue', '1'],), ''),
|
| @@ -318,8 +319,8 @@
|
| ]
|
|
|
| @classmethod
|
| - def _dcommit_calls_3(cls, is_first_call):
|
| - calls = [
|
| + def _dcommit_calls_3(cls):
|
| + return [
|
| ((['git',
|
| 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
|
| '-l100000', '-C50', 'fake_ancestor_sha',
|
| @@ -333,12 +334,7 @@
|
| ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
|
| ((['git', 'show-ref', '--quiet', '--verify',
|
| 'refs/heads/git-cl-cherry-pick'],), ''),
|
| - ]
|
| - if is_first_call:
|
| - calls += [
|
| - ((['git', 'rev-parse', '--show-cdup'],), '\n'),
|
| - ]
|
| - calls += [
|
| + ((['git', 'rev-parse', '--show-cdup'],), '\n'),
|
| ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
|
| ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
|
| ((['git', 'commit', '-m',
|
| @@ -350,8 +346,7 @@
|
| (('', None), 0)),
|
| ((['git', 'checkout', '-q', 'working'],), ''),
|
| ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
|
| - ]
|
| - return calls
|
| + ]
|
|
|
| @staticmethod
|
| def _cmd_line(description, args, similarity, find_copies, private):
|
| @@ -514,14 +509,14 @@
|
| self._dcommit_calls_1() +
|
| self._git_sanity_checks('fake_ancestor_sha', 'working') +
|
| self._dcommit_calls_normal() +
|
| - self._dcommit_calls_3(False))
|
| + self._dcommit_calls_3())
|
| git_cl.main(['dcommit'])
|
|
|
| def test_dcommit_bypass_hooks(self):
|
| self.calls = (
|
| self._dcommit_calls_1() +
|
| self._dcommit_calls_bypassed() +
|
| - self._dcommit_calls_3(True))
|
| + self._dcommit_calls_3())
|
| git_cl.main(['dcommit', '--bypass-hooks'])
|
|
|
|
|
|
|