Commit25844b8

committed

Fix regex

This catches the case where the matched line contains "(" or ")"characters.

1 parent2f91ab7 commit25844b8Copy full SHA for 25844b8

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,11 @@`
`2`	`2`	`Changelog`
`3`	`3`	`=========`
`4`	`4`
	`5`	`+2.0.5 - Fixes`
	`6`	`+=============`
	`7`	`+`
	`8`	`+* Fix: parser of fetch info lines choked on some legitimate lines`
	`9`	`+`
`5`	`10`	`2.0.4 - Fixes`
`6`	`11`	`=============`
`7`	`12`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ class FetchInfo(object):`
`204`	`204`	`NEW_TAG,NEW_HEAD,HEAD_UPTODATE,TAG_UPDATE,REJECTED,FORCED_UPDATE, \`
`205`	`205`	`FAST_FORWARD,ERROR= [1<<xforxinrange(8)]`
`206`	`206`
`207`		`-re_fetch_result=re.compile("^\s(.) (\[?[\w\s\.$@]+\]?)\s+(.+) -> ([/\w_\+\.\-$@#]+)( $.$?$)?")`
	`207`	`+re_fetch_result=re.compile("^\s(.) (\[?[\w\s\.$@]+\]?)\s+(.+) -> ([/\w_\+\.\-$@#()]+)( $.$?$)?")`
`208`	`208`
`209`	`209`	`_flag_map= {'!':ERROR,`
`210`	`210`	`'+':FORCED_UPDATE,`

Comments

(0)