← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2006-06-21 20:08:02 UTC
  • mto: This revision was merged to the branch mainline in revision 1804.
  • Revision ID: abentley@panoramicfeedback.com-20060621200802-3c2a9b19242c2d6a
Add Branch.get_config, update BranchConfig() callers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1319
1319
            (rev2, rev1) = (rev1, rev2)
1320
1320
 
1321
1321
        if (log_format == None):
1322
 
            default = bzrlib.config.BranchConfig(b).log_format()
1323
 
            log_format = get_log_format(long=long, short=short, line=line, default=default)
 
1322
            default = b.get_config().log_format()
 
1323
            log_format = get_log_format(long=long, short=short, line=line, 
 
1324
                                        default=default)
1324
1325
        lf = log_formatter(log_format,
1325
1326
                           show_ids=show_ids,
1326
1327
                           to_file=self.outf,
1779
1780
    def run(self, email=False):
1780
1781
        try:
1781
1782
            b = WorkingTree.open_containing(u'.')[0].branch
1782
 
            config = bzrlib.config.BranchConfig(b)
 
1783
            config = b.get_config()
1783
1784
        except NotBranchError:
1784
1785
            config = bzrlib.config.GlobalConfig()
1785
1786
        
2358
2359
            try:
2359
2360
                local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2360
2361
                if (log_format == None):
2361
 
                    default = bzrlib.config.BranchConfig(local_branch).log_format()
2362
 
                    log_format = get_log_format(long=long, short=short, line=line, default=default)
 
2362
                    default = local_branch.get_config().log_format()
 
2363
                    log_format = get_log_format(long=long, short=short, 
 
2364
                                                line=line, default=default)
2363
2365
                lf = log_formatter(log_format, sys.stdout,
2364
2366
                                   show_ids=show_ids,
2365
2367
                                   show_timezone='original')
2500
2502
        if revision_id_list is None and revision is None:
2501
2503
            raise BzrCommandError('You must supply either --revision or a revision_id')
2502
2504
        b = WorkingTree.open_containing(u'.')[0].branch
2503
 
        gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
 
2505
        gpg_strategy = gpg.GPGStrategy(b.get_config())
2504
2506
        if revision_id_list is not None:
2505
2507
            for revision_id in revision_id_list:
2506
2508
                b.repository.sign_revision(revision_id, gpg_strategy)