Let `git cl format` format .mm files too.

Let `git cl format` format .mm files too.

(It's a bit unfortunate that we're duplicating the default -regex list in
clang-format-diff.py here :-/ But the .js and .proto stuff is probably not
quite ready yet anyhow, so I'm only adding .mm for now.)

TEST=Edit a .mm file, commit, run `git cl format`, `git diff` shows formatted
output.
TBR=iannucci@chromium.org

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

[ncarter (slow), 2014-02-02 19:29:11]

LGTM
On Feb 2, 2014 11:27 AM, <thakis@chromium.org> wrote:

> Reviewers: iannucci, ncarter,
>
> Description:
> Let `git cl format` format .mm files too.
>
> (It's a bit unfortunate that we're duplicating the default -regex list in
> clang-format-diff.py here :-/ But the .js and .proto stuff is probably not
> quite ready yet anyhow, so I'm only adding .mm for now.)
>
> TEST=Edit a .mm file, commit, run `git cl format`, `git diff` shows
> formatted
> output.
> TBR=iannucci@chromium.org
>
> Please review this at https://codereview.chromium.org/152303002/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/tools/
>
> Affected files (+1, -1 lines):
>   M     depot_tools/git_cl.py
>
>
> Index: depot_tools/git_cl.py
> ===================================================================
> --- depot_tools/git_cl.py       (revision 248421)
> +++ depot_tools/git_cl.py       (working copy)
> @@ -2306,7 +2306,7 @@
>  @subcommand.usage('[files or directories to diff]')
>  def CMDformat(parser, args):
>    """Runs clang-format on the diff."""
> -  CLANG_EXTS = ['.cc', '.cpp', '.h']
> +  CLANG_EXTS = ['.cc', '.cpp', '.h', '.mm']
>    parser.add_option('--full', action='store_true',
>                      help='Reformat the full content of all touched files')
>    parser.add_option('--dry-run', action='store_true',
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[Nico, 2014-02-02 19:30:44]

The CQ bit was checked by thakis@chromium.org

[commit-bot: I haz the power, 2014-02-02 19:30:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/152303002/1

[Nico, 2014-02-02 19:31:20]

Thanks! If you can think of a way to get rid of this duplication somehow (maybe
we should just list _all_ files and let the script decide what it wants?),
that'd be appreciated :-)

[commit-bot: I haz the power, 2014-02-02 19:32:25]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-02 19:32:26]

CQ bit was unchecked on CL. Ignoring.

[commit-bot: I haz the power, 2014-02-02 19:32:26]

Presubmit check for 152303002-1 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit Messages **
--tbr was specified, skipping OWNERS check

** Presubmit ERRORS **
tests/checkout_test.py (32.63s) failed
Switched to branch 'master'
Already on 'master'
.....................F.
======================================================================
FAIL: testWithRevPropsSupport (__main__.SvnCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 551, in testWithRevPropsSupport
    self._check_base(self._get_co(None), root, expected)
  File "tests/checkout_test.py", line 321, in _check_base
    self.assertEquals(expected, actual)
AssertionError: {'msg': 'msg', 'revprops': [('commit-bot',
'user1@example.com')], 'author': 'use [truncated]... != {'msg': 'msg',
'revprops': [('realauthor', 'user2@example.com')], 'author': 'use [truncated]...
- {'author': 'user2@example.com',
?                 ^

+ {'author': 'user1@example.com',
?                 ^

   'msg': 'msg',
   'revision': 3,
-  'revprops': [('commit-bot', 'user1@example.com')]}
?                 ^ ^^^^^^^^        ^

+  'revprops': [('realauthor', 'user2@example.com')]}
?                 ^^^^^^^^ ^        ^


----------------------------------------------------------------------
Ran 23 tests in 32.385s

FAILED (failures=1)


tests/gclient_smoketest.py (31.37s) failed
......svn: Commit failed (details follow):
svn: Conflict at '/trunk'
EFFFFsvn: URL 'svn://127.0.0.1:10001/svn/trunk/webkit' doesn't exist
Esvn: URL 'svn://127.0.0.1:10001/svn/trunk/webkit' doesn't exist
Esvn: URL 'svn://127.0.0.1:10001/svn/trunk/webkit' doesn't exist
Esvn: URL 'svn://127.0.0.1:10001/svn/trunk/webkit' doesn't exist
Esvn: URL 'svn://127.0.0.1:10001/svn/trunk/webkit' doesn't exist
E.........EEFFFEEF.FFFFFFFF.
======================================================================
ERROR: testMultiSolutions (__main__.GClientSmokeBoth)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 1176, in setUp
    self.enabled = self.FAKE_REPOS.set_up_svn() and self.FAKE_REPOS.set_up_git()
  File
"/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line
353, in set_up_svn
    self.populateSvn()
  File
"/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line
504, in populateSvn
    self._commit_svn(fs)
  File
"/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line
395, in _commit_svn
    commit_svn(self.svn_checkout, self.USERS[0][0], self.USERS[0][1])
  File
"/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line
81, in commit_svn
    cwd=repo)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 514, in
check_output
    return check_call_out(args, stdout=PIPE, **kwargs)[0]
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command svn commit /tmp/trialuM8HtU/repos/svn_checkout -m
foo --non-interactive --no-auth-cache --username user1@example.com --password
foo returned non-zero exit status 1 in /tmp/trialuM8HtU/repos/svn_checkout
Adding         origin
Adding         trunk
Adding         trunk/origin
Adding         trunk/other
Adding         trunk/other/origin
Adding         trunk/src
Adding         trunk/src/DEPS
Adding         trunk/src/DEPS.alt
Adding         trunk/src/origin
Adding         trunk/src/third_party
Adding         trunk/src/third_party/origin
Adding         trunk/third_party
Adding         trunk/third_party/foo
Adding         trunk/third_party/foo/origin
Adding         trunk/third_party/origin
Adding         trunk/third_party/prout
Adding         trunk/third_party/prout/origin
Transmitting file data ..........

======================================================================
ERROR: testRest (__main__.GClientSmokeFromCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 1359, in setUp
    '--username', usr, '--password', pwd])
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 483, in
check_call
    check_call_out(args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command svn checkout svn://127.0.0.1:10001/svn//trunk/webkit
/tmp/trialuM8HtU/__main__.GClientSmokeFromCheckout.testRest -q --non-interactive
--no-auth-cache --username user1@example.com --password foo returned non-zero
exit status 1

======================================================================
ERROR: testRevInfo (__main__.GClientSmokeFromCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 1359, in setUp
    '--username', usr, '--password', pwd])
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 483, in
check_call
    check_call_out(args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command svn checkout svn://127.0.0.1:10001/svn//trunk/webkit
/tmp/trialuM8HtU/__main__.GClientSmokeFromCheckout.testRevInfo -q
--non-interactive --no-auth-cache --username user1@example.com --password foo
returned non-zero exit status 1

======================================================================
ERROR: testRevertAndStatus (__main__.GClientSmokeFromCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 1359, in setUp
    '--username', usr, '--password', pwd])
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 483, in
check_call
    check_call_out(args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command svn checkout svn://127.0.0.1:10001/svn//trunk/webkit
/tmp/trialuM8HtU/__main__.GClientSmokeFromCheckout.testRevertAndStatus -q
--non-interactive --no-auth-cache --username user1@example.com --password foo
returned non-zero exit status 1

======================================================================
ERROR: testRunHooks (__main__.GClientSmokeFromCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 1359, in setUp
    '--username', usr, '--password', pwd])
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 483, in
check_call
    check_call_out(args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command svn checkout svn://127.0.0.1:10001/svn//trunk/webkit
/tmp/trialuM8HtU/__main__.GClientSmokeFromCheckout.testRunHooks -q
--non-interactive --no-auth-cache --username user1@example.com --password foo
returned non-zero exit status 1

======================================================================
ERROR: testSync (__main__.GClientSmokeFromCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 1359, in setUp
    '--username', usr, '--password', pwd])
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 483, in
check_call
    check_call_out(args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command svn checkout svn://127.0.0.1:10001/svn//trunk/webkit
/tmp/trialuM8HtU/__main__.GClientSmokeFromCheckout.testSync -q --non-interactive
--no-auth-cache --username user1@example.com --password foo returned non-zero
exit status 1

======================================================================
ERROR: testCorrectDirectory (__main__.GClientSmokeSVN)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 735, in testCorrectDirectory
    res = self.gclient(['status', '--jobs', '1'], src)
  File "tests/gclient_smoketest.py", line 52, in gclient
    shell=sys.platform.startswith('win'))
  File "/usr/lib/python2.7/subprocess.py", line 679, in __init__
    errread, errwrite)
  File "/usr/lib/python2.7/subprocess.py", line 1249, in _execute_child
    raise child_exception
OSError: [Errno 2] No such file or directory:
'/tmp/trialuM8HtU/__main__.GClientSmokeSVN.testCorrectDirectory/src'

======================================================================
ERROR: testInitialCheckoutFailed (__main__.GClientSmokeSVN)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 760, in testInitialCheckoutFailed
    os.remove(join(self.root_dir, '.gclient_entries'))
OSError: [Errno 2] No such file or directory:
'/tmp/trialuM8HtU/__main__.GClientSmokeSVN.testInitialCheckoutFailed/.gclient_entries'

======================================================================
…
(message too large)

[commit-bot: I haz the power, 2014-02-02 19:32:28]

CQ bit was unchecked on CL. Ignoring.

[commit-bot: I haz the power, 2014-02-02 19:32:34]

CQ bit was unchecked on CL. Ignoring.

[Nico, 2014-02-02 19:36:10]

The CQ bit was checked by thakis@chromium.org

[commit-bot: I haz the power, 2014-02-02 19:36:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/152303002/1

[commit-bot: I haz the power, 2014-02-02 19:38:09]

Change committed as 248424

[commit-bot: I haz the power, 2014-02-02 19:38:14]

CQ bit was unchecked on CL. Ignoring.

[commit-bot: I haz the power, 2014-02-02 19:38:15]

CQ bit was unchecked on CL. Ignoring.

[commit-bot: I haz the power, 2014-02-02 19:38:18]

CQ bit was unchecked on CL. Ignoring.