From 55eb3de3c31fd5d5ad35a8452060ee3be99a2d99 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Tue, 7 Jun 2011 21:25:38 +0200 Subject: Added conditional usage of the --progress flag to all relevant methods, that is push, fetch, pull and clone. This allows progress information to be sent in newer git versions without breaking older ones (ideally) --- git/repo/base.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'git/repo') diff --git a/git/repo/base.py b/git/repo/base.py index 55aec05b..14efabdc 100644 --- a/git/repo/base.py +++ b/git/repo/base.py @@ -11,18 +11,18 @@ from git.refs import * from git.index import IndexFile from git.objects import * from git.config import GitConfigParser -from git.remote import Remote +from git.remote import ( + Remote, + digest_process_messages, + finalize_process, + add_progress + ) + from git.db import ( GitCmdObjectDB, GitDB ) - -from git.util import ( - _digest_process_messages, - _finalize_proc - ) - from gitdb.util import ( join, isfile, @@ -684,10 +684,11 @@ class Repo(object): # END windows handling try: - proc = git.clone(url, path, with_extended_output=True, as_process=True, v=True, progress=True, **kwargs) + proc = git.clone(url, path, with_extended_output=True, as_process=True, v=True, **add_progress(kwargs, git, progress)) if progress: - _digest_process_messages(proc.stderr, progress) - _finalize_proc(proc) + digest_process_messages(proc.stderr, progress) + #END handle progress + finalize_process(proc) finally: if prev_cwd is not None: os.chdir(prev_cwd) -- cgit v1.2.3