/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_transform.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-09-21 23:20:40 UTC
  • mfrom: (7358.17.5 delta-copied)
  • Revision ID: breezy.the.bot@gmail.com-20190921232040-cwtsza0dr40yeqf8
Add TreeDelta.copied and TreeChange.copied fields.

Merged from https://code.launchpad.net/~jelmer/brz/delta-copied/+merge/369485

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
1147
1147
            self.assertEqual([(b'id-1', ('old', None), False, (True, False),
1148
1148
                               (b'eert_toor', b'eert_toor'),
1149
1149
                               ('old', 'old'), ('file', 'file'),
1150
 
                               (True, True))], list(transform.iter_changes()))
 
1150
                               (True, True), False)],
 
1151
                             list(transform.iter_changes()))
1151
1152
            transform.new_directory('new', root, b'id-1')
1152
1153
            self.assertEqual([(b'id-1', ('old', 'new'), True, (True, True),
1153
1154
                               (b'eert_toor', b'eert_toor'), ('old', 'new'),
1154
1155
                               ('file', 'directory'),
1155
 
                               (True, False))], list(transform.iter_changes()))
 
1156
                               (True, False), False)],
 
1157
                             list(transform.iter_changes()))
1156
1158
        finally:
1157
1159
            transform.finalize()
1158
1160
 
1168
1170
            self.assertEqual([(b'id-1', (None, 'old'), False, (False, True),
1169
1171
                               (b'eert_toor', b'eert_toor'),
1170
1172
                               ('old', 'old'), ('file', 'file'),
1171
 
                               (False, False))],
 
1173
                               (False, False), False)],
1172
1174
                             list(transform.iter_changes()))
1173
1175
        finally:
1174
1176
            transform.finalize()
1192
1194
            self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1193
1195
                               (b'eert_toor', b'eert_toor'),
1194
1196
                               ('old', 'old'), ('file', None),
1195
 
                               (False, False))],
 
1197
                               (False, False), False)],
1196
1198
                             list(transform.iter_changes()))
1197
1199
 
1198
1200
            # content change
1200
1202
            self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1201
1203
                               (b'eert_toor', b'eert_toor'),
1202
1204
                               ('old', 'old'), ('file', 'file'),
1203
 
                               (False, False))],
 
1205
                               (False, False), False)],
1204
1206
                             list(transform.iter_changes()))
1205
1207
            transform.cancel_deletion(old)
1206
1208
            self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1207
1209
                               (b'eert_toor', b'eert_toor'),
1208
1210
                               ('old', 'old'), ('file', 'file'),
1209
 
                               (False, False))],
 
1211
                               (False, False), False)],
1210
1212
                             list(transform.iter_changes()))
1211
1213
            transform.cancel_creation(old)
1212
1214
 
1218
1220
            self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1219
1221
                               (b'eert_toor', b'eert_toor'),
1220
1222
                               ('old', 'old'), ('file', 'file'),
1221
 
                               (False, False))],
 
1223
                               (False, False), False)],
1222
1224
                             list(transform.iter_changes()))
1223
1225
            transform.cancel_versioning(new)
1224
1226
            transform._removed_id = set()
1229
1231
            self.assertEqual([(b'id-1', ('old', 'old'), False, (True, True),
1230
1232
                               (b'eert_toor', b'eert_toor'),
1231
1233
                               ('old', 'old'), ('file', 'file'),
1232
 
                               (False, True))],
 
1234
                               (False, True), False)],
1233
1235
                             list(transform.iter_changes()))
1234
1236
            transform.set_executability(None, old)
1235
1237
 
1240
1242
            self.assertEqual([(b'id-1', ('old', 'new'), False, (True, True),
1241
1243
                               (b'eert_toor', b'eert_toor'),
1242
1244
                               ('old', 'new'), ('file', 'file'),
1243
 
                               (False, False))],
 
1245
                               (False, False), False)],
1244
1246
                             list(transform.iter_changes()))
1245
1247
            transform._new_name = {}
1246
1248
 
1251
1253
            self.assertEqual([(b'id-1', ('old', 'subdir/old'), False,
1252
1254
                               (True, True), (b'eert_toor',
1253
1255
                                              b'subdir-id'), ('old', 'old'),
1254
 
                               ('file', 'file'), (False, False))],
 
1256
                               ('file', 'file'), (False, False), False)],
1255
1257
                             list(transform.iter_changes()))
1256
1258
            transform._new_path = {}
1257
1259
 
1277
1279
            self.assertEqual(
1278
1280
                [(b'id-1', (u'file1', u'file1'), True, (True, True),
1279
1281
                 (b'eert_toor', b'eert_toor'), ('file1', u'file1'),
1280
 
                 ('file', None), (False, False)),
 
1282
                 ('file', None), (False, False), False),
1281
1283
                 (b'id-2', (u'file2', u'file2'), False, (True, True),
1282
1284
                 (b'eert_toor', b'eert_toor'), ('file2', u'file2'),
1283
 
                 ('file', 'file'), (False, True))],
 
1285
                 ('file', 'file'), (False, True), False)],
1284
1286
                list(transform.iter_changes()))
1285
1287
        finally:
1286
1288
            transform.finalize()
1303
1305
                               (True, True),
1304
1306
                               (b'toor_eert', b'toor_eert'),
1305
1307
                               ('floater', 'flitter'),
1306
 
                               (None, None), (False, False))],
 
1308
                               (None, None), (False, False), False)],
1307
1309
                             list(transform.iter_changes()))
1308
1310
        finally:
1309
1311
            transform.finalize()
2767
2769
 
2768
2770
A_ENTRY = (b'a-id', ('a', 'a'), True, (True, True),
2769
2771
           (b'TREE_ROOT', b'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2770
 
           (False, False))
 
2772
           (False, False), False)
2771
2773
ROOT_ENTRY = (b'TREE_ROOT', ('', ''), False, (True, True), (None, None),
2772
 
              ('', ''), ('directory', 'directory'), (False, False))
 
2774
              ('', ''), ('directory', 'directory'), (False, False), False)
2773
2775
 
2774
2776
 
2775
2777
class TestTransformPreview(tests.TestCaseWithTransport):
2875
2877
        root = revision_tree.path2id('')
2876
2878
        self.assertEqual([(b'a-id', ('a', 'a'), True, (True, True),
2877
2879
                           (root, root), ('a', 'a'), ('file', 'file'),
2878
 
                           (False, False))],
 
2880
                           (False, False), False)],
2879
2881
                         list(preview_tree.iter_changes(revision_tree)))
2880
2882
 
2881
2883
    def test_include_unchanged_succeeds(self):