Skip to content
Snippets Groups Projects
Commit ffdfb106 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

transaction: drive the aberratant branch special case away

shoo shoo shoo shoo.

Happy to remove this awful special case (that I introduced myself last week…)
parent f92afdf3
No related branches found
No related tags found
2 merge requests!485branching: merge default into stable,!483cleanup branch hack in the transaction.
......@@ -692,10 +692,6 @@
if entries:
return False
for e in self._backupentries:
if e[0] == b'plain' and e[1] == b'branch':
# XXX integrate branch to the transaction and get rid of this
# aberration
continue
if e[1]:
return False
return True
......@@ -705,9 +701,6 @@
assert self._can_quick_abort(entries)
tmp_files = [e for e in self._backupentries if not e[1]]
for vfs_id, old_path, tmp_path, xxx in tmp_files:
# XXX integrate branch to the transaction and get rid of this
# aberration
assert not old_path or old_path == b'branch'
vfs = self._vfsmap[vfs_id]
try:
vfs.unlink(tmp_path)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment