Merge lp:~cjwatson/brz-loom/breezy-3.0.0 into lp:brz-loom

[Colin Watson]

Update to Breezy 3.0.0.

There were a couple of breaking API changes in Breezy since the initial brz-loom port that didn't get handled.

[Jelmer Vernooij (jelmer)]

review: Approve

[Jelmer Vernooij (jelmer)]

Thanks!

=== modified file 'branch.py'
--- branch.py	2018-05-20 14:06:26 +0000
+++ branch.py	2019-06-13 16:18:52 +0000
@@ -33,7 +33,6 @@
     commit as _mod_commit,
     controldir,
     errors,
-    fetch as _mod_fetch,
     symbol_versioning,
     trace,
     ui,
@@ -42,6 +41,7 @@
 from breezy.bzr import (
     branch as _mod_bzrbranch,
     bzrdir,
+    fetch as _mod_fetch,
     inventory as _mod_inventory,
     inventorytree as _mod_inventorytree,
     remote,
@@ -174,27 +174,26 @@
         self._loom_stream = loom_stream
         self._loom_sha1 = loom_sha1
     
-    def get_file(self, path, file_id):
-        """Get the content of file_id from this tree.
+    def get_file(self, path):
+        """Get the content of 'path' from this tree.
 
         As usual this must be for the single existing file 'loom'.
         """
         return self._loom_stream
 
-    def get_file_with_stat(self, path, file_id=None):
-        return (self.get_file(path, file_id), None)
+    def get_file_with_stat(self, path):
+        return (self.get_file(path), None)
 
-    def get_file_sha1(self, path, file_id, stat_value=None):
+    def get_file_sha1(self, path, stat_value=None):
         """Get the sha1 for a file. 
 
         This tree only has one file, so it MUST be present!
         """
         assert path == 'loom'
-        assert file_id == 'loom_meta_tree'
         return self._loom_sha1
 
-    def is_executable(self, file_id, path):
-        """get the executable status for file_id.
+    def is_executable(self, path):
+        """get the executable status for 'path'.
         
         Nothing in a LoomMetaTree is executable.
         """
@@ -364,7 +363,7 @@
         if revisionid is empty:, this is a new, empty branch.
         """
         tree = self.repository.revision_tree(rev_id)
-        lines = tree.get_file('loom', 'loom_meta_tree').read().split('\n')
+        lines = tree.get_file('loom').read().split('\n')
         assert lines[0] == 'Loom meta 1'
         return lines[1:-1]