/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 bzrlib/tests/blackbox/test_info.py

  • Committer: Aaron Bentley
  • Date: 2006-06-17 18:44:05 UTC
  • mfrom: (1786 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1788.
  • Revision ID: aaron.bentley@utoronto.ca-20060617184405-ba00b55631c7da57
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
136
136
        bzrlib.upgrade.upgrade('bound', bzrlib.bzrdir.BzrDirMetaFormat1())
137
137
        branch3 = bzrlib.bzrdir.BzrDir.open('bound').open_branch()
138
138
        branch3.bind(branch1)
 
139
        bound_tree = branch3.bzrdir.open_workingtree()
139
140
        out, err = self.runbzr('info bound')
140
141
        self.assertEqualDiff(
141
142
"""Location:
147
148
 
148
149
Format:
149
150
       control: Meta directory format 1
150
 
  working tree: Working tree format 3
 
151
  working tree: %s
151
152
        branch: Branch format 5
152
153
    repository: %s
153
154
 
173
174
""" % (branch3.bzrdir.root_transport.base,
174
175
       branch1.bzrdir.root_transport.base,
175
176
       branch1.bzrdir.root_transport.base,
 
177
       bound_tree._format.get_format_description(),      
176
178
       branch3.repository._format.get_format_description(),
177
179
       datestring_first, datestring_first,
178
180
       # poking at _revision_store isn't all that clean, but neither is
245
247
        out, err = self.runbzr('info lightcheckout')
246
248
        self.assertEqualDiff(
247
249
"""Location:
248
 
  light checkout root: %s
249
 
   checkout of branch: %s
 
250
 light checkout root: %s
 
251
  checkout of branch: %s
250
252
 
251
253
Format:
252
254
       control: Meta directory format 1
426
428
        out, err = self.runbzr('info lightcheckout --verbose')
427
429
        self.assertEqualDiff(
428
430
"""Location:
429
 
  light checkout root: %s
430
 
   checkout of branch: %s
 
431
 light checkout root: %s
 
432
  checkout of branch: %s
431
433
 
432
434
Format:
433
435
       control: Meta directory format 1
546
548
        dir2.create_workingtree()
547
549
        tree2 = dir2.open_workingtree()
548
550
        branch2 = tree2.branch
549
 
        out, err = self.runbzr('info tree/lightcheckout')
550
 
        self.assertEqualDiff(
551
 
"""Location:
552
 
  light checkout root: %s
553
 
    shared repository: %s
554
 
    repository branch: branch
555
 
 
556
 
Format:
557
 
       control: Meta directory format 1
558
 
  working tree: Working tree format 3
559
 
        branch: Branch format 5
560
 
    repository: %s
561
 
 
562
 
In the working tree:
563
 
         0 unchanged
564
 
         0 modified
565
 
         0 added
566
 
         0 removed
567
 
         0 renamed
568
 
         0 unknown
569
 
         0 ignored
570
 
         0 versioned subdirectories
571
 
 
572
 
Branch history:
573
 
         0 revisions
574
 
 
575
 
Revision store:
576
 
         0 revisions
577
 
         0 KiB
578
 
""" % (tree2.bzrdir.root_transport.base,
579
 
       repo.bzrdir.root_transport.base,
580
 
       repo._format.get_format_description(),
581
 
       ), out)
582
 
        self.assertEqual('', err)
 
551
        self.assertCheckoutStatusOutput('tree/lightcheckout', tree2, shared_repo=repo)
583
552
 
584
553
        # Create normal checkout
585
554
        branch3 = bzrlib.bzrdir.BzrDir.create_branch_convenience('tree/checkout')
586
555
        branch3.bind(branch1)
587
556
        tree3 = branch3.bzrdir.open_workingtree()
588
557
        tree3.update()
589
 
        out, err = self.runbzr('info tree/checkout --verbose')
590
 
        self.assertEqualDiff(
591
 
"""Location:
592
 
       checkout root: %s
593
 
  checkout of branch: %s
594
 
 
595
 
Format:
596
 
       control: Meta directory format 1
597
 
  working tree: Working tree format 3
598
 
        branch: Branch format 5
599
 
    repository: %s
600
 
 
601
 
In the working tree:
602
 
         0 unchanged
603
 
         0 modified
604
 
         0 added
605
 
         0 removed
606
 
         0 renamed
607
 
         0 unknown
608
 
         0 ignored
609
 
         0 versioned subdirectories
610
 
 
611
 
Branch history:
612
 
         0 revisions
613
 
         0 committers
614
 
 
615
 
Revision store:
616
 
         0 revisions
617
 
         0 KiB
618
 
""" % (branch3.bzrdir.root_transport.base,
619
 
       branch1.bzrdir.root_transport.base,
620
 
       repo._format.get_format_description(),
621
 
       ), out)
622
 
        self.assertEqual('', err)
623
 
 
 
558
        self.assertCheckoutStatusOutput('tree/checkout --verbose', tree3,
 
559
            verbose=True,
 
560
            light_checkout=False, repo_branch=branch1)
624
561
        # Update lightweight checkout
625
562
        self.build_tree(['tree/lightcheckout/a'])
626
563
        tree2.add('a')
630
567
        out, err = self.runbzr('info tree/lightcheckout --verbose')
631
568
        self.assertEqualDiff(
632
569
"""Location:
633
 
  light checkout root: %s
634
 
    shared repository: %s
635
 
    repository branch: branch
 
570
 light checkout root: %s
 
571
   shared repository: %s
 
572
   repository branch: branch
636
573
 
637
574
Format:
638
575
       control: Meta directory format 1
759
696
        out, err = self.runbzr('info tree/lightcheckout --verbose')
760
697
        self.assertEqualDiff(
761
698
"""Location:
762
 
  light checkout root: %s
763
 
    shared repository: %s
764
 
    repository branch: branch
 
699
 light checkout root: %s
 
700
   shared repository: %s
 
701
   repository branch: branch
765
702
 
766
703
Format:
767
704
       control: Meta directory format 1
1150
1087
 
1151
1088
        bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
1152
1089
 
 
1090
    def assertCheckoutStatusOutput(self, 
 
1091
        command_string, lco_tree, shared_repo=None,
 
1092
        repo_branch=None,
 
1093
        tree_locked=False,
 
1094
        branch_locked=False, repo_locked=False,
 
1095
        verbose=False,
 
1096
        light_checkout=True):
 
1097
        """Check the output of info in a light checkout tree.
 
1098
 
 
1099
        This is not quite a mirror of the info code: rather than using the
 
1100
        tree being examined to predict output, it uses a bunch of flags which
 
1101
        allow us, the test writers, to document what *should* be present in
 
1102
        the output. Removing this separation would remove the value of the
 
1103
        tests.
 
1104
        
 
1105
        :param path: the path to the light checkout.
 
1106
        :param lco_tree: the tree object for the light checkout.
 
1107
        :param shared_repo: A shared repository is in use, expect that in
 
1108
            the output.
 
1109
        :param repo_branch: A branch in a shared repository for non light
 
1110
            checkouts.
 
1111
        :param tree_locked: If true, expect the tree to be locked.
 
1112
        :param branch_locked: If true, expect the branch to be locked.
 
1113
        :param repo_locked: If true, expect the repository to be locked.
 
1114
        :param verbose: If true, expect verbose output
 
1115
        """
 
1116
        out, err = self.runbzr('info %s' % command_string)
 
1117
        if repo_locked or branch_locked or tree_locked:
 
1118
            def locked_message(a_bool):
 
1119
                if a_bool:
 
1120
                    return 'locked'
 
1121
                else:
 
1122
                    return 'unlocked'
 
1123
            expected_lock_output = (
 
1124
                "\n"
 
1125
                "Lock status:\n"
 
1126
                "  working tree: %s\n"
 
1127
                "        branch: %s\n"
 
1128
                "    repository: %s\n" % (
 
1129
                    locked_message(tree_locked),
 
1130
                    locked_message(branch_locked),
 
1131
                    locked_message(repo_locked)))
 
1132
        else:
 
1133
            expected_lock_output = ''
 
1134
        if light_checkout:
 
1135
            tree_data = (" light checkout root: %s" %
 
1136
                lco_tree.bzrdir.root_transport.base)
 
1137
        else:
 
1138
            tree_data = ("       checkout root: %s" %
 
1139
                lco_tree.bzrdir.root_transport.base)
 
1140
        if shared_repo is not None:
 
1141
            branch_data = (
 
1142
                "   shared repository: %s\n"
 
1143
                "   repository branch: branch\n" %
 
1144
                shared_repo.bzrdir.root_transport.base)
 
1145
        elif repo_branch is not None:
 
1146
            branch_data = (
 
1147
                "  checkout of branch: %s\n" % 
 
1148
                repo_branch.bzrdir.root_transport.base)
 
1149
        else:
 
1150
            branch_data = ("  checkout of branch: %s\n" % 
 
1151
                lco_tree.branch.bzrdir.root_transport.base)
 
1152
        
 
1153
        if verbose:
 
1154
            verbose_info = '         0 committers\n'
 
1155
        else:
 
1156
            verbose_info = ''
 
1157
            
 
1158
        self.assertEqualDiff(
 
1159
"""Location:
 
1160
%s
 
1161
%s
 
1162
Format:
 
1163
       control: Meta directory format 1
 
1164
  working tree: %s
 
1165
        branch: Branch format 5
 
1166
    repository: %s
 
1167
%s
 
1168
In the working tree:
 
1169
         0 unchanged
 
1170
         0 modified
 
1171
         0 added
 
1172
         0 removed
 
1173
         0 renamed
 
1174
         0 unknown
 
1175
         0 ignored
 
1176
         0 versioned subdirectories
 
1177
 
 
1178
Branch history:
 
1179
         0 revisions
 
1180
%s
 
1181
Revision store:
 
1182
         0 revisions
 
1183
         0 KiB
 
1184
""" %  (tree_data,
 
1185
        branch_data,
 
1186
        lco_tree._format.get_format_description(),
 
1187
        lco_tree.branch.repository._format.get_format_description(),
 
1188
        expected_lock_output,
 
1189
        verbose_info,
 
1190
        ), out)
 
1191
        self.assertEqual('', err)
 
1192
 
1153
1193
    def test_info_locking(self):
1154
1194
        transport = self.get_transport()
1155
1195
        # Create shared repository with a branch
1176
1216
        # W B R
1177
1217
 
1178
1218
        # U U U
1179
 
        out, err = self.runbzr('info tree/lightcheckout')
1180
 
        self.assertEqualDiff(
1181
 
"""Location:
1182
 
  light checkout root: %s
1183
 
   checkout of branch: %s
1184
 
 
1185
 
Format:
1186
 
       control: Meta directory format 1
1187
 
  working tree: Working tree format 3
1188
 
        branch: Branch format 5
1189
 
    repository: %s
1190
 
 
1191
 
In the working tree:
1192
 
         0 unchanged
1193
 
         0 modified
1194
 
         0 added
1195
 
         0 removed
1196
 
         0 renamed
1197
 
         0 unknown
1198
 
         0 ignored
1199
 
         0 versioned subdirectories
1200
 
 
1201
 
Branch history:
1202
 
         0 revisions
1203
 
 
1204
 
Revision store:
1205
 
         0 revisions
1206
 
         0 KiB
1207
 
""" % (lco_tree.bzrdir.root_transport.base,
1208
 
       lco_tree.branch.bzrdir.root_transport.base,
1209
 
       lco_tree.branch.repository._format.get_format_description(),
1210
 
       ), out)
1211
 
        self.assertEqual('', err)
 
1219
        self.assertCheckoutStatusOutput('tree/lightcheckout', lco_tree)
1212
1220
        # U U L
1213
1221
        lco_tree.branch.repository.lock_write()
1214
 
        out, err = self.runbzr('info tree/lightcheckout')
1215
 
        self.assertEqualDiff(
1216
 
"""Location:
1217
 
  light checkout root: %s
1218
 
   checkout of branch: %s
1219
 
 
1220
 
Format:
1221
 
       control: Meta directory format 1
1222
 
  working tree: Working tree format 3
1223
 
        branch: Branch format 5
1224
 
    repository: %s
1225
 
 
1226
 
Lock status:
1227
 
  working tree: unlocked
1228
 
        branch: unlocked
1229
 
    repository: locked
1230
 
 
1231
 
In the working tree:
1232
 
         0 unchanged
1233
 
         0 modified
1234
 
         0 added
1235
 
         0 removed
1236
 
         0 renamed
1237
 
         0 unknown
1238
 
         0 ignored
1239
 
         0 versioned subdirectories
1240
 
 
1241
 
Branch history:
1242
 
         0 revisions
1243
 
 
1244
 
Revision store:
1245
 
         0 revisions
1246
 
         0 KiB
1247
 
""" % (lco_tree.bzrdir.root_transport.base,
1248
 
       lco_tree.branch.bzrdir.root_transport.base,
1249
 
       lco_tree.branch.repository._format.get_format_description(),
1250
 
       ), out)
1251
 
        self.assertEqual('', err)
1252
 
        lco_tree.branch.repository.unlock()
 
1222
        try:
 
1223
            self.assertCheckoutStatusOutput('tree/lightcheckout',
 
1224
            lco_tree,
 
1225
            repo_locked=True)
 
1226
        finally:
 
1227
            lco_tree.branch.repository.unlock()
1253
1228
        # U L L
1254
1229
        lco_tree.branch.lock_write()
1255
 
        out, err = self.runbzr('info tree/lightcheckout')
1256
 
        self.assertEqualDiff(
1257
 
"""Location:
1258
 
  light checkout root: %s
1259
 
   checkout of branch: %s
1260
 
 
1261
 
Format:
1262
 
       control: Meta directory format 1
1263
 
  working tree: Working tree format 3
1264
 
        branch: Branch format 5
1265
 
    repository: %s
1266
 
 
1267
 
Lock status:
1268
 
  working tree: unlocked
1269
 
        branch: locked
1270
 
    repository: locked
1271
 
 
1272
 
In the working tree:
1273
 
         0 unchanged
1274
 
         0 modified
1275
 
         0 added
1276
 
         0 removed
1277
 
         0 renamed
1278
 
         0 unknown
1279
 
         0 ignored
1280
 
         0 versioned subdirectories
1281
 
 
1282
 
Branch history:
1283
 
         0 revisions
1284
 
 
1285
 
Revision store:
1286
 
         0 revisions
1287
 
         0 KiB
1288
 
""" % (lco_tree.bzrdir.root_transport.base,
1289
 
       lco_tree.branch.bzrdir.root_transport.base,
1290
 
       lco_tree.branch.repository._format.get_format_description(),
1291
 
       ), out)
1292
 
        self.assertEqual('', err)
1293
 
        lco_tree.branch.unlock()
 
1230
        try:
 
1231
            self.assertCheckoutStatusOutput('tree/lightcheckout',
 
1232
            lco_tree,
 
1233
            branch_locked=True,
 
1234
            repo_locked=True)
 
1235
        finally:
 
1236
            lco_tree.branch.unlock()
1294
1237
        # L L L
1295
1238
        lco_tree.lock_write()
1296
 
        out, err = self.runbzr('info tree/lightcheckout')
1297
 
        self.assertEqualDiff(
1298
 
"""Location:
1299
 
  light checkout root: %s
1300
 
   checkout of branch: %s
1301
 
 
1302
 
Format:
1303
 
       control: Meta directory format 1
1304
 
  working tree: Working tree format 3
1305
 
        branch: Branch format 5
1306
 
    repository: %s
1307
 
 
1308
 
Lock status:
1309
 
  working tree: locked
1310
 
        branch: locked
1311
 
    repository: locked
1312
 
 
1313
 
In the working tree:
1314
 
         0 unchanged
1315
 
         0 modified
1316
 
         0 added
1317
 
         0 removed
1318
 
         0 renamed
1319
 
         0 unknown
1320
 
         0 ignored
1321
 
         0 versioned subdirectories
1322
 
 
1323
 
Branch history:
1324
 
         0 revisions
1325
 
 
1326
 
Revision store:
1327
 
         0 revisions
1328
 
         0 KiB
1329
 
""" % (lco_tree.bzrdir.root_transport.base,
1330
 
       lco_tree.branch.bzrdir.root_transport.base,
1331
 
       lco_tree.branch.repository._format.get_format_description(),
1332
 
       ), out)
1333
 
        self.assertEqual('', err)
1334
 
        lco_tree.unlock()
 
1239
        try:
 
1240
            self.assertCheckoutStatusOutput('tree/lightcheckout',
 
1241
            lco_tree,
 
1242
            tree_locked=True,
 
1243
            branch_locked=True,
 
1244
            repo_locked=True)
 
1245
        finally:
 
1246
            lco_tree.unlock()
1335
1247
        # L L U
1336
1248
        lco_tree.lock_write()
1337
1249
        lco_tree.branch.repository.unlock()
1338
 
        out, err = self.runbzr('info tree/lightcheckout')
1339
 
        self.assertEqualDiff(
1340
 
"""Location:
1341
 
  light checkout root: %s
1342
 
   checkout of branch: %s
1343
 
 
1344
 
Format:
1345
 
       control: Meta directory format 1
1346
 
  working tree: Working tree format 3
1347
 
        branch: Branch format 5
1348
 
    repository: %s
1349
 
 
1350
 
Lock status:
1351
 
  working tree: locked
1352
 
        branch: locked
1353
 
    repository: unlocked
1354
 
 
1355
 
In the working tree:
1356
 
         0 unchanged
1357
 
         0 modified
1358
 
         0 added
1359
 
         0 removed
1360
 
         0 renamed
1361
 
         0 unknown
1362
 
         0 ignored
1363
 
         0 versioned subdirectories
1364
 
 
1365
 
Branch history:
1366
 
         0 revisions
1367
 
 
1368
 
Revision store:
1369
 
         0 revisions
1370
 
         0 KiB
1371
 
""" % (lco_tree.bzrdir.root_transport.base,
1372
 
       lco_tree.branch.bzrdir.root_transport.base,
1373
 
       lco_tree.branch.repository._format.get_format_description(),
1374
 
       ), out)
1375
 
        self.assertEqual('', err)
1376
 
        lco_tree.branch.repository.lock_write()
1377
 
        lco_tree.unlock()
 
1250
        try:
 
1251
            self.assertCheckoutStatusOutput('tree/lightcheckout',
 
1252
            lco_tree,
 
1253
            tree_locked=True,
 
1254
            branch_locked=True)
 
1255
        finally:
 
1256
            lco_tree.branch.repository.lock_write()
 
1257
            lco_tree.unlock()
1378
1258
        # L U U
1379
1259
        lco_tree.lock_write()
1380
1260
        lco_tree.branch.unlock()
1381
 
        out, err = self.runbzr('info tree/lightcheckout')
1382
 
        self.assertEqualDiff(
1383
 
"""Location:
1384
 
  light checkout root: %s
1385
 
   checkout of branch: %s
1386
 
 
1387
 
Format:
1388
 
       control: Meta directory format 1
1389
 
  working tree: Working tree format 3
1390
 
        branch: Branch format 5
1391
 
    repository: %s
1392
 
 
1393
 
Lock status:
1394
 
  working tree: locked
1395
 
        branch: unlocked
1396
 
    repository: unlocked
1397
 
 
1398
 
In the working tree:
1399
 
         0 unchanged
1400
 
         0 modified
1401
 
         0 added
1402
 
         0 removed
1403
 
         0 renamed
1404
 
         0 unknown
1405
 
         0 ignored
1406
 
         0 versioned subdirectories
1407
 
 
1408
 
Branch history:
1409
 
         0 revisions
1410
 
 
1411
 
Revision store:
1412
 
         0 revisions
1413
 
         0 KiB
1414
 
""" % (lco_tree.bzrdir.root_transport.base,
1415
 
       lco_tree.branch.bzrdir.root_transport.base,
1416
 
       lco_tree.branch.repository._format.get_format_description(),
1417
 
       ), out)
1418
 
        self.assertEqual('', err)
1419
 
        lco_tree.branch.lock_write()
1420
 
        lco_tree.unlock()
 
1261
        try:
 
1262
            self.assertCheckoutStatusOutput('tree/lightcheckout',
 
1263
            lco_tree,
 
1264
            tree_locked=True)
 
1265
        finally:
 
1266
            lco_tree.branch.lock_write()
 
1267
            lco_tree.unlock()
1421
1268
        # L U L
1422
1269
        lco_tree.lock_write()
1423
1270
        lco_tree.branch.unlock()
1424
1271
        lco_tree.branch.repository.lock_write()
1425
 
        out, err = self.runbzr('info tree/lightcheckout')
1426
 
        self.assertEqualDiff(
1427
 
"""Location:
1428
 
  light checkout root: %s
1429
 
   checkout of branch: %s
1430
 
 
1431
 
Format:
1432
 
       control: Meta directory format 1
1433
 
  working tree: Working tree format 3
1434
 
        branch: Branch format 5
1435
 
    repository: %s
1436
 
 
1437
 
Lock status:
1438
 
  working tree: locked
1439
 
        branch: unlocked
1440
 
    repository: locked
1441
 
 
1442
 
In the working tree:
1443
 
         0 unchanged
1444
 
         0 modified
1445
 
         0 added
1446
 
         0 removed
1447
 
         0 renamed
1448
 
         0 unknown
1449
 
         0 ignored
1450
 
         0 versioned subdirectories
1451
 
 
1452
 
Branch history:
1453
 
         0 revisions
1454
 
 
1455
 
Revision store:
1456
 
         0 revisions
1457
 
         0 KiB
1458
 
""" % (lco_tree.bzrdir.root_transport.base,
1459
 
       lco_tree.branch.bzrdir.root_transport.base,
1460
 
       lco_tree.branch.repository._format.get_format_description(),
1461
 
       ), out)
1462
 
        self.assertEqual('', err)
1463
 
        lco_tree.branch.repository.unlock()
1464
 
        lco_tree.branch.lock_write()
1465
 
        lco_tree.unlock()
 
1272
        try:
 
1273
            self.assertCheckoutStatusOutput('tree/lightcheckout',
 
1274
            lco_tree,
 
1275
            tree_locked=True,
 
1276
            repo_locked=True)
 
1277
        finally:
 
1278
            lco_tree.branch.repository.unlock()
 
1279
            lco_tree.branch.lock_write()
 
1280
            lco_tree.unlock()
1466
1281
        # U L U
1467
1282
        lco_tree.branch.lock_write()
1468
1283
        lco_tree.branch.repository.unlock()
1469
 
        out, err = self.runbzr('info tree/lightcheckout')
1470
 
        self.assertEqualDiff(
1471
 
"""Location:
1472
 
  light checkout root: %s
1473
 
   checkout of branch: %s
1474
 
 
1475
 
Format:
1476
 
       control: Meta directory format 1
1477
 
  working tree: Working tree format 3
1478
 
        branch: Branch format 5
1479
 
    repository: %s
1480
 
 
1481
 
Lock status:
1482
 
  working tree: unlocked
1483
 
        branch: locked
1484
 
    repository: unlocked
1485
 
 
1486
 
In the working tree:
1487
 
         0 unchanged
1488
 
         0 modified
1489
 
         0 added
1490
 
         0 removed
1491
 
         0 renamed
1492
 
         0 unknown
1493
 
         0 ignored
1494
 
         0 versioned subdirectories
1495
 
 
1496
 
Branch history:
1497
 
         0 revisions
1498
 
 
1499
 
Revision store:
1500
 
         0 revisions
1501
 
         0 KiB
1502
 
""" % (lco_tree.bzrdir.root_transport.base,
1503
 
       lco_tree.branch.bzrdir.root_transport.base,
1504
 
       lco_tree.branch.repository._format.get_format_description(),
1505
 
       ), out)
1506
 
        self.assertEqual('', err)
1507
 
        lco_tree.branch.repository.lock_write()
1508
 
        lco_tree.branch.unlock()
 
1284
        try:
 
1285
            self.assertCheckoutStatusOutput('tree/lightcheckout',
 
1286
            lco_tree,
 
1287
            branch_locked=True)
 
1288
        finally:
 
1289
            lco_tree.branch.repository.lock_write()
 
1290
            lco_tree.branch.unlock()
1509
1291
 
1510
1292
    def test_info_locking_oslocks(self):
1511
1293
        if sys.platform == "win32":