Amend license, update docs, remove dict comprehension.

Author: pelmers

LICENSE

@@ -22,3 +22,9 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
+
+
+Addendum: The files under dxr/hgext are distributed under GPL version 2, in
+conformance with Mercurial's license (1) as a derived work.
+
+1. https://mercurial.selenic.com/wiki/License

docs/source/development.rst

@@ -124,7 +124,7 @@ Coding Conventions
 
 Follow `PEP 8`_ for Python code, but don't sweat the line length too much.
 Follow `PEP 257`_ for docstrings, and use Sphinx-style argument documentation.
-Single quotes are preferred for strings; use double quotes for docstrings and
+Single quotes are preferred for strings; use 3 double quotes for docstrings and
 multiline strings or if the string contains a single quote.
 
 .. _PEP 8: http://www.python.org/dev/peps/pep-0008/

docs/source/indexing-firefox.rst

@@ -9,11 +9,11 @@ from which Firefox is built.
 Increase Your RAM
 =================
 
-Increase the RAM on your VM. 6GB seems to suffice.
+Increase the RAM on your VM. 7GB seems to suffice.
 
 1. Copy :file:`vagrantconfig_local.yaml-dist` to a new file, calling it
    :file:`vagrantconfig_local.yaml`.
-2. Put ``memory: 6000`` in it.
+2. Put ``memory: 7000`` in it.
 
 Embiggen Your Drive
 ===================

dxr/app.py

@@ -60,8 +60,8 @@ def make_app(config):
     app.es = ElasticSearch(config.es_hosts)
 
     # Construct map of each tree to its VCS tree object.
-    app.vcs_trees = {tree: VcsTree(tree_config) for tree, tree_config in
-                     config.trees.iteritems()}
+    app.vcs_trees = dict((tree, VcsTree(tree_config)) for tree, tree_config in
+                         config.trees.iteritems())
 
     return app
 

dxr/vcs.py

@@ -308,7 +308,7 @@ def vcs_for_path(self, path):
         :arg string path: a path to a file (not a folder)
         """
         if path in self._path_cache:
-            return self._path_cache
+            return self._path_cache[path]
         abs_path = join(self.tree.source_folder, path)
         for directory, vcs in self.repos.iteritems():
             # This seems to be the easiest way to find "is abs_path in the subtree