Merge lp:~jelmer/brz/yet-more-file-ids into lp:brz

Proposed by Jelmer Vernooij
Status: Superseded
Proposed branch: lp:~jelmer/brz/yet-more-file-ids
Merge into: lp:brz
Prerequisite: lp:~jelmer/brz/python3.7
Diff against target: 26 lines (+2/-3)
2 files modified
breezy/tests/per_repository_vf/test_repository.py (+1/-2)
breezy/workingtree.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/yet-more-file-ids
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+359482@code.launchpad.net

Commit message

Remove file_id from the diff API and record_iter_changes.

Description of the change

Remove file_id from the diff API and record_iter_changes.

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

Thanks, all looks reasonable.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/tests/per_repository_vf/test_repository.py'
2--- breezy/tests/per_repository_vf/test_repository.py 2019-01-01 21:08:01 +0000
3+++ breezy/tests/per_repository_vf/test_repository.py 2019-02-02 15:04:32 +0000
4@@ -271,8 +271,7 @@
5 with tree.lock_write():
6 self.assertEqual(set(), set(repo.texts.keys()))
7 tree.add(['foo'], [file_id], ['file'])
8- tree.put_file_bytes_non_atomic(
9- 'foo', b'content\n')
10+ tree.put_file_bytes_non_atomic('foo', b'content\n')
11 try:
12 rev_key = (tree.commit("foo"),)
13 except errors.IllegalPath:
14
15=== modified file 'breezy/workingtree.py'
16--- breezy/workingtree.py 2019-01-01 21:56:21 +0000
17+++ breezy/workingtree.py 2019-02-02 15:04:32 +0000
18@@ -1284,7 +1284,7 @@
19 resolved = _mod_conflicts.ConflictList()
20 conflict_re = re.compile(b'^(<{7}|={7}|>{7})')
21 for conflict in self.conflicts():
22- path = self.id2path(conflict.file_id)
23+ path = conflict.path
24 if (conflict.typestring != 'text conflict' or
25 self.kind(path) != 'file'):
26 un_resolved.append(conflict)

Subscribers

People subscribed via source and target branches