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

Proposed by Colin Watson on 2019-06-13
Status: Merged
Merged at revision: 164
Proposed branch: lp:~cjwatson/brz-loom/breezy-3.0.0
Merge into: lp:brz-loom
Diff against target: 62 lines (+9/-10)
1 file modified
branch.py (+9/-10)
To merge this branch: bzr merge lp:~cjwatson/brz-loom/breezy-3.0.0
Reviewer Review Type Date Requested Status
Jelmer Vernooij 2019-06-13 Approve on 2019-06-13
Review via email: mp+368786@code.launchpad.net

Commit message

Update to Breezy 3.0.0.

Description of the change

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

To post a comment you must log in.
Jelmer Vernooij (jelmer) :
review: Approve
Jelmer Vernooij (jelmer) wrote :

Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'branch.py'
2--- branch.py 2018-05-20 14:06:26 +0000
3+++ branch.py 2019-06-13 16:18:52 +0000
4@@ -33,7 +33,6 @@
5 commit as _mod_commit,
6 controldir,
7 errors,
8- fetch as _mod_fetch,
9 symbol_versioning,
10 trace,
11 ui,
12@@ -42,6 +41,7 @@
13 from breezy.bzr import (
14 branch as _mod_bzrbranch,
15 bzrdir,
16+ fetch as _mod_fetch,
17 inventory as _mod_inventory,
18 inventorytree as _mod_inventorytree,
19 remote,
20@@ -174,27 +174,26 @@
21 self._loom_stream = loom_stream
22 self._loom_sha1 = loom_sha1
23
24- def get_file(self, path, file_id):
25- """Get the content of file_id from this tree.
26+ def get_file(self, path):
27+ """Get the content of 'path' from this tree.
28
29 As usual this must be for the single existing file 'loom'.
30 """
31 return self._loom_stream
32
33- def get_file_with_stat(self, path, file_id=None):
34- return (self.get_file(path, file_id), None)
35+ def get_file_with_stat(self, path):
36+ return (self.get_file(path), None)
37
38- def get_file_sha1(self, path, file_id, stat_value=None):
39+ def get_file_sha1(self, path, stat_value=None):
40 """Get the sha1 for a file.
41
42 This tree only has one file, so it MUST be present!
43 """
44 assert path == 'loom'
45- assert file_id == 'loom_meta_tree'
46 return self._loom_sha1
47
48- def is_executable(self, file_id, path):
49- """get the executable status for file_id.
50+ def is_executable(self, path):
51+ """get the executable status for 'path'.
52
53 Nothing in a LoomMetaTree is executable.
54 """
55@@ -364,7 +363,7 @@
56 if revisionid is empty:, this is a new, empty branch.
57 """
58 tree = self.repository.revision_tree(rev_id)
59- lines = tree.get_file('loom', 'loom_meta_tree').read().split('\n')
60+ lines = tree.get_file('loom').read().split('\n')
61 assert lines[0] == 'Loom meta 1'
62 return lines[1:-1]
63

Subscribers

People subscribed via source and target branches

to all changes: