Merge pull request #413 from nvie/support-repeated-cmd-kwargs

Support repeated kwargs

Author: nvie

git/cmd.py

@@ -764,23 +764,31 @@ def custom_environment(self, **kwargs):
 finally:
 self.update_environment(**old_env)
 
+deftransform_kwarg(self, name, value, split_single_char_options):
+iflen(name) ==1:
+ifvalueisTrue:
+return ["-%s"%name]
+eliftype(value) isnotbool:
+ifsplit_single_char_options:
+return ["-%s"%name, "%s"%value]
+else:
+return ["-%s%s"% (name, value)]
+else:
+ifvalueisTrue:
+return ["--%s"%dashify(name)]
+eliftype(value) isnotbool:
+return ["--%s=%s"% (dashify(name), value)]
+return []
+
 deftransform_kwargs(self, split_single_char_options=True, **kwargs):
 """Transforms Python style kwargs into git command line options."""
 args=list()
 fork, vinkwargs.items():
-iflen(k) ==1:
-ifvisTrue:
-args.append("-%s"%k)
-eliftype(v) isnotbool:
-ifsplit_single_char_options:
-args.extend(["-%s"%k, "%s"%v])
-else:
-args.append("-%s%s"% (k, v))
+ifisinstance(v, (list, tuple)):
+forvalueinv:
+args+=self.transform_kwarg(k, value, split_single_char_options)
 else:
-ifvisTrue:
-args.append("--%s"%dashify(k))
-eliftype(v) isnotbool:
-args.append("--%s=%s"% (dashify(k), v))
+args+=self.transform_kwarg(k, v, split_single_char_options)
 returnargs
 
 @classmethod

git/test/test_git.py

@@ -70,6 +70,10 @@ def test_it_transforms_kwargs_into_git_command_arguments(self):
 assert_equal(["--max-count"], self.git.transform_kwargs(**{'max_count': True}))
 assert_equal(["--max-count=5"], self.git.transform_kwargs(**{'max_count': 5}))
 
+# Multiple args are supported by using lists/tuples
+assert_equal(["-L", "1-3", "-L", "12-18"], self.git.transform_kwargs(**{'L': ('1-3', '12-18')}))
+assert_equal(["-C", "-C"], self.git.transform_kwargs(**{'C': [True, True]}))
+
 # order is undefined
 res=self.git.transform_kwargs(**{'s': True, 't': True})
 assert ['-s', '-t'] ==resor ['-t', '-s'] ==res