Mercurial > hg

changeset 50268:ffdfb1066ac6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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…)
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Mar 2023 15:34:45 +0100
parents f92afdf3cff9
children 05de4896508e 4fafc6642bee
files mercurial/transaction.py
diffstat 1 files changed, 0 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/transaction.py	Thu Mar 02 15:33:04 2023 +0100
+++ b/mercurial/transaction.py	Thu Mar 02 15:34:45 2023 +0100
@@ -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)