##// END OF EJS Templates
dirstate: drop the `_updatedfiles` set...
marmoute -
r48871:62188e4d default
parent child Browse files
Show More
@@ -130,7 +130,6 b' class dirstate(object):'
130 130 self._pendingfilename = b'%s.pending' % self._filename
131 131 self._plchangecallbacks = {}
132 132 self._origpl = None
133 self._updatedfiles = set()
134 133 self._mapcls = dirstatemap.dirstatemap
135 134 # Access and cache cwd early, so we don't access it for the first time
136 135 # after a working-copy update caused it to not exist (accessing it then
@@ -410,7 +409,6 b' class dirstate(object):'
410 409 if source:
411 410 copies[f] = source
412 411 self._check_new_tracked_filename(f)
413 self._updatedfiles.add(f)
414 412 self._map.reset_state(
415 413 f,
416 414 p1_tracked=False,
@@ -446,7 +444,6 b' class dirstate(object):'
446 444 delattr(self, a)
447 445 self._lastnormaltime = 0
448 446 self._dirty = False
449 self._updatedfiles.clear()
450 447 self._parentwriters = 0
451 448 self._origpl = None
452 449
@@ -457,10 +454,8 b' class dirstate(object):'
457 454 self._dirty = True
458 455 if source is not None:
459 456 self._map.copymap[dest] = source
460 self._updatedfiles.add(source)
461 self._updatedfiles.add(dest)
462 elif self._map.copymap.pop(dest, None):
463 self._updatedfiles.add(dest)
457 else:
458 self._map.copymap.pop(dest, None)
464 459
465 460 def copied(self, file):
466 461 return self._map.copymap.get(file, None)
@@ -478,7 +473,6 b' class dirstate(object):'
478 473 return True the file was previously untracked, False otherwise.
479 474 """
480 475 self._dirty = True
481 self._updatedfiles.add(filename)
482 476 entry = self._map.get(filename)
483 477 if entry is None or not entry.tracked:
484 478 self._check_new_tracked_filename(filename)
@@ -496,14 +490,12 b' class dirstate(object):'
496 490 ret = self._map.set_untracked(filename)
497 491 if ret:
498 492 self._dirty = True
499 self._updatedfiles.add(filename)
500 493 return ret
501 494
502 495 @requires_no_parents_change
503 496 def set_clean(self, filename, parentfiledata=None):
504 497 """record that the current state of the file on disk is known to be clean"""
505 498 self._dirty = True
506 self._updatedfiles.add(filename)
507 499 if parentfiledata:
508 500 (mode, size, mtime) = parentfiledata
509 501 else:
@@ -521,7 +513,6 b' class dirstate(object):'
521 513 def set_possibly_dirty(self, filename):
522 514 """record that the current state of the file on disk is unknown"""
523 515 self._dirty = True
524 self._updatedfiles.add(filename)
525 516 self._map.set_possibly_dirty(filename)
526 517
527 518 @requires_parents_change
@@ -556,7 +547,6 b' class dirstate(object):'
556 547 if self._map.get(filename) is not None:
557 548 self._map.reset_state(filename)
558 549 self._dirty = True
559 self._updatedfiles.add(filename)
560 550 elif (not p1_tracked) and wc_tracked:
561 551 if entry is not None and entry.added:
562 552 return # avoid dropping copy information (maybe?)
@@ -572,7 +562,6 b' class dirstate(object):'
572 562 if wc_tracked:
573 563 parentfiledata = self._get_filedata(filename)
574 564
575 self._updatedfiles.add(filename)
576 565 self._map.reset_state(
577 566 filename,
578 567 wc_tracked,
@@ -622,7 +611,6 b' class dirstate(object):'
622 611 # this. The test agrees
623 612
624 613 self._dirty = True
625 self._updatedfiles.add(filename)
626 614
627 615 need_parent_file_data = (
628 616 not (possibly_dirty or clean_p2 or merged)
@@ -768,7 +756,6 b' class dirstate(object):'
768 756 def clear(self):
769 757 self._map.clear()
770 758 self._lastnormaltime = 0
771 self._updatedfiles.clear()
772 759 self._dirty = True
773 760
774 761 def rebuild(self, parent, allfiles, changedfiles=None):
@@ -809,10 +796,8 b' class dirstate(object):'
809 796 p1_tracked=True,
810 797 possibly_dirty=True,
811 798 )
812 self._updatedfiles.add(f)
813 799 for f in to_drop:
814 800 self._map.reset_state(f)
815 self._updatedfiles.add(f)
816 801
817 802 self._dirty = True
818 803
@@ -839,9 +824,6 b' class dirstate(object):'
839 824 # record when mtime start to be ambiguous
840 825 now = _getfsnow(self._opener)
841 826
842 # emulate that all 'dirstate.normal' results are written out
843 self._updatedfiles.clear()
844
845 827 # delay writing in-memory changes out
846 828 tr.addfilegenerator(
847 829 b'dirstate',
General Comments 0
You need to be logged in to leave comments. Login now