Skip to content

Progress parsing #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Progress parsing #20

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a0ca05e
Add --progress flag.
int3 May 21, 2011
1f8cb16
Parse more git-fetch operation log codes.
int3 May 21, 2011
f0f02bb
Add progress tracking for git-clone.
int3 May 21, 2011
6b655be
Add version-specific behavior.
int3 May 24, 2011
12c93f5
Rename version to version_info.
int3 May 25, 2011
c296c6f
Fix up the renaming.
int3 Jun 2, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix up the renaming.
  • Loading branch information
@int3
int3 committed Jun 2, 2011
commit c296c6f51aa86cb45cc7e731296a3d01905df38d
6 changes: 3 additions & 3 deletions git/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ def fetch(self, refspec=None, progress=None, **kwargs):
:note:
As fetch does not provide progress information to non-ttys, we cannot make
it available here unfortunately as in the 'push' method."""
if self.repo.git.version >= (1, 7, 0, 0): kwargs['progress'] = True
if self.repo.git.version_info >= (1, 7, 0, 0): kwargs['progress'] = True
proc = self.repo.git.fetch(self, refspec, with_extended_output=True, as_process=True, v=True, **kwargs)
return self._get_fetch_info_from_stderr(proc, progress or RemoteProgress())

Expand All @@ -526,7 +526,7 @@ def pull(self, refspec=None, progress=None, **kwargs):
:param progress: see 'push' method
:param kwargs: Additional arguments to be passed to git-pull
:return: Please see 'fetch' method """
if self.repo.git.version >= (1, 7, 0, 0): kwargs['progress'] = True
if self.repo.git.version_info >= (1, 7, 0, 0): kwargs['progress'] = True
proc = self.repo.git.pull(self, refspec, with_extended_output=True, as_process=True, v=True, **kwargs)
return self._get_fetch_info_from_stderr(proc, progress or RemoteProgress())

Expand All @@ -548,7 +548,7 @@ def push(self, refspec=None, progress=None, **kwargs):
in their flags.
If the operation fails completely, the length of the returned IterableList will
be null."""
if self.repo.git.version >= (1, 7, 0, 0): kwargs['progress'] = True
if self.repo.git.version_info >= (1, 7, 0, 0): kwargs['progress'] = True
proc = self.repo.git.push(self, refspec, porcelain=True, as_process=True, progress=True, v=True, **kwargs)
return self._get_push_info(proc, progress or RemoteProgress())

Expand Down
2 changes: 1 addition & 1 deletion git/repo/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ def _clone(cls, git, url, path, odb_default_type, progress, **kwargs):
# END windows handling

try:
if git.version >= (1, 7, 0, 0): kwargs['progress'] = True
if git.version_info >= (1, 7, 0, 0): kwargs['progress'] = True
proc = git.clone(url, path, with_extended_output=True, as_process=True, v=True, **kwargs)
if progress:
_digest_process_messages(proc.stderr, progress)
Expand Down
1 change: 1 addition & 0 deletions git/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import time
import tempfile
import platform
from exc import GitCommandError

from gitdb.util import (
make_sha,
Expand Down