Breezy

Merge lp:~jelmer/brz/transform-file-id into lp:brz/3.1

  1. transform-file-id
  2. Merge into 3.1
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/transform-file-id
Merge into: lp:brz/3.1
Diff against target: 36 lines (+4/-5)
1 file modified
breezy/transform.py (+4/-5)
To merge this branch: bzr merge lp:~jelmer/brz/transform-file-id
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+386522@code.launchpad.net

Commit message

Remove use of file_id when we don't need it.

Description of the change

Remove use of file_id when we don't need it.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
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-3.1/job/brz-3.1-land/174/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/transform.py'
2--- breezy/transform.py 2020-06-25 21:13:23 +0000
3+++ breezy/transform.py 2020-06-29 21:06:02 +0000
4@@ -2712,8 +2712,7 @@
5 executable = tree.is_executable(tree_path)
6 if executable:
7 tt.set_executability(executable, trans_id)
8- trans_data = (trans_id, file_id,
9- tree_path, entry.text_sha1)
10+ trans_data = (trans_id, tree_path, entry.text_sha1)
11 deferred_contents.append((tree_path, trans_data))
12 else:
13 file_trans_id[file_id] = new_by_entry(
14@@ -2765,11 +2764,11 @@
15 unchanged = dict(unchanged)
16 new_desired_files = []
17 count = 0
18- for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
19+ for unused_tree_path, (trans_id, tree_path, text_sha1) in desired_files:
20 accelerator_path = unchanged.get(tree_path)
21 if accelerator_path is None:
22 new_desired_files.append((tree_path,
23- (trans_id, file_id, tree_path, text_sha1)))
24+ (trans_id, tree_path, text_sha1)))
25 continue
26 pb.update(gettext('Adding file contents'), count + offset, total)
27 if hardlink:
28@@ -2785,7 +2784,7 @@
29 tt.create_file(chunks, trans_id, sha1=text_sha1)
30 count += 1
31 offset += count
32- for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
33+ for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
34 tree.iter_files_bytes(new_desired_files)):
35 if wt.supports_content_filtering():
36 filters = wt._content_filter_stack(tree_path)

Subscribers

People subscribed via source and target branches