diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2011-06-07 21:27:26 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2011-06-07 21:27:26 +0200 |
| commit | 36a984803df08b0f6eb5f8a73254dd64bc616b67 (patch) | |
| tree | 9b6843c3633f4a1c47c3c28589ed2ac2b6ee0b9f /git/util.py | |
| parent | dfe3ba3e5c08ee88afe89cc331081bbfbf5520e0 (diff) | |
| parent | ab5b6af0c2c13794525ad84b0a80be9c42e9fcf1 (diff) | |
| download | gitpython-36a984803df08b0f6eb5f8a73254dd64bc616b67.tar.gz | |
Merge branch 'progress'
Diffstat (limited to 'git/util.py')
| -rw-r--r-- | git/util.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git/util.py b/git/util.py index 7cbef07f..0492b63c 100644 --- a/git/util.py +++ b/git/util.py @@ -109,8 +109,8 @@ class RemoteProgress(object): Handler providing an interface to parse progress information emitted by git-push and git-fetch and to dispatch callbacks allowing subclasses to react to the progress. """ - _num_op_codes = 5 - BEGIN, END, COUNTING, COMPRESSING, WRITING = [1 << x for x in range(_num_op_codes)] + _num_op_codes = 7 + BEGIN, END, COUNTING, COMPRESSING, WRITING, RECEIVING, RESOLVING = [1 << x for x in range(_num_op_codes)] STAGE_MASK = BEGIN|END OP_MASK = ~STAGE_MASK @@ -168,6 +168,10 @@ class RemoteProgress(object): op_code |= self.COMPRESSING elif op_name == "Writing objects": op_code |= self.WRITING + elif op_name == 'Receiving objects': + op_code |= self.RECEIVING + elif op_name == 'Resolving deltas': + op_code |= self.RESOLVING else: raise ValueError("Operation name %r unknown" % op_name) |