Merge branch 'matt-jordan-remote_source'

Byron · Byron · commit 8c6d952b17e6 · 2015-04-16T09:12:26.000+02:00
diff --git a/git/test/test_docs.py b/git/test/test_docs.py
@@ -94,7 +94,7 @@ def test_init_repo_object(self, rw_dir):
         # [11-test_init_repo_object]
         assert now.commit.message != past.commit.message
         # You can read objects directly through binary streams, no working tree required
-        assert (now.commit.tree / 'VERSION').data_stream.read().decode('ascii').startswith('0')
+        assert (now.commit.tree / 'VERSION').data_stream.read().decode('ascii').startswith('1')
 
         # You can traverse trees as well to handle all contained files of a particular commit
         file_count = 0
diff --git a/git/util.py b/git/util.py
@@ -164,8 +164,9 @@ 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 = 7
-    BEGIN, END, COUNTING, COMPRESSING, WRITING, RECEIVING, RESOLVING = [1 << x for x in range(_num_op_codes)]
+    _num_op_codes = 8
+    BEGIN, END, COUNTING, COMPRESSING, WRITING, RECEIVING, RESOLVING, FINDING_SOURCES = \
+        [1 << x for x in range(_num_op_codes)]
     STAGE_MASK = BEGIN | END
     OP_MASK = ~STAGE_MASK
 
@@ -227,6 +228,8 @@ def _parse_progress_line(self, line):
                 op_code |= self.RECEIVING
             elif op_name == 'Resolving deltas':
                 op_code |= self.RESOLVING
+            elif op_name == 'Finding sources':
+                op_code |= self.FINDING_SOURCES
             else:
                 # Note: On windows it can happen that partial lines are sent
                 # Hence we get something like "CompreReceiving objects", which is
