gclient grep: support pathspec arguments

gclient grep: support pathspec arguments

Support 'git grep <match> <branch>' type searches in gclient grep.
These searches had a slightly different output so needed more
tweeking to the regex.  I cleaned it up a bit too.

R=maruel@chromium.org
BUG=


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

[M-A Ruel, 2012-11-28 01:43:11]

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py
File gclient.py (right):

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode644
gclient.py:644: if options.prepend_dir:
if options.prepend_dir and scm == 'git':

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode646
gclient.py:646: def filter_fn(line):
Add docstring along the lines
"""Git-specific path marshaling. It is optimized for git-grep."""

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode648
gclient.py:648: match = re.match('(\S+?:)?([^\0]+)$', git_pathspec)
r

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode650
gclient.py:650: branch = match.group(1) or ''
When r'(\S+?:)?' doesn't match, match.group(1) is None?

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode653
gclient.py:653: match = re.match('Binary file ([^\0]+) matches$', line)
r'^ ...

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode660
gclient.py:660: print '%s : %s' % (mod_path(items[0]), items[1])
normal git-grep output doesn't have a whitespace before ':'

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode664
gclient.py:664: print '\n'.join([mod_path(path) for path in items if path])
Please don't convert the generator into a list before sending to the join()
call.

[Isaac (away), 2012-11-28 02:02:35]

Uploaded patchset 2 with some changes.

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py
File gclient.py (right):

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode644
gclient.py:644: if options.prepend_dir:
On 2012/11/28 01:43:11, Marc-Antoine Ruel wrote:
> if options.prepend_dir and scm == 'git':

Done.

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode646
gclient.py:646: def filter_fn(line):
On 2012/11/28 01:43:11, Marc-Antoine Ruel wrote:
> Add docstring along the lines
> """Git-specific path marshaling. It is optimized for git-grep."""

Done.

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode648
gclient.py:648: match = re.match('(\S+?:)?([^\0]+)$', git_pathspec)
On 2012/11/28 01:43:11, Marc-Antoine Ruel wrote:
> r

Can't use r for these, because I am looking for a nullbyte (\0)

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode650
gclient.py:650: branch = match.group(1) or ''
On 2012/11/28 01:43:11, Marc-Antoine Ruel wrote:
> When r'(\S+?:)?' doesn't match, match.group(1) is None?

Yep

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode653
gclient.py:653: match = re.match('Binary file ([^\0]+) matches$', line)
On 2012/11/28 01:43:11, Marc-Antoine Ruel wrote:
> r'^ ...

ditto on the r.  The ^ isn't necessary because of the syntax of re.match (only
matches from beginning of string), but added anyway.

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode660
gclient.py:660: print '%s : %s' % (mod_path(items[0]), items[1])
On 2012/11/28 01:43:11, Marc-Antoine Ruel wrote:
> normal git-grep output doesn't have a whitespace before ':'

Adding a space lets you double click and highlight the filename so I made a
concession.

https://chromiumcodereview.appspot.com/11316213/diff/1/gclient.py#newcode664
gclient.py:664: print '\n'.join([mod_path(path) for path in items if path])
Nice!  I always forget about these.

[M-A Ruel, 2012-11-28 02:20:33]

lgtm

https://chromiumcodereview.appspot.com/11316213/diff/1002/gclient.py
File gclient.py (right):

https://chromiumcodereview.appspot.com/11316213/diff/1002/gclient.py#newcode650
gclient.py:650: match = re.match('^(\S+?:)?([^\0]+)$', git_pathspec)
Then concatenate the two strings to make it clear or properly escape the \, e.g.
\\S

[Isaac (away), 2012-11-28 20:24:03]

fixed nit and rebased.  Committing.

[commit-bot: I haz the power, 2012-11-28 20:24:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ilevy@chromium.org/11316213/7002

[commit-bot: I haz the power, 2012-11-28 20:27:03]

Change committed as 170039