summaryrefslogtreecommitdiff
path: root/git/repo/base.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2011-06-07 21:25:38 +0200
committerSebastian Thiel <byronimo@gmail.com>2011-06-07 21:25:38 +0200
commit55eb3de3c31fd5d5ad35a8452060ee3be99a2d99 (patch)
tree39d9dd3fc1449f8a7bfe339307560080bcae9d8e /git/repo/base.py
parent863b386e195bb2b609b25614f732b1b502bc79a4 (diff)
downloadgitpython-55eb3de3c31fd5d5ad35a8452060ee3be99a2d99.tar.gz
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)
Diffstat (limited to 'git/repo/base.py')
-rw-r--r--git/repo/base.py21
1 files changed, 11 insertions, 10 deletions
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)