Show More
@@ -594,6 +594,48 b' class dirstate:' | |||||
594 | depending of what information ends up being relevant and useful to |
|
594 | depending of what information ends up being relevant and useful to | |
595 | other processing. |
|
595 | other processing. | |
596 | """ |
|
596 | """ | |
|
597 | self._update_file( | |||
|
598 | filename=filename, | |||
|
599 | wc_tracked=wc_tracked, | |||
|
600 | p1_tracked=p1_tracked, | |||
|
601 | p2_info=p2_info, | |||
|
602 | possibly_dirty=possibly_dirty, | |||
|
603 | parentfiledata=parentfiledata, | |||
|
604 | ) | |||
|
605 | ||||
|
606 | def hacky_extension_update_file(self, *args, **kwargs): | |||
|
607 | """NEVER USE THIS, YOU DO NOT NEED IT | |||
|
608 | ||||
|
609 | This function is a variant of "update_file" to be called by a small set | |||
|
610 | of extensions, it also adjust the internal state of file, but can be | |||
|
611 | called outside an `changing_parents` context. | |||
|
612 | ||||
|
613 | A very small number of extension meddle with the working copy content | |||
|
614 | in a way that requires to adjust the dirstate accordingly. At the time | |||
|
615 | this command is written they are : | |||
|
616 | - keyword, | |||
|
617 | - largefile, | |||
|
618 | PLEASE DO NOT GROW THIS LIST ANY FURTHER. | |||
|
619 | ||||
|
620 | This function could probably be replaced by more semantic one (like | |||
|
621 | "adjust expected size" or "always revalidate file content", etc) | |||
|
622 | however at the time where this is writen, this is too much of a detour | |||
|
623 | to be considered. | |||
|
624 | """ | |||
|
625 | self._update_file( | |||
|
626 | *args, | |||
|
627 | **kwargs, | |||
|
628 | ) | |||
|
629 | ||||
|
630 | def _update_file( | |||
|
631 | self, | |||
|
632 | filename, | |||
|
633 | wc_tracked, | |||
|
634 | p1_tracked, | |||
|
635 | p2_info=False, | |||
|
636 | possibly_dirty=False, | |||
|
637 | parentfiledata=None, | |||
|
638 | ): | |||
597 |
|
639 | |||
598 | # note: I do not think we need to double check name clash here since we |
|
640 | # note: I do not think we need to double check name clash here since we | |
599 | # are in a update/merge case that should already have taken care of |
|
641 | # are in a update/merge case that should already have taken care of |
General Comments 0
You need to be logged in to leave comments.
Login now