From 13141e733347cea5b409aa54475d281acd1c9a3c Mon Sep 17 00:00:00 2001 From: Thibault Clerice Date: Wed, 2 Dec 2015 08:18:24 +0100 Subject: [PATCH 1/2] Added CHECKING_OUT as a logged operation Closes #330 --- git/util.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git/util.py b/git/util.py index 809bcc048..e73007cf7 100644 --- a/git/util.py +++ b/git/util.py @@ -166,7 +166,7 @@ class RemoteProgress(object): and git-fetch and to dispatch callbacks allowing subclasses to react to the progress. """ _num_op_codes = 8 - BEGIN, END, COUNTING, COMPRESSING, WRITING, RECEIVING, RESOLVING, FINDING_SOURCES = \ + BEGIN, END, COUNTING, COMPRESSING, WRITING, RECEIVING, RESOLVING, FINDING_SOURCES, CHECKING_OUT = \ [1 << x for x in range(_num_op_codes)] STAGE_MASK = BEGIN | END OP_MASK = ~STAGE_MASK @@ -231,6 +231,8 @@ def _parse_progress_line(self, line): op_code |= self.RESOLVING elif op_name == 'Finding sources': op_code |= self.FINDING_SOURCES + elif op_name == 'Checking out files': + op_code |= self.CHECKING_OUT else: # Note: On windows it can happen that partial lines are sent # Hence we get something like "CompreReceiving objects", which is From 4a8700185dce5052ca1581b63432fb4d4839c226 Mon Sep 17 00:00:00 2001 From: Thibault Clerice Date: Wed, 2 Dec 2015 08:21:06 +0100 Subject: [PATCH 2/2] Forgot to update _num_op_codes --- git/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/util.py b/git/util.py index e73007cf7..00f03f6f6 100644 --- a/git/util.py +++ b/git/util.py @@ -165,7 +165,7 @@ 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 = 8 + _num_op_codes = 9 BEGIN, END, COUNTING, COMPRESSING, WRITING, RECEIVING, RESOLVING, FINDING_SOURCES, CHECKING_OUT = \ [1 << x for x in range(_num_op_codes)] STAGE_MASK = BEGIN | END