Show More
@@ -99,9 +99,6 b' class basectx(object):' | |||||
99 | For example, this allows other contexts, such as workingctx, to query |
|
99 | For example, this allows other contexts, such as workingctx, to query | |
100 | the dirstate before comparing the manifests. |
|
100 | the dirstate before comparing the manifests. | |
101 | """ |
|
101 | """ | |
102 | # load earliest manifest first for caching reasons |
|
|||
103 | if self.rev() < other.rev(): |
|
|||
104 | self.manifest() |
|
|||
105 | return s |
|
102 | return s | |
106 |
|
103 | |||
107 | def _poststatus(self, other, s, match, listignored, listclean, listunknown): |
|
104 | def _poststatus(self, other, s, match, listignored, listclean, listunknown): | |
@@ -115,6 +112,9 b' class basectx(object):' | |||||
115 | def _buildstatus(self, other, s, match, listignored, listclean, |
|
112 | def _buildstatus(self, other, s, match, listignored, listclean, | |
116 | listunknown): |
|
113 | listunknown): | |
117 | """build a status with respect to another context""" |
|
114 | """build a status with respect to another context""" | |
|
115 | # load earliest manifest first for caching reasons | |||
|
116 | if self.rev() is not None and self.rev() < other.rev(): | |||
|
117 | self.manifest() | |||
118 | mf1 = other._manifestmatches(match, s) |
|
118 | mf1 = other._manifestmatches(match, s) | |
119 | mf2 = self._manifestmatches(match, s) |
|
119 | mf2 = self._manifestmatches(match, s) | |
120 |
|
120 | |||
@@ -1416,9 +1416,7 b' class workingctx(committablectx):' | |||||
1416 | We use this _prestatus hook to populate the status with information from |
|
1416 | We use this _prestatus hook to populate the status with information from | |
1417 | the dirstate. |
|
1417 | the dirstate. | |
1418 | """ |
|
1418 | """ | |
1419 |
# doesn't need to call super |
|
1419 | # doesn't need to call super | |
1420 | # calls self.manifest which would slow down the common case of calling |
|
|||
1421 | # status against a workingctx's parent |
|
|||
1422 | return self._dirstatestatus(match, listignored, listclean, listunknown) |
|
1420 | return self._dirstatestatus(match, listignored, listclean, listunknown) | |
1423 |
|
1421 | |||
1424 | def _poststatus(self, other, s, match, listignored, listclean, listunknown): |
|
1422 | def _poststatus(self, other, s, match, listignored, listclean, listunknown): |
General Comments 0
You need to be logged in to leave comments.
Login now