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

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 10:59:35 UTC
  • mfrom: (6383 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6385.
  • Revision ID: jelmer@canonical.com-20111219105935-9hilixk0anu39v0f
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit_signature_commands.py
61
61
 
62
62
        if committer is None:
63
63
            committer = branch_config.username()
64
 
        gpg_strategy = gpg.GPGStrategy(branch_config)
 
64
        gpg_strategy = gpg.GPGStrategy(branch.get_config_stack())
65
65
 
66
66
        count = 0
67
67
        repo.lock_write()
119
119
        bzrdir = controldir.ControlDir.open_containing(location)[0]
120
120
        branch = bzrdir.open_branch()
121
121
        repo = branch.repository
122
 
        branch_config = branch.get_config()
 
122
        branch_config = branch.get_config_stack()
123
123
        gpg_strategy = gpg.GPGStrategy(branch_config)
124
124
 
125
125
        gpg_strategy.set_acceptable_keys(acceptable_keys)