Commitd40320b

authored

Merge pull request#1675 from EliahKagan/rollback

Fix rollback bug in SymbolicReference.set_reference

2 parentsd1c1f31 +e480985 commitd40320bCopy full SHA for d40320b

File tree

+15

-21

lines changed

+15

-21

lines changed

Lines changed: 8 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -406,15 +406,14 @@ def release(self) -> None:`
`406`	`406`	`return`
`407`	`407`
`408`	`408`	`try:`
`409`		`-try:`
`410`		`-self.write()`
`411`		`-exceptIOError:`
`412`		`-log.error("Exception during destruction of GitConfigParser",exc_info=True)`
`413`		`-exceptReferenceError:`
`414`		`-# This happens in PY3 ... and usually means that some state cannot be written`
`415`		`-# as the sections dict cannot be iterated`
`416`		`-# Usually when shutting down the interpreter, don'y know how to fix this`
`417`		`-pass`
	`409`	`+self.write()`
	`410`	`+exceptIOError:`
	`411`	`+log.error("Exception during destruction of GitConfigParser",exc_info=True)`
	`412`	`+exceptReferenceError:`
	`413`	`+# This happens in PY3 ... and usually means that some state cannot be`
	`414`	`+# written as the sections dict cannot be iterated`
	`415`	`+# Usually when shutting down the interpreter, don't know how to fix this`
	`416`	`+pass`
`418`	`417`	`finally:`
`419`	`418`	`ifself._lockisnotNone:`
`420`	`419`	`self._lock._release_lock()`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -224,13 +224,11 @@ def write(`
`224`	`224`	`lfd=LockedFD(file_pathorself._file_path)`
`225`	`225`	`stream=lfd.open(write=True,stream=True)`
`226`	`226`
`227`		`-ok=False`
`228`	`227`	`try:`
`229`	`228`	`self._serialize(stream,ignore_extension_data)`
`230`		`-ok=True`
`231`		`-finally:`
`232`		`-ifnotok:`
`233`		`-lfd.rollback()`
	`229`	`+exceptBaseException:`
	`230`	`+lfd.rollback()`
	`231`	`+raise`
`234`	`232`
`235`	`233`	`lfd.commit()`
`236`	`234`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,7 @@ def to_file(self, filepath: PathLike) -> None:`
`262`	`262`	`try:`
`263`	`263`	`self._serialize(fp)`
`264`	`264`	`lfd.commit()`
`265`		`-exceptException:`
`266`		`-# on failure it rolls back automatically, but we make it clear`
	`265`	`+exceptBaseException:`
`267`	`266`	`lfd.rollback()`
`268`	`267`	`raise`
`269`	`268`	`# END handle change`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -370,14 +370,12 @@ def set_reference(`
`370`	`370`
`371`	`371`	`lfd=LockedFD(fpath)`
`372`	`372`	`fd=lfd.open(write=True,stream=True)`
`373`		`-ok=True`
`374`	`373`	`try:`
`375`	`374`	`fd.write(write_value.encode("utf-8")+b"\n")`
`376`	`375`	`lfd.commit()`
`377`		`-ok=True`
`378`		`-finally:`
`379`		`-ifnotok:`
`380`		`-lfd.rollback()`
	`376`	`+exceptBaseException:`
	`377`	`+lfd.rollback()`
	`378`	`+raise`
`381`	`379`	`# Adjust the reflog`
`382`	`380`	`iflogmsgisnotNone:`
`383`	`381`	`self.log_append(oldbinsha,logmsg)`

Comments

(0)