@@ -100,12 +100,12 @@ class PushInfo(object):
100
100
NEW_TAG , NEW_HEAD , NO_MATCH , REJECTED , REMOTE_REJECTED , REMOTE_FAILURE , DELETED , \
101
101
FORCED_UPDATE , FAST_FORWARD , UP_TO_DATE , ERROR = [1 << x for x in range (11 )]
102
102
103
- _flag_map = {'X' : NO_MATCH ,
104
- '-' : DELETED ,
103
+ _flag_map = {'X' : NO_MATCH ,
104
+ '-' : DELETED ,
105
105
'*' : 0 ,
106
- '+' : FORCED_UPDATE ,
106
+ '+' : FORCED_UPDATE ,
107
107
' ' : FAST_FORWARD ,
108
- '=' : UP_TO_DATE ,
108
+ '=' : UP_TO_DATE ,
109
109
'!' : ERROR }
110
110
111
111
def __init__ (self , flags , local_ref , remote_ref_string , remote , old_commit = None ,
@@ -208,11 +208,11 @@ class FetchInfo(object):
208
208
# %c %-*s %-*s -> %s (%s)
209
209
re_fetch_result = re .compile ("^\s*(.) (\[?[\w\s\.]+\]?)\s+(.+) -> ([/\w_\+\.\-#]+)( \(.*\)?$)?" )
210
210
211
- _flag_map = {'!' : ERROR ,
212
- '+' : FORCED_UPDATE ,
213
- '-' : TAG_UPDATE ,
211
+ _flag_map = {'!' : ERROR ,
212
+ '+' : FORCED_UPDATE ,
213
+ '-' : TAG_UPDATE ,
214
214
'*' : 0 ,
215
- '=' : HEAD_UPTODATE ,
215
+ '=' : HEAD_UPTODATE ,
216
216
' ' : FAST_FORWARD }
217
217
218
218
def __init__ (self , ref , flags , note = '' , old_commit = None ):
@@ -526,8 +526,8 @@ def _get_fetch_info_from_stderr(self, proc, progress):
526
526
# this also waits for the command to finish
527
527
# Skip some progress lines that don't provide relevant information
528
528
fetch_info_lines = list ()
529
- # Basically we want all fetch info lines which appear to be in regular form, and thus have a
530
- # command character. Everything else we ignore,
529
+ # Basically we want all fetch info lines which appear to be in regular form, and thus have a
530
+ # command character. Everything else we ignore,
531
531
cmds = set (PushInfo ._flag_map .keys ()) & set (FetchInfo ._flag_map .keys ())
532
532
for line in digest_process_messages (proc .stderr , progress ):
533
533
if line .startswith ('fatal:' ):
@@ -547,8 +547,8 @@ def _get_fetch_info_from_stderr(self, proc, progress):
547
547
fp .close ()
548
548
549
549
# NOTE: We assume to fetch at least enough progress lines to allow matching each fetch head line with it.
550
- assert len (fetch_info_lines ) >= len (fetch_head_info ), "len(%s) <= len(%s)" % (fetch_head_info ,
551
- fetch_info_lines )
550
+ assert len (fetch_info_lines ) >= len (fetch_head_info ), "len(%s) <= len(%s)" % (fetch_head_info ,
551
+ fetch_info_lines )
552
552
553
553
output .extend (FetchInfo ._from_line (self .repo , err_line , fetch_line )
554
554
for err_line , fetch_line in zip (fetch_info_lines , fetch_head_info ))
0 commit comments