Commitdb82455

Cory Johns

committed

[#6078]#102 Work-around mergetag blocks by ignoring them

1 parent007bd4b commitdb82455Copy full SHA for db82455

File tree

-1

lines changed

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -426,11 +426,18 @@ def _deserialize(self, stream):`
`426`	`426`	`self.committer,self.committed_date,self.committer_tz_offset=parse_actor_and_date(readline())`
`427`	`427`
`428`	`428`
	`429`	`+# we might run into one or more mergetag blocks, skip those for now`
	`430`	`+next_line=readline()`
	`431`	`+whilenext_line.startswith('mergetag '):`
	`432`	`+next_line=readline()`
	`433`	`+whilenext_line.startswith(' '):`
	`434`	`+next_line=readline()`
	`435`	`+`
`429`	`436`	`# now we can have the encoding line, or an empty line followed by the optional`
`430`	`437`	`# message.`
`431`	`438`	`self.encoding=self.default_encoding`
`432`	`439`	`# read encoding or empty line to separate message`
`433`		`-enc=readline()`
	`440`	`+enc=next_line`
`434`	`441`	`enc=enc.strip()`
`435`	`442`	`ifenc:`
`436`	`443`	`self.encoding=enc[enc.find(' ')+1:]`

Comments

(0)