/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: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test__dirstate_helpers.py
815
815
        """Create a DirState tracking a single object named 'a'"""
816
816
        state = test_dirstate.InstrumentedDirState.initialize('dirstate')
817
817
        self.addCleanup(state.unlock)
818
 
        state.add('a', b'a-id', 'file', None, '')
 
818
        state.add('a', 'a-id', 'file', None, '')
819
819
        entry = state._get_entry(0, path_utf8='a')
820
820
        return state, entry
821
821
 
856
856
        tree.lock_write()
857
857
        empty_revid = tree.commit('empty')
858
858
        self.build_tree(['tree/a'])
859
 
        tree.add(['a'], [b'a-id'])
 
859
        tree.add(['a'], ['a-id'])
860
860
        with_a_id = tree.commit('with_a')
861
861
        self.addCleanup(tree.unlock)
862
862
        state.set_parent_trees(
1050
1050
        tree = self.make_branch_and_tree('tree')
1051
1051
        tree.lock_write()
1052
1052
        self.build_tree(['tree/a'])
1053
 
        tree.add(['a'], [b'a-id'])
 
1053
        tree.add(['a'], ['a-id'])
1054
1054
        with_a_id = tree.commit('witha')
1055
1055
        self.addCleanup(tree.unlock)
1056
1056
        state.set_parent_trees(
1073
1073
    def test_update_entry_tree_reference(self):
1074
1074
        state = test_dirstate.InstrumentedDirState.initialize('dirstate')
1075
1075
        self.addCleanup(state.unlock)
1076
 
        state.add('r', b'r-id', 'tree-reference', None, '')
 
1076
        state.add('r', 'r-id', 'tree-reference', None, '')
1077
1077
        self.build_tree(['r/'])
1078
1078
        entry = state._get_entry(0, path_utf8='r')
1079
1079
        self.do_update_entry(state, entry, 'r')
1225
1225
 
1226
1226
    def _prepare_tree(self):
1227
1227
        # Create a tree
1228
 
        text = b'Hello World\n'
 
1228
        text = 'Hello World\n'
1229
1229
        tree = self.make_branch_and_tree('tree')
1230
1230
        self.build_tree_contents([('tree/a file', text)])
1231
 
        tree.add('a file', b'a-file-id')
 
1231
        tree.add('a file', 'a-file-id')
1232
1232
        # Note: dirstate does not sha prior to the first commit
1233
1233
        # so commit now in order for the test to work
1234
1234
        tree.commit('first')
1317
1317
    def test_simple_changes(self):
1318
1318
        tree = self.make_branch_and_tree('tree')
1319
1319
        self.build_tree(['tree/file'])
1320
 
        tree.add(['file'], [b'file-id'])
1321
 
        self.assertChangedFileIds([tree.get_root_id(), b'file-id'], tree)
 
1320
        tree.add(['file'], ['file-id'])
 
1321
        self.assertChangedFileIds([tree.get_root_id(), 'file-id'], tree)
1322
1322
        tree.commit('one')
1323
1323
        self.assertChangedFileIds([], tree)
1324
1324
 
1325
1325
    def test_sha1provider_stat_and_sha1_used(self):
1326
1326
        tree = self.make_branch_and_tree('tree')
1327
1327
        self.build_tree(['tree/file'])
1328
 
        tree.add(['file'], [b'file-id'])
 
1328
        tree.add(['file'], ['file-id'])
1329
1329
        tree.commit('one')
1330
1330
        tree.lock_write()
1331
1331
        self.addCleanup(tree.unlock)
1332
1332
        state = tree._current_dirstate()
1333
1333
        state._sha1_provider = UppercaseSHA1Provider()
1334
 
        self.assertChangedFileIds([b'file-id'], tree)
 
1334
        self.assertChangedFileIds(['file-id'], tree)
1335
1335
 
1336
1336
 
1337
1337
class TestPackStat(tests.TestCase):