Merge lp:~jelmer/brz/objects-2a into lp:brz

[Jelmer Vernooij]

Use paths as keys in merge_modified dictionary.

Use paths as keys in merge_modified dictionary.

This brings us one step closer to not having file ids in public APIs.

[Martin Packman (gz)]

Looks good, thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Project setup failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/400/

[The Breezy Bot (the-breezy-bot)]

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

[lp:~jelmer/brz/objects-2a]

7352. By Jelmer Vernooij on 2019-06-21

Fix merge modified test on python3.

7353. By Jelmer Vernooij on 2019-06-22

Fix tests.

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2019-06-21 17:35:24 +0000
+++ breezy/bzr/workingtree.py	2019-06-22 10:13:17 +0000
@@ -897,9 +897,12 @@
 
     def set_merge_modified(self, modified_hashes):
         def iter_stanzas():
-            for file_id in modified_hashes:
+            for path, sha1 in modified_hashes.items():
+                file_id = self.path2id(path)
+                if file_id is None:
+                    continue
                 yield _mod_rio.Stanza(file_id=file_id.decode('utf8'),
-                                      hash=modified_hashes[file_id])
+                                      hash=sha1)
         with self.lock_tree_write():
             self._put_rio('merge-hashes', iter_stanzas(),
                           MERGE_MODIFIED_HEADER_1)
@@ -930,12 +933,13 @@
                     # RioReader reads in Unicode, so convert file_ids back to
                     # utf8
                     file_id = cache_utf8.encode(s.get("file_id"))
-                    if not self.has_id(file_id):
+                    try:
+                        path = self.id2path(file_id)
+                    except errors.NoSuchId:
                         continue
                     text_hash = s.get("hash").encode('ascii')
-                    path = self.id2path(file_id)
                     if text_hash == self.get_file_sha1(path):
-                        merge_hashes[file_id] = text_hash
+                        merge_hashes[path] = text_hash
                 return merge_hashes
             finally:
                 hashfile.close()

=== modified file 'breezy/merge.py'
--- breezy/merge.py	2019-06-21 17:49:36 +0000
+++ breezy/merge.py	2019-06-22 10:13:17 +0000
@@ -1068,13 +1068,12 @@
         modified_hashes = {}
         for path in results.modified_paths:
             wt_relpath = self.working_tree.relpath(path)
-            file_id = self.working_tree.path2id(wt_relpath)
-            if file_id is None:
+            if not self.working_tree.is_versioned(wt_relpath):
                 continue
             hash = self.working_tree.get_file_sha1(wt_relpath)
             if hash is None:
                 continue
-            modified_hashes[file_id] = hash
+            modified_hashes[wt_relpath] = hash
         self.working_tree.set_merge_modified(modified_hashes)
 
     @staticmethod

=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
--- breezy/tests/per_workingtree/test_workingtree.py	2019-06-17 23:01:58 +0000
+++ breezy/tests/per_workingtree/test_workingtree.py	2019-06-22 10:13:17 +0000
@@ -736,7 +736,7 @@
         self.build_tree_contents([('tree/somefile', b'hello')])
         with tree.lock_write():
             tree.add(['somefile'])
-            d = {tree.path2id('somefile'): osutils.sha_string(b'hello')}
+            d = {'somefile': osutils.sha_string(b'hello')}
             if tree.supports_merge_modified():
                 tree.set_merge_modified(d)
                 mm = tree.merge_modified()

=== modified file 'breezy/tests/test_revert.py'
--- breezy/tests/test_revert.py	2019-06-17 23:01:58 +0000
+++ breezy/tests/test_revert.py	2019-06-22 10:13:17 +0000
@@ -124,11 +124,14 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['file'])
         tree.add('file')
-        tree.commit('added file', rev_id=b'rev1')
+        rev1 = tree.commit('added file')
+        with tree.lock_read():
+            file_sha = tree.get_file_sha1('file')
         os.unlink('file')
         tree.commit('removed file')
         self.assertPathDoesNotExist('file')
-        tree.revert(old_tree=tree.branch.repository.revision_tree(b'rev1'))
+        tree.revert(old_tree=tree.branch.repository.revision_tree(rev1))
+        self.assertEqual({'file': file_sha}, tree.merge_modified())
         self.assertPathExists('file')
         tree.revert()
         self.assertPathDoesNotExist('file')

=== modified file 'breezy/tests/test_transform.py'
--- breezy/tests/test_transform.py	2019-06-15 15:59:17 +0000
+++ breezy/tests/test_transform.py	2019-06-22 10:13:17 +0000
@@ -1816,7 +1816,7 @@
         self.assertEqual(this.wt.get_file('i.OTHER').read(),
                          b'h\ni\nj\nk\n')
         self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
-        modified = [b'a', b'b', b'c', b'h', b'i']
+        modified = ['a', 'b', 'c', 'h', 'i']
         merge_modified = this.wt.merge_modified()
         self.assertSubset(merge_modified, modified)
         self.assertEqual(len(merge_modified), len(modified))

=== modified file 'breezy/transform.py'
--- breezy/transform.py	2019-06-18 00:22:26 +0000
+++ breezy/transform.py	2019-06-22 10:13:17 +0000
@@ -2965,7 +2965,7 @@
                 keep_content = False
                 if wt_kind == 'file' and (backups or target_kind is None):
                     wt_sha1 = working_tree.get_file_sha1(wt_path)
-                    if merge_modified.get(file_id) != wt_sha1:
+                    if merge_modified.get(wt_path) != wt_sha1:
                         # acquire the basis tree lazily to prevent the
                         # expense of accessing it when it's not needed ?
                         # (Guessing, RBC, 200702)
@@ -3015,10 +3015,12 @@
                     basis_path = find_previous_path(target_tree, basis_tree, target_path)
                     if (basis_path is not None and
                             new_sha1 == basis_tree.get_file_sha1(basis_path)):
-                        if file_id in merge_modified:
-                            del merge_modified[file_id]
+                        # If the new contents of the file match what is in basis,
+                        # then there is no need to store in merge_modified.
+                        if basis_path in merge_modified:
+                            del merge_modified[basis_path]
                     else:
-                        merge_modified[file_id] = new_sha1
+                        merge_modified[target_path] = new_sha1
 
                     # preserve the execute bit when backing up
                     if keep_content and wt_executable == target_executable: