Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf1a2a4c

Browse files
committed
Implemented GIT_PYTHON_GIT_EXECUTABLE including test and docs
1 parent6507e4e commitf1a2a4c

File tree

4 files changed

+38
-6
lines changed

4 files changed

+38
-6
lines changed

‎doc/source/changes.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ NEXT
2727
* ### Git Cmd ###
2828

2929
* Added ``version_info`` property to git command, returning a tuple of version numbers.
30+
* Added GIT_PYTHON_GIT_EXECUTABLE environment variable, which can be used to set the desired git executable to be used. despite of what would be found in the path.
31+
* GIT_PYTHON_TRACE is now set on class level of the Git type, previously it was a module level global variable.
32+
* GIT_PYTHON_GIT_EXECUTABLE is a class level variable as well.
3033

3134
* ### Exceptions ###
3235

‎doc/source/tutorial.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,20 @@ The special notion ``git.command(flag=True)`` will create a flag without value l
412412

413413
If ``None`` is found in the arguments, it will be dropped silently. Lists and tuples passed as arguments will be unpacked recursively to individual arguments. Objects are converted to strings using the str(...) function.
414414

415+
Git Command Debugging and Customization
416+
***************************************
417+
418+
Using environment variables, you can further adjust the behaviour of the git command.
419+
420+
* **GIT_PYTHON_TRACE**
421+
422+
* If set to non-0, all executed git commands will be printed to stdout.
423+
* if set to *full*, the executed git command will be printed along with its output.
424+
425+
* **GIT_PYTHON_GIT_EXECUTABLE**
426+
427+
* If set, it should contain the full path to the git executable, e.g. *c:\\Program Files (x86)\\Git\\bin\\git.exe* on windows or */usr/bin/git* on linux.
428+
415429
And even more ...
416430
*****************
417431

‎git/cmd.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
PIPE
1818
)
1919

20-
# Enables debugging of GitPython's git commands
21-
GIT_PYTHON_TRACE=os.environ.get("GIT_PYTHON_TRACE",False)
22-
2320
execute_kwargs= ('istream','with_keep_cwd','with_extended_output',
2421
'with_exceptions','as_process',
2522
'output_stream' )
@@ -29,6 +26,7 @@
2926
defdashify(string):
3027
returnstring.replace('_','-')
3128

29+
3230
classGit(LazyMixin):
3331
"""
3432
The Git class manages communication with the Git binary.
@@ -50,6 +48,13 @@ class Git(LazyMixin):
5048
# The size in bytes read from stdout when copying git's output to another stream
5149
max_chunk_size=1024*64
5250

51+
# Enables debugging of GitPython's git commands
52+
GIT_PYTHON_TRACE=os.environ.get("GIT_PYTHON_TRACE",False)
53+
54+
# Provide the full path to the git executable. Otherwise it assumes git is in the path
55+
GIT_PYTHON_GIT_EXECUTABLE=os.environ.get("GIT_PYTHON_GIT_EXECUTABLE",'git')
56+
57+
5358
classAutoInterrupt(object):
5459
"""Kill/Interrupt the stored process instance once this instance goes out of scope. It is
5560
used to prevent processes piling up in case iterators stop reading.
@@ -311,7 +316,7 @@ def execute(self, command,
311316
:note:
312317
If you add additional keyword arguments to the signature of this method,
313318
you must update the execute_kwargs tuple housed in this module."""
314-
ifGIT_PYTHON_TRACEandnotGIT_PYTHON_TRACE=='full':
319+
ifself.GIT_PYTHON_TRACEandnotself.GIT_PYTHON_TRACE=='full':
315320
print' '.join(command)
316321

317322
# Allow the user to have the command executed in their working dir.
@@ -358,7 +363,7 @@ def execute(self, command,
358363
proc.stdout.close()
359364
proc.stderr.close()
360365

361-
ifGIT_PYTHON_TRACE=='full':
366+
ifself.GIT_PYTHON_TRACE=='full':
362367
cmdstr=" ".join(command)
363368
ifstderr_value:
364369
print"%s -> %d; stdout: '%s'; stderr: '%s'"% (cmdstr,status,stdout_value,stderr_value)
@@ -445,7 +450,7 @@ def _call_process(self, method, *args, **kwargs):
445450
ext_args=self.__unpack_args([aforainargsifaisnotNone])
446451
args=opt_args+ext_args
447452

448-
call= ["git",dashify(method)]
453+
call= [self.GIT_PYTHON_GIT_EXECUTABLE,dashify(method)]
449454
call.extend(args)
450455

451456
returnself.execute(call,**_kwargs)

‎git/test/test_cmd.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,13 @@ def test_version(self):
9898
forninv:
9999
assertisinstance(n,int)
100100
#END verify number types
101+
102+
deftest_cmd_override(self):
103+
prev_cmd=self.git.GIT_PYTHON_GIT_EXECUTABLE
104+
try:
105+
# set it to something that doens't exist, assure it raises
106+
type(self.git).GIT_PYTHON_GIT_EXECUTABLE=os.path.join("some","path","which","doesn't","exist","gitbinary")
107+
self.failUnlessRaises(OSError,self.git.version)
108+
finally:
109+
type(self.git).GIT_PYTHON_GIT_EXECUTABLE=prev_cmd
110+
#END undo adjustment

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp