Breezy

Merge lp:~jelmer/brz/get-delta-no-file-ids into lp:brz

  1. get-delta-no-file-ids
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/get-delta-no-file-ids
Merge into: lp:brz
Diff against target: 112 lines (+20/-21)
3 files modified
breezy/bzr/remote.py (+2/-3)
breezy/repository.py (+2/-7)
breezy/tests/per_repository/test_repository.py (+16/-11)
To merge this branch: bzr merge lp:~jelmer/brz/get-delta-no-file-ids
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+369482@code.launchpad.net

Commit message

Remove specific_fileids argument from Repository.get_revision_delta.

Description of the change

Remove specific_fileids argument from Repository.get_revision_delta.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/468/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/bzr/remote.py'
2--- breezy/bzr/remote.py 2019-06-22 11:51:56 +0000
3+++ breezy/bzr/remote.py 2019-08-11 13:36:47 +0000
4@@ -2585,11 +2585,10 @@
5 old_tree = trees[revision.parent_ids[0]]
6 yield trees[revision.revision_id].changes_from(old_tree)
7
8- def get_revision_delta(self, revision_id, specific_fileids=None):
9+ def get_revision_delta(self, revision_id):
10 with self.lock_read():
11 r = self.get_revision(revision_id)
12- return list(self.get_deltas_for_revisions([r],
13- specific_fileids=specific_fileids))[0]
14+ return list(self.get_deltas_for_revisions([r]))[0]
15
16 def revision_trees(self, revision_ids):
17 with self.lock_read():
18
19=== modified file 'breezy/repository.py'
20--- breezy/repository.py 2019-07-27 22:47:49 +0000
21+++ breezy/repository.py 2019-08-11 13:36:47 +0000
22@@ -889,20 +889,15 @@
23 """
24 raise NotImplementedError(self.get_deltas_for_revisions)
25
26- def get_revision_delta(self, revision_id, specific_fileids=None):
27+ def get_revision_delta(self, revision_id):
28 """Return the delta for one revision.
29
30 The delta is relative to the left-hand predecessor of the
31 revision.
32-
33- :param specific_fileids: if not None, the result is filtered
34- so that only those file-ids, their parents and their
35- children are included.
36 """
37 with self.lock_read():
38 r = self.get_revision(revision_id)
39- return list(self.get_deltas_for_revisions(
40- [r], specific_fileids=specific_fileids))[0]
41+ return list(self.get_deltas_for_revisions([r]))[0]
42
43 def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
44 raise NotImplementedError(self.store_revision_signature)
45
46=== modified file 'breezy/tests/per_repository/test_repository.py'
47--- breezy/tests/per_repository/test_repository.py 2019-07-25 23:22:30 +0000
48+++ breezy/tests/per_repository/test_repository.py 2019-08-11 13:36:47 +0000
49@@ -1012,13 +1012,14 @@
50 self.tree_a.add('bar/b3')
51 self.rev2 = self.tree_a.commit('rev2')
52 self.repository = self.tree_a.branch.repository
53+ self.addCleanup(self.repository.lock_read().unlock)
54
55 def test_multiple_files(self):
56 # Test multiple files
57- delta = self.repository.get_revision_delta(
58- self.rev1, specific_fileids=[
59+ delta = list(self.repository.get_deltas_for_revisions(
60+ [self.repository.get_revision(self.rev1)], specific_fileids=[
61 self.tree_a.path2id('foo'),
62- self.tree_a.path2id('baz')])
63+ self.tree_a.path2id('baz')]))[0]
64 self.assertIsInstance(delta, _mod_delta.TreeDelta)
65 self.assertEqual([
66 ('baz', self.tree_a.path2id('baz'), 'file'),
67@@ -1027,8 +1028,9 @@
68
69 def test_directory(self):
70 # Test a directory
71- delta = self.repository.get_revision_delta(
72- self.rev1, specific_fileids=[self.bar_id])
73+ delta = list(self.repository.get_deltas_for_revisions(
74+ [self.repository.get_revision(self.rev1)],
75+ specific_fileids=[self.bar_id]))[0]
76 self.assertIsInstance(delta, _mod_delta.TreeDelta)
77 self.assertEqual([
78 ('bar', self.tree_a.path2id('bar'), 'directory'),
79@@ -1038,15 +1040,17 @@
80
81 def test_unrelated(self):
82 # Try another revision
83- delta = self.repository.get_revision_delta(
84- self.rev2, specific_fileids=[self.tree_a.path2id('foo')])
85+ delta = list(self.repository.get_deltas_for_revisions(
86+ [self.repository.get_revision(self.rev2)],
87+ specific_fileids=[self.tree_a.path2id('foo')]))[0]
88 self.assertIsInstance(delta, _mod_delta.TreeDelta)
89 self.assertEqual([], delta.added)
90
91 def test_file_in_directory(self):
92 # Test a file in a directory, both of which were added
93- delta = self.repository.get_revision_delta(
94- self.rev1, specific_fileids=[self.tree_a.path2id('bar/b2')])
95+ delta = list(self.repository.get_deltas_for_revisions(
96+ [self.repository.get_revision(self.rev1)],
97+ specific_fileids=[self.tree_a.path2id('bar/b2')]))[0]
98 self.assertIsInstance(delta, _mod_delta.TreeDelta)
99 self.assertEqual([
100 ('bar', self.tree_a.path2id('bar'), 'directory'),
101@@ -1054,8 +1058,9 @@
102 ], delta.added)
103
104 def test_file_in_unchanged_directory(self):
105- delta = self.repository.get_revision_delta(self.rev2,
106- specific_fileids=[self.tree_a.path2id('bar/b3')])
107+ delta = list(self.repository.get_deltas_for_revisions(
108+ [self.repository.get_revision(self.rev2)],
109+ specific_fileids=[self.tree_a.path2id('bar/b3')]))[0]
110 self.assertIsInstance(delta, _mod_delta.TreeDelta)
111 if delta.added == [
112 ('bar', self.tree_a.path2id('bar'), 'directory'),

Subscribers

People subscribed via source and target branches