mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-23 07:16:21 +00:00
Merge "project: Support config args in git command callables"
This commit is contained in:
commit
dc96476af3
17
project.py
17
project.py
@ -2146,7 +2146,9 @@ class Project(object):
|
|||||||
|
|
||||||
Since we don't have a 'rev_parse' method defined, the __getattr__ will
|
Since we don't have a 'rev_parse' method defined, the __getattr__ will
|
||||||
run. We'll replace the '_' with a '-' and try to run a git command.
|
run. We'll replace the '_' with a '-' and try to run a git command.
|
||||||
Any other arguments will be passed to the git command.
|
Any other positional arguments will be passed to the git command, and the
|
||||||
|
following keyword arguments are supported:
|
||||||
|
config: An optional dict of git config options to be passed with '-c'.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
name: The name of the git command to call. Any '_' characters will
|
name: The name of the git command to call. Any '_' characters will
|
||||||
@ -2156,8 +2158,17 @@ class Project(object):
|
|||||||
A callable object that will try to call git with the named command.
|
A callable object that will try to call git with the named command.
|
||||||
"""
|
"""
|
||||||
name = name.replace('_', '-')
|
name = name.replace('_', '-')
|
||||||
def runner(*args):
|
def runner(*args, **kwargs):
|
||||||
cmdv = [name]
|
cmdv = []
|
||||||
|
config = kwargs.pop('config', None)
|
||||||
|
for k in kwargs:
|
||||||
|
raise TypeError('%s() got an unexpected keyword argument %r'
|
||||||
|
% (name, k))
|
||||||
|
if config is not None:
|
||||||
|
for k, v in config.iteritems():
|
||||||
|
cmdv.append('-c')
|
||||||
|
cmdv.append('%s=%s' % (k, v))
|
||||||
|
cmdv.append(name)
|
||||||
cmdv.extend(args)
|
cmdv.extend(args)
|
||||||
p = GitCommand(self._project,
|
p = GitCommand(self._project,
|
||||||
cmdv,
|
cmdv,
|
||||||
|
Loading…
Reference in New Issue
Block a user