Michał Górny avatar Michał Górny committed b344362

Start refactoring cache code.

Comments (0)

Files changed (1)

smartliverebuild/vcs/__init__.py

 	def __call__(self, blocking = False):
 		""" Perform a single main loop iteration. """
 		if not self._running:
-			# try the cache
-			if self._cache is not None:
-				try:
-					rev = self._cache[str(self)]
-				except KeyError:
-					pass
-				else:
-					return self._finishupdate(rev)
-
-			self._startupdate()
-			self._running = True
-			if blocking:
-				return self._endupdate(True)
-			return None
+			rev = self._cache.get(str(self)) if self._cache is not None else None
+
+			if rev is None:
+				self._startupdate()
+				self._running = True
+				if blocking:
+					return self._endupdate(True)
+				return None
+			else:
+				return self._finishupdate(rev)
 		else:
 			return self._endupdate()
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.