summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-04-16 09:12:26 +0200
committerSebastian Thiel <byronimo@gmail.com>2015-04-16 09:12:26 +0200
commit8c6d952b17e63c92a060c08eac38165c6fafa869 (patch)
treef9977c8be53ad1585ea9d7c488ba2b8dd529eb05
parente129846a1a5344c8d7c0abe5ec52136c3a581cce (diff)
parentabd23a37d8b93721c0e58e8c133cef26ed5ba1f0 (diff)
downloadgitpython-8c6d952b17e63c92a060c08eac38165c6fafa869.tar.gz
Merge branch 'matt-jordan-remote_source'
-rw-r--r--git/test/test_docs.py2
-rw-r--r--git/util.py7
2 files changed, 6 insertions, 3 deletions
diff --git a/git/test/test_docs.py b/git/test/test_docs.py
index 586f0ce4..5b8aa817 100644
--- a/git/test/test_docs.py
+++ b/git/test/test_docs.py
@@ -94,7 +94,7 @@ class Tutorials(TestBase):
# [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
index 1147cb53..fb459da1 100644
--- 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 @@ class RemoteProgress(object):
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