Commite0acb83

committed

Added 'insert_kwargs_after' flag for consumption by _call_process.

While at it, all other invocations of .git in remote.py were reviewedFixesgitpython-developers#262

1 parentbfcdf2b commite0acb83Copy full SHA for e0acb83

File tree

+26

-3

lines changed

+26

-3

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -753,11 +753,23 @@ def _call_process(self, method, args, *kwargs):`
`753`	`753`	`exceptKeyError:`
`754`	`754`	`pass`
`755`	`755`
	`756`	`+insert_after_this_arg=kwargs.pop('insert_kwargs_after',None)`
	`757`	`+`
`756`	`758`	`# Prepare the argument list`
`757`	`759`	`opt_args=self.transform_kwargs(**kwargs)`
`758`	`760`	`ext_args=self.__unpack_args([aforainargsifaisnotNone])`
`759`	`761`
`760`		`-args=opt_args+ext_args`
	`762`	`+ifinsert_after_this_argisNone:`
	`763`	`+args=opt_args+ext_args`
	`764`	`+else:`
	`765`	`+try:`
	`766`	`+index=ext_args.index(insert_after_this_arg)`
	`767`	`+exceptValueError:`
	`768`	`+raiseValueError("Couldn't find argument '%s' in args %s to insert kwargs after"`
	`769`	`+% (insert_after_this_arg,str(ext_args)))`
	`770`	`+# end handle error`
	`771`	`+args=ext_args[:index+1]+opt_args+ext_args[index+1:]`
	`772`	`+# end handle kwargs`
`761`	`773`
`762`	`774`	`defmake_call():`
`763`	`775`	`call= [self.GIT_PYTHON_GIT_EXECUTABLE]`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,9 @@ def create(cls, repo, name, url, **kwargs):`
`477`	`477`	`:param kwargs: Additional arguments to be passed to the git-remote add command`
`478`	`478`	`:return: New Remote instance`
`479`	`479`	`:raise GitCommandError: in case an origin with that name already exists"""`
`480`		`-repo.git.remote("add",name,url,**kwargs)`
	`480`	`+scmd='add'`
	`481`	`+kwargs['insert_kwargs_after']=scmd`
	`482`	`+repo.git.remote(scmd,name,url,**kwargs)`
`481`	`483`	`returncls(repo,name)`
`482`	`484`
`483`	`485`	`# add is an alias`
`@@ -517,7 +519,9 @@ def update(self, **kwargs):`
`517`	`519`	`Additional arguments passed to git-remote update`
`518`	`520`
`519`	`521`	`:return: self """`
`520`		`-self.repo.git.remote("update",self.name,**kwargs)`
	`522`	`+scmd='update'`
	`523`	`+kwargs['insert_kwargs_after']=scmd`
	`524`	`+self.repo.git.remote(scmd,self.name,**kwargs)`
`521`	`525`	`returnself`
`522`	`526`
`523`	`527`	`def_get_fetch_info_from_stderr(self,proc,progress):`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,10 @@ def test_single_char_git_options_are_passed_to_git(self):`
`155`	`155`	`deftest_change_to_transform_kwargs_does_not_break_command_options(self):`
`156`	`156`	`self.git.log(n=1)`
`157`	`157`
	`158`	`+deftest_insert_after_kwarg_raises(self):`
	`159`	`+# This isn't a complete add command, which doesn't matter here`
	`160`	`+self.failUnlessRaises(ValueError,self.git.remote,'add',insert_kwargs_after='foo')`
	`161`	`+`
`158`	`162`	`deftest_env_vars_passed_to_git(self):`
`159`	`163`	`editor='non_existant_editor'`
`160`	`164`	`withmock.patch.dict('os.environ', {'GIT_EDITOR':editor}):`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -486,6 +486,9 @@ def test_creation_and_removal(self, bare_rw_repo):`
`486`	`486`	`# END if deleted remote matches existing remote's name`
`487`	`487`	`# END for each remote`
`488`	`488`
	`489`	`+# Issue #262 - the next call would fail if bug wasn't fixed`
	`490`	`+bare_rw_repo.create_remote('bogus','/bogus/path',mirror='push')`
	`491`	`+`
`489`	`492`	`deftest_fetch_info(self):`
`490`	`493`	`# assure we can handle remote-tracking branches`
`491`	`494`	`fetch_info_line_fmt="c437ee5deb8d00cf02f03720693e4c802e99f390not-for-merge%s '0.3' of "`

Comments

(0)