summaryrefslogtreecommitdiff
path: root/git/util.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-05-29 10:08:38 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-05-29 10:08:38 +0200
commitece57af3b69c38f4dcd19e8ccdd07ec38f899b23 (patch)
treefaffbb7ad5eb0d21ff0920791842aa7446332e1c /git/util.py
parentc5077dac4c7680c925f4c5e792eeb3c296a3b4c4 (diff)
parentd255f4c8fd905d1cd12bd42b542953d54ac8a8c3 (diff)
downloadgitpython-ece57af3b69c38f4dcd19e8ccdd07ec38f899b23.tar.gz
Merge pull request #450 from barry-scott/master
The progress arg to push, pull, fetch and clone is now a python calla…
Diffstat (limited to 'git/util.py')
-rw-r--r--git/util.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/git/util.py b/git/util.py
index a267f183..9b86b191 100644
--- a/git/util.py
+++ b/git/util.py
@@ -174,11 +174,16 @@ class RemoteProgress(object):
DONE_TOKEN = 'done.'
TOKEN_SEPARATOR = ', '
- __slots__ = ("_cur_line", "_seen_ops")
+ __slots__ = ("_cur_line", "_seen_ops", "__progress_function")
re_op_absolute = re.compile(r"(remote: )?([\w\s]+):\s+()(\d+)()(.*)")
re_op_relative = re.compile(r"(remote: )?([\w\s]+):\s+(\d+)% \((\d+)/(\d+)\)(.*)")
- def __init__(self):
+ def __init__(self, progress_function=None):
+ if progress_function is not None:
+ self.__progress_function = progress_function
+ else:
+ self.__progress_function = self.update
+
self._seen_ops = list()
self._cur_line = None
@@ -267,7 +272,7 @@ class RemoteProgress(object):
# END end message handling
message = message.strip(self.TOKEN_SEPARATOR)
- self.update(op_code,
+ self.__progress_function(op_code,
cur_count and float(cur_count),
max_count and float(max_count),
message)
@@ -314,7 +319,6 @@ class RemoteProgress(object):
You may read the contents of the current line in self._cur_line"""
pass
-
class Actor(object):
"""Actors hold information about a person acting on the repository. They