/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test__dirstate_helpers.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-15 17:53:40 UTC
  • mfrom: (7322.1.8 objects-1)
  • Revision ID: breezy.the.bot@gmail.com-20190615175340-yxo036zu96wh8lcz
Use the new attributes on TreeChange rather than indexing.

Merged from https://code.launchpad.net/~jelmer/brz/objects-1/+merge/368859

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test__dirstate_helpers.py
1260
1260
        state._sha1_provider = UppercaseSHA1Provider()
1261
1261
        # If we used the standard provider, it would look like nothing has
1262
1262
        # changed
1263
 
        file_ids_changed = [change[0] for change
 
1263
        file_ids_changed = [change.file_id for change
1264
1264
                            in tree.iter_changes(tree.basis_tree())]
1265
1265
        self.assertEqual([b'a-file-id'], file_ids_changed)
1266
1266
 
1291
1291
        self.overrideAttr(dirstate, '_process_entry', self._process_entry)
1292
1292
 
1293
1293
    def assertChangedFileIds(self, expected, tree):
1294
 
        tree.lock_read()
1295
 
        try:
1296
 
            file_ids = [info[0] for info
 
1294
        with tree.lock_read():
 
1295
            file_ids = [info.file_id for info
1297
1296
                        in tree.iter_changes(tree.basis_tree())]
1298
 
        finally:
1299
 
            tree.unlock()
1300
1297
        self.assertEqual(sorted(expected), sorted(file_ids))
1301
1298
 
1302
1299
    def test_exceptions_raised(self):