@@ -451,9 +451,9 @@ def clone_progress(line, sep):
451
451
m = re .match (r'(\w+).+?\s+(\d+)/(\d+)\s+.*?' , line )
452
452
if m :
453
453
if m .group (1 ) == "manifests" :
454
- show_progress ('Downloading' , (float (m .group (2 )) / float (m .group (3 ))) * 20 , 80 )
454
+ show_progress ('Downloading' , (float (m .group (2 )) / float (m .group (3 ))) * 20 )
455
455
if m .group (1 ) == "files" :
456
- show_progress ('Downloading' , (float (m .group (2 )) / float (m .group (3 ))) * 100 , 80 )
456
+ show_progress ('Downloading' , (float (m .group (2 )) / float (m .group (3 ))) * 100 )
457
457
458
458
def add (dest ):
459
459
info ("Adding reference \" %s\" " % dest )
@@ -681,9 +681,16 @@ def clone(url, name=None, depth=None, protocol=None):
681
681
hide_progress ()
682
682
683
683
def clone_progress (line , sep ):
684
- m = re .match (r'Receiving objects \:\s*(\d+)% \((\d+)/(\d+)\)' , line )
684
+ m = re .match (r'([\w :]+) \:\s*(\d+)% \((\d+)/(\d+)\)' , line )
685
685
if m :
686
- show_progress ('Downloading' , (float (m .group (2 )) / float (m .group (3 ))) * 100 , 80 )
686
+ if m .group (1 ) == "remote: Compressing objects" and int (m .group (4 )) > 10 :
687
+ show_progress ('Preparing' , (float (m .group (3 )) / float (m .group (4 ))) * 100 )
688
+ if m .group (1 ) == "Receiving objects" :
689
+ show_progress ('Downloading' , (float (m .group (3 )) / float (m .group (4 ))) * 80 )
690
+ if m .group (1 ) == "Resolving deltas" :
691
+ show_progress ('Downloading' , (float (m .group (3 )) / float (m .group (4 ))) * 10 + 80 )
692
+ if m .group (1 ) == "Checking out files" :
693
+ show_progress ('Downloading' , (float (m .group (3 )) / float (m .group (4 ))) * 10 + 90 )
687
694
688
695
def add (dest ):
689
696
info ("Adding reference " + dest )
0 commit comments