mercurial/transaction.py
changeset 50268 ffdfb1066ac6
parent 50195 11e6eee4b063
child 50293 5e568d70f54d
equal deleted inserted replaced
50267:f92afdf3cff9 50268:ffdfb1066ac6
   690 
   690 
   691         True if nothing, except temporary files has been writen on disk."""
   691         True if nothing, except temporary files has been writen on disk."""
   692         if entries:
   692         if entries:
   693             return False
   693             return False
   694         for e in self._backupentries:
   694         for e in self._backupentries:
   695             if e[0] == b'plain' and e[1] == b'branch':
       
   696                 # XXX integrate branch to the transaction and get rid of this
       
   697                 # aberration
       
   698                 continue
       
   699             if e[1]:
   695             if e[1]:
   700                 return False
   696                 return False
   701         return True
   697         return True
   702 
   698 
   703     def _do_quick_abort(self, entries):
   699     def _do_quick_abort(self, entries):
   704         """(Silently) do a quick cleanup (see _can_quick_abort)"""
   700         """(Silently) do a quick cleanup (see _can_quick_abort)"""
   705         assert self._can_quick_abort(entries)
   701         assert self._can_quick_abort(entries)
   706         tmp_files = [e for e in self._backupentries if not e[1]]
   702         tmp_files = [e for e in self._backupentries if not e[1]]
   707         for vfs_id, old_path, tmp_path, xxx in tmp_files:
   703         for vfs_id, old_path, tmp_path, xxx in tmp_files:
   708             # XXX integrate branch to the transaction and get rid of this
       
   709             # aberration
       
   710             assert not old_path or old_path == b'branch'
       
   711             vfs = self._vfsmap[vfs_id]
   704             vfs = self._vfsmap[vfs_id]
   712             try:
   705             try:
   713                 vfs.unlink(tmp_path)
   706                 vfs.unlink(tmp_path)
   714             except FileNotFoundError:
   707             except FileNotFoundError:
   715                 pass
   708                 pass