##// END OF EJS Templates
committablectx: simplify caching the status...
Sean Farley -
r21592:16f62b42 default
parent child Browse files
Show More
@@ -892,14 +892,7 b' class committablectx(basectx):'
892 if user:
892 if user:
893 self._user = user
893 self._user = user
894 if changes:
894 if changes:
895 self._status = list(changes[:4])
895 self._status = changes
896 self._unknown = changes[4]
897 self._ignored = changes[5]
898 self._clean = changes[6]
899 else:
900 self._unknown = None
901 self._ignored = None
902 self._clean = None
903
896
904 self._extra = {}
897 self._extra = {}
905 if extra:
898 if extra:
@@ -974,7 +967,7 b' class committablectx(basectx):'
974
967
975 copied = self._repo.dirstate.copies()
968 copied = self._repo.dirstate.copies()
976 ff = self._flagfunc
969 ff = self._flagfunc
977 modified, added, removed, deleted = self._status
970 modified, added, removed, deleted = self._status[:4]
978 for i, l in (("a", added), ("m", modified)):
971 for i, l in (("a", added), ("m", modified)):
979 for f in l:
972 for f in l:
980 orig = copied.get(f, f)
973 orig = copied.get(f, f)
@@ -992,7 +985,7 b' class committablectx(basectx):'
992
985
993 @propertycache
986 @propertycache
994 def _status(self):
987 def _status(self):
995 return self._repo.status()[:4]
988 return self._repo.status()
996
989
997 @propertycache
990 @propertycache
998 def _user(self):
991 def _user(self):
@@ -1023,14 +1016,11 b' class committablectx(basectx):'
1023 def deleted(self):
1016 def deleted(self):
1024 return self._status[3]
1017 return self._status[3]
1025 def unknown(self):
1018 def unknown(self):
1026 assert self._unknown is not None # must call status first
1019 return self._status[4]
1027 return self._unknown
1028 def ignored(self):
1020 def ignored(self):
1029 assert self._ignored is not None # must call status first
1021 return self._status[5]
1030 return self._ignored
1031 def clean(self):
1022 def clean(self):
1032 assert self._clean is not None # must call status first
1023 return self._status[6]
1033 return self._clean
1034 def branch(self):
1024 def branch(self):
1035 return encoding.tolocal(self._extra['branch'])
1025 return encoding.tolocal(self._extra['branch'])
1036 def closesbranch(self):
1026 def closesbranch(self):
@@ -1395,20 +1385,10 b' class workingctx(committablectx):'
1395 listignored, listclean, listunknown = ignored, clean, unknown
1385 listignored, listclean, listunknown = ignored, clean, unknown
1396 s = self._dirstatestatus(match=match, ignored=listignored,
1386 s = self._dirstatestatus(match=match, ignored=listignored,
1397 clean=listclean, unknown=listunknown)
1387 clean=listclean, unknown=listunknown)
1398 modified, added, removed, deleted, unknown, ignored, clean = s
1399
1388
1400 modified = self._filtersuspectsymlink(modified)
1389 s[0] = self._filtersuspectsymlink(s[0])
1401
1390 self._status = s
1402 self._unknown = self._ignored = self._clean = None
1391 return s
1403 if listunknown:
1404 self._unknown = unknown
1405 if listignored:
1406 self._ignored = ignored
1407 if listclean:
1408 self._clean = clean
1409 self._status = modified, added, removed, deleted
1410
1411 return modified, added, removed, deleted, unknown, ignored, clean
1412
1392
1413
1393
1414 class committablefilectx(basefilectx):
1394 class committablefilectx(basefilectx):
General Comments 0
You need to be logged in to leave comments. Login now