Show More
@@ -475,6 +475,9 b' class dirstate:' | |||||
475 | def branch(self): |
|
475 | def branch(self): | |
476 | return encoding.tolocal(self._branch) |
|
476 | return encoding.tolocal(self._branch) | |
477 |
|
477 | |||
|
478 | # XXX since this make the dirstate dirty, we should enforce that it is done | |||
|
479 | # withing an appropriate change-context that scope the change and ensure it | |||
|
480 | # eventually get written on disk (or rolled back) | |||
478 | def setparents(self, p1, p2=None): |
|
481 | def setparents(self, p1, p2=None): | |
479 | """Set dirstate parents to p1 and p2. |
|
482 | """Set dirstate parents to p1 and p2. | |
480 |
|
483 | |||
@@ -532,6 +535,9 b' class dirstate:' | |||||
532 | self._invalidated_context = self._changing_level > 0 |
|
535 | self._invalidated_context = self._changing_level > 0 | |
533 | self._origpl = None |
|
536 | self._origpl = None | |
534 |
|
537 | |||
|
538 | # XXX since this make the dirstate dirty, we should enforce that it is done | |||
|
539 | # withing an appropriate change-context that scope the change and ensure it | |||
|
540 | # eventually get written on disk (or rolled back) | |||
535 | def copy(self, source, dest): |
|
541 | def copy(self, source, dest): | |
536 | """Mark dest as a copy of source. Unmark dest if source is None.""" |
|
542 | """Mark dest as a copy of source. Unmark dest if source is None.""" | |
537 | if source == dest: |
|
543 | if source == dest: | |
@@ -673,6 +679,9 b' class dirstate:' | |||||
673 | parentfiledata=parentfiledata, |
|
679 | parentfiledata=parentfiledata, | |
674 | ) |
|
680 | ) | |
675 |
|
681 | |||
|
682 | # XXX since this make the dirstate dirty, we should enforce that it is done | |||
|
683 | # withing an appropriate change-context that scope the change and ensure it | |||
|
684 | # eventually get written on disk (or rolled back) | |||
676 | def hacky_extension_update_file(self, *args, **kwargs): |
|
685 | def hacky_extension_update_file(self, *args, **kwargs): | |
677 | """NEVER USE THIS, YOU DO NOT NEED IT |
|
686 | """NEVER USE THIS, YOU DO NOT NEED IT | |
678 |
|
687 | |||
@@ -834,10 +843,16 b' class dirstate:' | |||||
834 | return self._normalize(path, isknown, ignoremissing) |
|
843 | return self._normalize(path, isknown, ignoremissing) | |
835 | return path |
|
844 | return path | |
836 |
|
845 | |||
|
846 | # XXX since this make the dirstate dirty, we should enforce that it is done | |||
|
847 | # withing an appropriate change-context that scope the change and ensure it | |||
|
848 | # eventually get written on disk (or rolled back) | |||
837 | def clear(self): |
|
849 | def clear(self): | |
838 | self._map.clear() |
|
850 | self._map.clear() | |
839 | self._dirty = True |
|
851 | self._dirty = True | |
840 |
|
852 | |||
|
853 | # XXX since this make the dirstate dirty, we should enforce that it is done | |||
|
854 | # withing an appropriate change-context that scope the change and ensure it | |||
|
855 | # eventually get written on disk (or rolled back) | |||
841 | def rebuild(self, parent, allfiles, changedfiles=None): |
|
856 | def rebuild(self, parent, allfiles, changedfiles=None): | |
842 | matcher = self._sparsematcher |
|
857 | matcher = self._sparsematcher | |
843 | if matcher is not None and not matcher.always(): |
|
858 | if matcher is not None and not matcher.always(): | |
@@ -1413,6 +1428,9 b' class dirstate:' | |||||
1413 | ) |
|
1428 | ) | |
1414 | return (lookup, status) |
|
1429 | return (lookup, status) | |
1415 |
|
1430 | |||
|
1431 | # XXX since this can make the dirstate dirty (through rust), we should | |||
|
1432 | # enforce that it is done withing an appropriate change-context that scope | |||
|
1433 | # the change and ensure it eventually get written on disk (or rolled back) | |||
1416 | def status(self, match, subrepos, ignored, clean, unknown): |
|
1434 | def status(self, match, subrepos, ignored, clean, unknown): | |
1417 | """Determine the status of the working copy relative to the |
|
1435 | """Determine the status of the working copy relative to the | |
1418 | dirstate and return a pair of (unsure, status), where status is of type |
|
1436 | dirstate and return a pair of (unsure, status), where status is of type |
General Comments 0
You need to be logged in to leave comments.
Login now