Skip to content

Commit ab5b6af

Browse files
int3Byron
authored andcommitted
Parse more git-fetch operation log codes.
1 parent 55eb3de commit ab5b6af

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

‎git/util.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ class RemoteProgress(object):
109109
Handler providing an interface to parse progress information emitted by git-push
110110
and git-fetch and to dispatch callbacks allowing subclasses to react to the progress.
111111
"""
112-
_num_op_codes = 5
113-
BEGIN, END, COUNTING, COMPRESSING, WRITING = [1 << x for x in range(_num_op_codes)]
112+
_num_op_codes = 7
113+
BEGIN, END, COUNTING, COMPRESSING, WRITING, RECEIVING, RESOLVING = [1 << x for x in range(_num_op_codes)]
114114
STAGE_MASK = BEGIN|END
115115
OP_MASK = ~STAGE_MASK
116116

@@ -168,6 +168,10 @@ def _parse_progress_line(self, line):
168168
op_code |= self.COMPRESSING
169169
elif op_name == "Writing objects":
170170
op_code |= self.WRITING
171+
elif op_name == 'Receiving objects':
172+
op_code |= self.RECEIVING
173+
elif op_name == 'Resolving deltas':
174+
op_code |= self.RESOLVING
171175
else:
172176
raise ValueError("Operation name %r unknown" % op_name)
173177

0 commit comments

Comments
 (0)