Add test for git-svn with submodule/merge layout.

Add test for git-svn with submodule/merge layout.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=142479

[szager1, 2012-06-13 23:30:45]

Uploaded a few times; should be stable now.

[M-A Ruel, 2012-06-14 17:11:05]

https://chromiumcodereview.appspot.com/10543151/diff/9001/git_cl.py
File git_cl.py (right):

https://chromiumcodereview.appspot.com/10543151/diff/9001/git_cl.py#newcode1148
git_cl.py:1148: cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' %
ref]
maybe use '--grep', pattern, ?

Especially on Windows, ^ is a special character.

[cmp, 2012-06-14 17:50:26]

https://chromiumcodereview.appspot.com/10543151/diff/9001/git_cl.py
File git_cl.py (right):

https://chromiumcodereview.appspot.com/10543151/diff/9001/git_cl.py#newcode1148
git_cl.py:1148: cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' %
ref]
On 2012/06/14 17:11:05, Marc-Antoine Ruel wrote:
> maybe use '--grep', pattern, ?
> 
> Especially on Windows, ^ is a special character.

Agree about not using ^ to avoid craziness on Windows.

https://chromiumcodereview.appspot.com/10543151/diff/9001/tests/submodule-mer...
File tests/submodule-merge-test.sh (right):

https://chromiumcodereview.appspot.com/10543151/diff/9001/tests/submodule-mer...
tests/submodule-merge-test.sh:1: #!/bin/bash
nit: needs a copyright header

[szager1, 2012-06-15 00:55:32]

https://chromiumcodereview.appspot.com/10543151/diff/9001/git_cl.py
File git_cl.py (right):

https://chromiumcodereview.appspot.com/10543151/diff/9001/git_cl.py#newcode1148
git_cl.py:1148: cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' %
ref]
On 2012/06/14 17:50:26, cmp wrote:
> On 2012/06/14 17:11:05, Marc-Antoine Ruel wrote:
> > maybe use '--grep', pattern, ?
> > 
> > Especially on Windows, ^ is a special character.
> 
> Agree about not using ^ to avoid craziness on Windows.

I did try this out on Windows, and it works fine for me.  As I understand it, ^
takes the magic off of special characters when giving commands to the command
interpreter.  However, since the command isn't being run in a sub-shell, the
command interpreter never gets to mess with it.

I experimented with various combinations of (^,!,@,*,$), and everything worked
for me, on Windows and Linux.

It's going to be hard to write the rev specs for git without using ^ at all.

https://chromiumcodereview.appspot.com/10543151/diff/9001/tests/submodule-mer...
File tests/submodule-merge-test.sh (right):

https://chromiumcodereview.appspot.com/10543151/diff/9001/tests/submodule-mer...
tests/submodule-merge-test.sh:1: #!/bin/bash
On 2012/06/14 17:50:26, cmp wrote:
> nit: needs a copyright header

Be careful what you ask for...

[szager1, 2012-06-15 17:36:00]

Ping... I'll need to land this before re-enabling the git submodule merge flow,
which I'm hoping to do this afternoon.

Thanks,

Stefan

[M-A Ruel, 2012-06-15 18:26:58]

lgtm, just warning of potential unforeseen side-effects could be possible. Note
that my previous CL was not escaping ^, and I forgot why I didn't need to. I
only recall I mostly went empirically with trial and error... :(

https://chromiumcodereview.appspot.com/10543151/diff/11020/git_cl.py
File git_cl.py (right):

https://chromiumcodereview.appspot.com/10543151/diff/11020/git_cl.py#newcode1149
git_cl.py:1149: return RunGit(cmd, shell=False) != ''
Interesting, I sent a CL recently related to that, that Chase reviewed, and it
caused issues for some Windows users that I failed to reproduce. I didn't take
the time to debug so I just reverted.

https://chromiumcodereview.appspot.com/10447021

[szager, 2012-06-15 20:04:55]

On Fri, Jun 15, 2012 at 11:26 AM,  <maruel@chromium.org> wrote:
> lgtm, just warning of potential unforeseen side-effects could be possible.
> Note
> that my previous CL was not escaping ^, and I forgot why I didn't need to. I
> only recall I mostly went empirically with trial and error... :(

I appreciate the words of caution.  I did do some empirical trials my
self, and I discovered that this comment, in subprocess2.py, is
inaccurate:

     # *Sigh*:  Windows needs shell=True, or else it won't search %PATH% for
      # the executable, but shell=True makes subprocess on Linux fail when it's
      # called with a list because it only tries to execute the first item in
      # the list.

In fact, with shell=False, Windows *will* search %PATH%; but it will
search %PATH% as it was when the python process started up.  It will
NOT search os.environ['PATH'].  For reference:

http://bugs.python.org/issue8557

Since this subprocess call is invoking `git`; and the subprocess call
is coming from `git cl`; it's reasonable to expect that git will be in
%PATH%.

Beyond that, all the shell escaping seems to behave sanely (which is
to say, nothing gets escaped or un-escaped).

[commit-bot: I haz the power, 2012-06-15 20:06:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/szager@chromium.org/10543151/11020

[commit-bot: I haz the power, 2012-06-15 20:15:56]

Presubmit check for 10543151-11020 failed and returned exit status 1.

warning: code.google.com certificate with fingerprint
c3:fe:90:ab:92:55:ac:c9:d8:63:37:d2:8b:25:67:8a:68:94:f9:05 not verified (check
hostfingerprints or web.cacerts config setting)
Running presubmit commit checks ...
Checking out rietveld...
Running push-basic.sh
Running save-description-on-failure.sh
Running basic.sh
Running upload-stale.sh
Running upload-local-tracking-branch.sh
Running submodule-merge-test.sh
Running patch.sh
Running submit-from-new-dir.sh
Running post-dcommit-hook-test.sh
Running hooks.sh
Running abandon.sh
Running upstream.sh

** Presubmit ERRORS **
tests/git_cl_test.py failed!
Command tests/git_cl_test.py returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools
.EE.........
======================================================================
ERROR: test_dcommit (__main__.TestGitCl)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_cl_test.py", line 328, in test_dcommit
    git_cl.main(['dcommit'])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line
1594, in main
    return command(parser, argv[1:])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line
1367, in CMDdcommit
    return SendUpstream(parser, args, 'dcommit')
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line
1183, in SendUpstream
    base_has_submodules = IsSubmoduleMergeCommit(base_branch)
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line
1149, in IsSubmoduleMergeCommit
    return RunGit(cmd, shell=False) != ''
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line 67,
in RunGit
    return RunCommand(['git'] + args, **kwargs)
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line 56,
in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
TypeError: _mocked_call() got multiple values for keyword argument 'shell'

======================================================================
ERROR: test_dcommit_bypass_hooks (__main__.TestGitCl)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_cl_test.py", line 335, in test_dcommit_bypass_hooks
    git_cl.main(['dcommit', '--bypass-hooks'])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line
1594, in main
    return command(parser, argv[1:])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line
1367, in CMDdcommit
    return SendUpstream(parser, args, 'dcommit')
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line
1183, in SendUpstream
    base_has_submodules = IsSubmoduleMergeCommit(base_branch)
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line
1149, in IsSubmoduleMergeCommit
    return RunGit(cmd, shell=False) != ''
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line 67,
in RunGit
    return RunCommand(['git'] + args, **kwargs)
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/git_cl.py", line 56,
in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
TypeError: _mocked_call() got multiple values for keyword argument 'shell'

----------------------------------------------------------------------
Ran 12 tests in 0.026s

FAILED (errors=2)


push-basic.sh failed
Command /mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/push-basic.sh
returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests
Setting up test upstream git repo...
Setting up test git repo...
Branch work set up to track remote branch master from origin.
TESTING: git-cl upload wants a server
TESTING: git-cl status has no issue
TESTING: upload succeeds (needs a server running on localhost)

WARNING: Use -t or --title to set the title of the patchset.
In the near future, -m or --message will send a message instead.
See http://goo.gl/JGg0Z for details.

TESTING: git-cl status now knows the issue
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0    79      0   103k --:--:-- --:--:-- --:--:--  103k
 0     0    0     0    0    79      0   1518 --:--:-- --:--:-- --:--:--     0
TESTING: Base URL contains branch name
TESTING: git-cl push ok
Traceback (most recent call last):
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1609, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1594, in main
    return command(parser, argv[1:])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1377, in CMDpush
    return SendUpstream(parser, args, 'push')
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1183, in SendUpstream
    base_has_submodules = IsSubmoduleMergeCommit(base_branch)
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1149, in IsSubmoduleMergeCommit
    return RunGit(cmd, shell=False) != ''
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 67, in RunGit
    return RunCommand(['git'] + args, **kwargs)
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 56, in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
TypeError: check_output() got multiple values for keyword argument 'shell'
FAILURE: git-cl push ok


basic.sh failed
Command /mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/basic.sh
returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
TESTING: git-cl upload wants a server
TESTING: git-cl status has no issue
TESTING: upload succeeds (needs a server running on localhost)

WARNING: Use -t or --title to set the title of the patchset.
In the near future, -m or --message will send a message instead.
See http://goo.gl/JGg0Z for details.

TESTING: git-cl status now knows the issue
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0    79      0   108k --:--:-- --:--:-- --:--:--  108k
 0     0    0     0    0    79      0   1597 --:--:-- --:--:-- --:--:--     0
TESTING: git-cl dcommits ok
Traceback (most recent call last):
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1609, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1594, in main
    return command(parser, argv[1:])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1367, in CMDdcommit
    return SendUpstream(parser, args, 'dcommit')
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1183, in SendUpstream
    base_has_submodules = IsSubmoduleMergeCommit(base_branch)
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1149, in IsSubmoduleMergeCommit
    return RunGit(cmd, shell=False) != ''
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 67, in RunGit
    return RunCommand(['git'] + args, **kwargs)
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 56, in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
TypeError: check_output() got multiple values for keyword argument 'shell'
FAILURE: git-cl dcommits ok


submodule-merge-test.sh failed
Command
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/submodule-merge-test.sh
returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test remote git-svn-submodule repo...
Switched to branch 'master'
Branch work set up to track local branch master.
TESTING: dcommitted code
Traceback (most recent call last):
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1609, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1594, in main
    return command(parser, argv[1:])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1367, in CMDdcommit
    return SendUpstream(parser, args, 'dcommit')
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1183, in SendUpstream
    base_has_submodules = IsSubmoduleMergeCommit(base_branch)
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 1149, in IsSubmoduleMergeCommit
    return RunGit(cmd, shell=False) != ''
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 67, in RunGit
    return RunCommand(['git'] + args, **kwargs)
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/../git_cl.py",
line 56, in RunCommand
    return subprocess2.check_output(args, shell=False, **kwargs)
TypeError: check_output() got multiple values for keyword argument 'shell'
FAILURE: dcommitted code


submit-from-new-dir.sh failed
Command
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/submit-from-new-dir.sh
returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
TESTING: upload succeeds

WARNING: Use -t or --title to set the title of the patchset.
In the near future, -m or --message will send a message instead.
See http://goo.gl/JGg0Z for details.

TESTING: git-cl dcommits ok
Traceback (most recent c…
(message too large)

[commit-bot: I haz the power, 2012-06-15 21:19:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/szager@chromium.org/10543151/17001

[commit-bot: I haz the power, 2012-06-15 21:27:01]

Change committed as 142479