Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit36a9848

Browse files
committed
Merge branch 'progress'
2 parentsdfe3ba3 +ab5b6af commit36a9848

File tree

3 files changed

+86
-51
lines changed

3 files changed

+86
-51
lines changed

‎git/remote.py‎

Lines changed: 60 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
TagReference
2525
)
2626

27-
fromgit.utilimportjoin_path
27+
fromgit.utilimportjoin_path
2828
fromgitdb.utilimportjoin
2929

3030
importre
@@ -33,6 +33,58 @@
3333

3434
__all__= ('RemoteProgress','PushInfo','FetchInfo','Remote')
3535

36+
#{ Utilities
37+
38+
defdigest_process_messages(fh,progress):
39+
"""Read progress messages from file-like object fh, supplying the respective
40+
progress messages to the progress instance.
41+
42+
:param fh: File handle to read from
43+
:return: list(line, ...) list of lines without linebreaks that did
44+
not contain progress information"""
45+
line_so_far=''
46+
dropped_lines=list()
47+
whileTrue:
48+
char=fh.read(1)
49+
ifnotchar:
50+
break
51+
52+
ifcharin ('\r','\n'):
53+
dropped_lines.extend(progress._parse_progress_line(line_so_far))
54+
line_so_far=''
55+
else:
56+
line_so_far+=char
57+
# END process parsed line
58+
# END while file is not done reading
59+
returndropped_lines
60+
61+
deffinalize_process(proc):
62+
"""Wait for the process (clone, fetch, pull or push) and handle its errors accordingly"""
63+
try:
64+
proc.wait()
65+
exceptGitCommandError,e:
66+
# if a push has rejected items, the command has non-zero return status
67+
# a return status of 128 indicates a connection error - reraise the previous one
68+
ifproc.poll()==128:
69+
raise
70+
pass
71+
# END exception handling
72+
73+
defadd_progress(kwargs,git,progress):
74+
"""Add the --progress flag to the given kwargs dict if supported by the
75+
git command. If the actual progress in the given progress instance is not
76+
given, we do not request any progress
77+
:return: possibly altered kwargs"""
78+
ifprogressisnotNone:
79+
v=git.version_info
80+
ifv[0]>1orv[1]>7orv[2]>0orv[3]>3:
81+
kwargs['progress']=True
82+
#END handle --progress
83+
#END handle progress
84+
returnkwargs
85+
86+
#} END utilities
87+
3688

3789
classPushInfo(object):
3890
"""
@@ -432,42 +484,6 @@ def update(self, **kwargs):
432484
self.repo.git.remote("update",self.name)
433485
returnself
434486

435-
def_digest_process_messages(self,fh,progress):
436-
"""Read progress messages from file-like object fh, supplying the respective
437-
progress messages to the progress instance.
438-
439-
:return: list(line, ...) list of lines without linebreaks that did
440-
not contain progress information"""
441-
line_so_far=''
442-
dropped_lines=list()
443-
whileTrue:
444-
char=fh.read(1)
445-
ifnotchar:
446-
break
447-
448-
ifcharin ('\r','\n'):
449-
dropped_lines.extend(progress._parse_progress_line(line_so_far))
450-
line_so_far=''
451-
else:
452-
line_so_far+=char
453-
# END process parsed line
454-
# END while file is not done reading
455-
returndropped_lines
456-
457-
458-
def_finalize_proc(self,proc):
459-
"""Wait for the process (fetch, pull or push) and handle its errors accordingly"""
460-
try:
461-
proc.wait()
462-
exceptGitCommandError,e:
463-
# if a push has rejected items, the command has non-zero return status
464-
# a return status of 128 indicates a connection error - reraise the previous one
465-
ifproc.poll()==128:
466-
raise
467-
pass
468-
# END exception handling
469-
470-
471487
def_get_fetch_info_from_stderr(self,proc,progress):
472488
# skip first line as it is some remote info we are not interested in
473489
output=IterableList('name')
@@ -477,7 +493,7 @@ def _get_fetch_info_from_stderr(self, proc, progress):
477493
# this also waits for the command to finish
478494
# Skip some progress lines that don't provide relevant information
479495
fetch_info_lines=list()
480-
forlineinself._digest_process_messages(proc.stderr,progress):
496+
forlineindigest_process_messages(proc.stderr,progress):
481497
ifline.startswith('From')orline.startswith('remote: Total'):
482498
continue
483499
elifline.startswith('warning:'):
@@ -499,15 +515,15 @@ def _get_fetch_info_from_stderr(self, proc, progress):
499515
output.extend(FetchInfo._from_line(self.repo,err_line,fetch_line)
500516
forerr_line,fetch_lineinzip(fetch_info_lines,fetch_head_info))
501517

502-
self._finalize_proc(proc)
518+
finalize_process(proc)
503519
returnoutput
504520

505521
def_get_push_info(self,proc,progress):
506522
# read progress information from stderr
507523
# we hope stdout can hold all the data, it should ...
508524
# read the lines manually as it will use carriage returns between the messages
509525
# to override the previous one. This is why we read the bytes manually
510-
self._digest_process_messages(proc.stderr,progress)
526+
digest_process_messages(proc.stderr,progress)
511527

512528
output=IterableList('name')
513529
forlineinproc.stdout.readlines():
@@ -519,7 +535,7 @@ def _get_push_info(self, proc, progress):
519535
# END exception handling
520536
# END for each line
521537

522-
self._finalize_proc(proc)
538+
finalize_process(proc)
523539
returnoutput
524540

525541

@@ -546,6 +562,7 @@ def fetch(self, refspec=None, progress=None, **kwargs):
546562
:note:
547563
As fetch does not provide progress information to non-ttys, we cannot make
548564
it available here unfortunately as in the 'push' method."""
565+
kwargs=add_progress(kwargs,self.repo.git,progress)
549566
proc=self.repo.git.fetch(self,refspec,with_extended_output=True,as_process=True,v=True,**kwargs)
550567
returnself._get_fetch_info_from_stderr(proc,progressorRemoteProgress())
551568

@@ -557,6 +574,7 @@ def pull(self, refspec=None, progress=None, **kwargs):
557574
:param progress: see 'push' method
558575
:param kwargs: Additional arguments to be passed to git-pull
559576
:return: Please see 'fetch' method """
577+
kwargs=add_progress(kwargs,self.repo.git,progress)
560578
proc=self.repo.git.pull(self,refspec,with_extended_output=True,as_process=True,v=True,**kwargs)
561579
returnself._get_fetch_info_from_stderr(proc,progressorRemoteProgress())
562580

@@ -578,6 +596,7 @@ def push(self, refspec=None, progress=None, **kwargs):
578596
in their flags.
579597
If the operation fails completely, the length of the returned IterableList will
580598
be null."""
599+
kwargs=add_progress(kwargs,self.repo.git,progress)
581600
proc=self.repo.git.push(self,refspec,porcelain=True,as_process=True,**kwargs)
582601
returnself._get_push_info(proc,progressorRemoteProgress())
583602

‎git/repo/base.py‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,18 @@
1111
fromgit.indeximportIndexFile
1212
fromgit.objectsimport*
1313
fromgit.configimportGitConfigParser
14-
fromgit.remoteimportRemote
14+
fromgit.remoteimport (
15+
Remote,
16+
digest_process_messages,
17+
finalize_process,
18+
add_progress
19+
)
20+
1521
fromgit.dbimport (
1622
GitCmdObjectDB,
1723
GitDB
1824
)
1925

20-
2126
fromgitdb.utilimport (
2227
join,
2328
isfile,
@@ -652,7 +657,7 @@ def init(cls, path=None, mkdir=True, **kwargs):
652657
returnRepo(path)
653658

654659
@classmethod
655-
def_clone(cls,git,url,path,odb_default_type,**kwargs):
660+
def_clone(cls,git,url,path,odb_default_type,progress,**kwargs):
656661
# special handling for windows for path at which the clone should be
657662
# created.
658663
# tilde '~' will be expanded to the HOME no matter where the ~ occours. Hence
@@ -679,7 +684,11 @@ def _clone(cls, git, url, path, odb_default_type, **kwargs):
679684
# END windows handling
680685

681686
try:
682-
git.clone(url,path,**kwargs)
687+
proc=git.clone(url,path,with_extended_output=True,as_process=True,v=True,**add_progress(kwargs,git,progress))
688+
ifprogress:
689+
digest_process_messages(proc.stderr,progress)
690+
#END handle progress
691+
finalize_process(proc)
683692
finally:
684693
ifprev_cwdisnotNone:
685694
os.chdir(prev_cwd)
@@ -703,28 +712,31 @@ def _clone(cls, git, url, path, odb_default_type, **kwargs):
703712
# END handle remote repo
704713
returnrepo
705714

706-
defclone(self,path,**kwargs):
715+
defclone(self,path,progress=None,**kwargs):
707716
"""Create a clone from this repository.
708717
:param path:
709718
is the full path of the new repo (traditionally ends with ./<name>.git).
710719
720+
:param progress: See 'git.remote.Remote.push'.
721+
711722
:param kwargs:
712723
odbt = ObjectDatabase Type, allowing to determine the object database
713724
implementation used by the returned Repo instance
714725
715726
All remaining keyword arguments are given to the git-clone command
716727
717728
:return: ``git.Repo`` (the newly cloned repo)"""
718-
returnself._clone(self.git,self.git_dir,path,type(self.odb),**kwargs)
729+
returnself._clone(self.git,self.git_dir,path,type(self.odb),progress,**kwargs)
719730

720731
@classmethod
721-
defclone_from(cls,url,to_path,**kwargs):
732+
defclone_from(cls,url,to_path,progress=None,**kwargs):
722733
"""Create a clone from the given URL
723734
:param url: valid git url, see http://www.kernel.org/pub/software/scm/git/docs/git-clone.html#URLS
724735
:param to_path: Path to which the repository should be cloned to
736+
:param progress: See 'git.remote.Remote.push'.
725737
:param kwargs: see the ``clone`` method
726738
:return: Repo instance pointing to the cloned directory"""
727-
returncls._clone(Git(os.getcwd()),url,to_path,GitCmdObjectDB,**kwargs)
739+
returncls._clone(Git(os.getcwd()),url,to_path,GitCmdObjectDB,progress,**kwargs)
728740

729741
defarchive(self,ostream,treeish=None,prefix=None,**kwargs):
730742
"""Archive the tree at the given revision.

‎git/util.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ class RemoteProgress(object):
109109
Handler providing an interface to parse progress information emitted by git-push
110110
and git-fetch and to dispatch callbacks allowing subclasses to react to the progress.
111111
"""
112-
_num_op_codes=5
113-
BEGIN,END,COUNTING,COMPRESSING,WRITING= [1<<xforxinrange(_num_op_codes)]
112+
_num_op_codes=7
113+
BEGIN,END,COUNTING,COMPRESSING,WRITING,RECEIVING,RESOLVING= [1<<xforxinrange(_num_op_codes)]
114114
STAGE_MASK=BEGIN|END
115115
OP_MASK=~STAGE_MASK
116116

@@ -168,6 +168,10 @@ def _parse_progress_line(self, line):
168168
op_code|=self.COMPRESSING
169169
elifop_name=="Writing objects":
170170
op_code|=self.WRITING
171+
elifop_name=='Receiving objects':
172+
op_code|=self.RECEIVING
173+
elifop_name=='Resolving deltas':
174+
op_code|=self.RESOLVING
171175
else:
172176
raiseValueError("Operation name %r unknown"%op_name)
173177

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp