← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_info.py

  • Committer: Aaron Bentley
  • Date: 2007-05-18 18:32:14 UTC
  • mto: This revision was merged to the branch mainline in revision 2528.
  • Revision ID: aaron.bentley@utoronto.ca-20070518183214-b7qfkw9z0ou5egmi
Change separator from '/' to 'or'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
245
245
        branch5 = tree5.branch
246
246
        out, err = self.runbzr('info -v lightcheckout')
247
247
        self.assertEqualDiff(
248
 
"""Lightweight checkout (format: dirstate / dirstate-tags)
 
248
"""Lightweight checkout (format: dirstate or dirstate-tags)
249
249
Location:
250
250
 light checkout root: %s
251
251
  checkout of branch: %s
434
434
        # Out of date lightweight checkout
435
435
        out, err = self.runbzr('info lightcheckout --verbose')
436
436
        self.assertEqualDiff(
437
 
"""Lightweight checkout (format: dirstate / dirstate-tags)
 
437
"""Lightweight checkout (format: dirstate or dirstate-tags)
438
438
Location:
439
439
 light checkout root: %s
440
440
  checkout of branch: %s
480
480
        repo = branch.repository
481
481
        out, err = self.runbzr('info branch -v')
482
482
        self.assertEqualDiff(
483
 
"""Standalone branch (format: dirstate / knit)
 
483
"""Standalone branch (format: dirstate or knit)
484
484
Location:
485
485
  branch root: %s
486
486
 
511
511
        repo.set_make_working_trees(False)
512
512
        out, err = self.runbzr('info -v repo')
513
513
        self.assertEqualDiff(
514
 
"""Shared repository (format: dirstate / dirstate-tags / knit)
 
514
"""Shared repository (format: dirstate or dirstate-tags or knit)
515
515
Location:
516
516
  shared repository: %s
517
517
 
533
533
            format=format)
534
534
        out, err = self.runbzr('info -v repo/branch')
535
535
        self.assertEqualDiff(
536
 
"""Repository branch (format: dirstate / knit)
 
536
"""Repository branch (format: dirstate or knit)
537
537
Location:
538
538
  shared repository: %s
539
539
  repository branch: branch
578
578
        datestring_first = format_date(rev.timestamp, rev.timezone)
579
579
        out, err = self.runbzr('info tree/lightcheckout --verbose')
580
580
        self.assertEqualDiff(
581
 
"""Lightweight checkout (format: dirstate / dirstate-tags)
 
581
"""Lightweight checkout (format: dirstate or dirstate-tags)
582
582
Location:
583
583
 light checkout root: %s
584
584
   shared repository: %s
714
714
        datestring_last = format_date(rev.timestamp, rev.timezone)
715
715
        out, err = self.runbzr('info tree/lightcheckout --verbose')
716
716
        self.assertEqualDiff(
717
 
"""Lightweight checkout (format: dirstate / dirstate-tags)
 
717
"""Lightweight checkout (format: dirstate or dirstate-tags)
718
718
Location:
719
719
 light checkout root: %s
720
720
   shared repository: %s
762
762
        # Show info about shared branch
763
763
        out, err = self.runbzr('info repo/branch --verbose')
764
764
        self.assertEqualDiff(
765
 
"""Repository branch (format: dirstate / knit)
 
765
"""Repository branch (format: dirstate or knit)
766
766
Location:
767
767
  shared repository: %s
768
768
  repository branch: branch
795
795
        # Show info about repository with revisions
796
796
        out, err = self.runbzr('info -v repo')
797
797
        self.assertEqualDiff(
798
 
"""Shared repository (format: dirstate / dirstate-tags / knit)
 
798
"""Shared repository (format: dirstate or dirstate-tags or knit)
799
799
Location:
800
800
  shared repository: %s
801
801
 
823
823
        repo.set_make_working_trees(True)
824
824
        out, err = self.runbzr('info -v repo')
825
825
        self.assertEqualDiff(
826
 
"""Shared repository with trees (format: dirstate / dirstate-tags / knit)
 
826
"""Shared repository with trees (format: dirstate or dirstate-tags or knit)
827
827
Location:
828
828
  shared repository: %s
829
829
 
1031
1031
        # Show info about repository with revisions
1032
1032
        out, err = self.runbzr('info -v repo')
1033
1033
        self.assertEqualDiff(
1034
 
"""Shared repository with trees (format: dirstate / dirstate-tags / knit)
 
1034
"""Shared repository with trees (format: dirstate or dirstate-tags or knit)
1035
1035
Location:
1036
1036
  shared repository: %s
1037
1037
 
1062
1062
        repo.set_make_working_trees(True)
1063
1063
        out, err = self.runbzr('info -v repo')
1064
1064
        self.assertEqualDiff(
1065
 
"""Shared repository with trees (format: dirstate / dirstate-tags / knit)
 
1065
"""Shared repository with trees (format: dirstate or dirstate-tags or knit)
1066
1066
Location:
1067
1067
  shared repository: %s
1068
1068
 
1160
1160
            (False, True): 'Lightweight checkout',
1161
1161
            (False, False): 'Checkout',
1162
1162
            }[(shared_repo is not None, light_checkout)]
1163
 
        format = {True: 'dirstate / dirstate-tags',
 
1163
        format = {True: 'dirstate or dirstate-tags',
1164
1164
                  False: 'dirstate'}[light_checkout]
1165
1165
        if repo_locked or branch_locked or tree_locked:
1166
1166
            def locked_message(a_bool):