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

  • Committer: Aaron Bentley
  • Date: 2007-08-14 23:35:48 UTC
  • mfrom: (2698 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2699.
  • Revision ID: aaron.bentley@utoronto.ca-20070814233548-ctlr8sb1lcufb3ny
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1950
1950
                ie.revision = previous_ie.revision
1951
1951
                return
1952
1952
        if ie.has_text():
1953
 
            text = self.branch.repository.text_store.get(ie.text_id)
 
1953
            text = self.branch.repository.weave_store.get(ie.text_id)
1954
1954
            file_lines = text.readlines()
1955
1955
            assert sha_strings(file_lines) == ie.text_sha1
1956
1956
            assert sum(map(len, file_lines)) == ie.text_size
2349
2349
 
2350
2350
    def help_topic(self, topic):
2351
2351
        output = textwrap.dedent("""\
2352
 
            Bazaar directory formats
2353
 
            ------------------------
2354
 
 
2355
2352
            These formats can be used for creating branches, working trees, and
2356
2353
            repositories.
2357
2354
 
2370
2367
        def wrapped(key, help, info):
2371
2368
            if info.native:
2372
2369
                help = '(native) ' + help
2373
 
            return '  %s:\n%s\n\n' % (key, 
 
2370
            return ':%s:\n%s\n\n' % (key, 
2374
2371
                    textwrap.fill(help, initial_indent='    ', 
2375
2372
                    subsequent_indent='    '))
2376
 
        output += wrapped('%s/default' % default_realkey, default_help,
 
2373
        output += wrapped(default_realkey, '(default) %s' % default_help,
2377
2374
                          self.get_info('default'))
2378
2375
        deprecated_pairs = []
2379
2376
        for key, help in help_pairs:
2385
2382
            else:
2386
2383
                output += wrapped(key, help, info)
2387
2384
        if len(deprecated_pairs) > 0:
2388
 
            output += "Deprecated formats\n------------------\n\n"
 
2385
            output += "Deprecated formats are shown below.\n\n"
2389
2386
            for key, help in deprecated_pairs:
2390
2387
                info = self.get_info(key)
2391
2388
                output += wrapped(key, help, info)