Skip to content

Commit a8031d5

Browse files
avitko001cavitko001c
committed
my changes
1 parent a0146a7 commit a8031d5

File tree

8 files changed

+47
-6
lines changed

8 files changed

+47
-6
lines changed

‎.idea/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/GitPython.iml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎git/__init__.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111

1212
import os.path as osp
1313

14+
try:
15+
from shutil import which
16+
except:
17+
from subprocess import getoutput
18+
which = lambda x: getoutput('which {cmd}'.format(cmd=x))
1419

1520
__version__ = 'vitko'
1621

@@ -79,8 +84,9 @@ def refresh(path=None):
7984
#} END initialize git executable path
8085

8186
#################
87+
path = which('git') or None
8288
try:
83-
refresh()
89+
refresh(path)
8490
except Exception as exc:
8591
raise ImportError('Failed to initialize: {0}'.format(exc))
8692
#################

‎git/util.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -401,11 +401,7 @@ def _parse_progress_line(self, line):
401401
# Trim whitespace
402402
message_string = ' '.join(message_string.split())
403403

404-
self.update(0,
405-
1,
406-
1,
407-
message_string)
408-
404+
self.update(0, 1, 1, message_string)
409405
sub_lines = line.split('\r')
410406
failed_lines = []
411407
for sline in sub_lines:

0 commit comments

Comments
 (0)