Show More
@@ -548,6 +548,7 b' class dirstate(object):' | |||||
548 | clean_p1=False, |
|
548 | clean_p1=False, | |
549 | clean_p2=False, |
|
549 | clean_p2=False, | |
550 | possibly_dirty=False, |
|
550 | possibly_dirty=False, | |
|
551 | parentfiledata=None, | |||
551 | ): |
|
552 | ): | |
552 | """update the information about a file in the dirstate |
|
553 | """update the information about a file in the dirstate | |
553 |
|
554 | |||
@@ -583,19 +584,11 b' class dirstate(object):' | |||||
583 | elif possibly_dirty: |
|
584 | elif possibly_dirty: | |
584 | self._addpath(filename, possibly_dirty=possibly_dirty) |
|
585 | self._addpath(filename, possibly_dirty=possibly_dirty) | |
585 | elif wc_tracked: |
|
586 | elif wc_tracked: | |
586 | self.normal(filename) |
|
587 | self.normal(filename, parentfiledata=parentfiledata) | |
587 | # XXX We need something for file that are dirty after an update |
|
588 | # XXX We need something for file that are dirty after an update | |
588 | else: |
|
589 | else: | |
589 | assert False, 'unreachable' |
|
590 | assert False, 'unreachable' | |
590 |
|
591 | |||
591 | @requires_parents_change |
|
|||
592 | def update_parent_file_data(self, f, filedata): |
|
|||
593 | """update the information about the content of a file |
|
|||
594 |
|
||||
595 | This function should be called within a `dirstate.parentchange` context. |
|
|||
596 | """ |
|
|||
597 | self.normal(f, parentfiledata=filedata) |
|
|||
598 |
|
||||
599 | def _addpath( |
|
592 | def _addpath( | |
600 | self, |
|
593 | self, | |
601 | f, |
|
594 | f, |
@@ -801,7 +801,12 b' def recordupdates(repo, actions, branchm' | |||||
801 | ) |
|
801 | ) | |
802 | else: |
|
802 | else: | |
803 | parentfiledata = getfiledata[f] if getfiledata else None |
|
803 | parentfiledata = getfiledata[f] if getfiledata else None | |
804 |
repo.dirstate.update_ |
|
804 | repo.dirstate.update_file( | |
|
805 | f, | |||
|
806 | p1_tracked=True, | |||
|
807 | wc_tracked=True, | |||
|
808 | parentfiledata=parentfiledata, | |||
|
809 | ) | |||
805 |
|
810 | |||
806 | # merge |
|
811 | # merge | |
807 | for f, args, msg in actions.get(ACTION_MERGE, []): |
|
812 | for f, args, msg in actions.get(ACTION_MERGE, []): |
General Comments 0
You need to be logged in to leave comments.
Login now