Commit2af601d

authored

Merge pull request#649 from OddBloke/hide_re_fetch_result

FetchInfo.re_fetch_result has no reason to be public

2 parents8ef53c5 +0ef12ae commit2af601dCopy full SHA for 2af601d

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ class FetchInfo(object):`
`209`	`209`	`NEW_TAG,NEW_HEAD,HEAD_UPTODATE,TAG_UPDATE,REJECTED,FORCED_UPDATE, \`
`210`	`210`	`FAST_FORWARD,ERROR= [1<<xforxinrange(8)]`
`211`	`211`
`212`		`-re_fetch_result=re.compile(r'^\s(.) (\[?[\w\s\.$@]+\]?)\s+(.+) -> ([^\s]+)( $.$?$)?')`
	`212`	`+_re_fetch_result=re.compile(r'^\s(.) (\[?[\w\s\.$@]+\]?)\s+(.+) -> ([^\s]+)( $.$?$)?')`
`213`	`213`
`214`	`214`	`_flag_map= {'!':ERROR,`
`215`	`215`	`'+':FORCED_UPDATE,`
`@@ -264,7 +264,7 @@ def _from_line(cls, repo, line, fetch_line):`
`264`	`264`
`265`	`265`	`fetch line is the corresponding line from FETCH_HEAD, like`
`266`	`266`	`acb0fa8b94ef421ad60c8507b634759a472cd56c not-for-merge branch '0.1.7RC' of /tmp/tmpya0vairemote_repo"""`
`267`		`-match=cls.re_fetch_result.match(line)`
	`267`	`+match=cls._re_fetch_result.match(line)`
`268`	`268`	`ifmatchisNone:`
`269`	`269`	`raiseValueError("Failed to parse line: %r"%line)`
`270`	`270`

Comments

(0)