##// END OF EJS Templates
dirstate: pre-indent some of the backup code...
marmoute -
r50896:9313d866 default
parent child Browse files
Show More
@@ -1530,26 +1530,27 b' class dirstate:'
1530 tr.registertmp(filename, location=b'plain')
1530 tr.registertmp(filename, location=b'plain')
1531
1531
1532 self._opener.tryunlink(backupname)
1532 self._opener.tryunlink(backupname)
1533 # hardlink backup is okay because _writedirstate is always called
1533 if True:
1534 # with an "atomictemp=True" file.
1534 # hardlink backup is okay because _writedirstate is always called
1535 util.copyfile(
1535 # with an "atomictemp=True" file.
1536 self._opener.join(filename),
1537 self._opener.join(backupname),
1538 hardlink=True,
1539 )
1540 data_pair = self._new_backup_data_filename(backupname)
1541 if data_pair is not None:
1542 data_filename, bck_data_filename = data_pair
1543 util.copyfile(
1536 util.copyfile(
1544 self._opener.join(data_filename),
1537 self._opener.join(filename),
1545 self._opener.join(bck_data_filename),
1538 self._opener.join(backupname),
1546 hardlink=True,
1539 hardlink=True,
1547 )
1540 )
1548 if tr is not None:
1541 data_pair = self._new_backup_data_filename(backupname)
1549 # ensure that pending file written above is unlinked at
1542 if data_pair is not None:
1550 # failure, even if tr.writepending isn't invoked until the
1543 data_filename, bck_data_filename = data_pair
1551 # end of this transaction
1544 util.copyfile(
1552 tr.registertmp(bck_data_filename, location=b'plain')
1545 self._opener.join(data_filename),
1546 self._opener.join(bck_data_filename),
1547 hardlink=True,
1548 )
1549 if tr is not None:
1550 # ensure that pending file written above is unlinked at
1551 # failure, even if tr.writepending isn't invoked until the
1552 # end of this transaction
1553 tr.registertmp(bck_data_filename, location=b'plain')
1553
1554
1554 def restorebackup(self, tr, backupname):
1555 def restorebackup(self, tr, backupname):
1555 '''Restore dirstate by backup file'''
1556 '''Restore dirstate by backup file'''
General Comments 0
You need to be logged in to leave comments. Login now