← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit_signature_commands.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-25 15:28:53 UTC
  • mfrom: (6475.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120225152853-nz1w2gsfv7lc1yq4
(jelmer) Update documentation to mention command hooks landed in bzr 2.6
 rather than 2.5. (Brian de Alwis)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit_signature_commands.py
17
17
"""Command which looks for unsigned commits by the current user, and signs them.
18
18
"""
19
19
 
 
20
from __future__ import absolute_import
 
21
 
20
22
from bzrlib.lazy_import import lazy_import
21
23
lazy_import(globals(), """
22
24
from bzrlib import (
57
59
            bzrdir = controldir.ControlDir.open(location)
58
60
        branch = bzrdir.open_branch()
59
61
        repo = branch.repository
60
 
        branch_config = branch.get_config()
 
62
        branch_config = branch.get_config_stack()
61
63
 
62
64
        if committer is None:
63
 
            committer = branch_config.username()
 
65
            committer = branch_config.get('email')
64
66
        gpg_strategy = gpg.GPGStrategy(branch_config)
65
67
 
66
68
        count = 0
119
121
        bzrdir = controldir.ControlDir.open_containing(location)[0]
120
122
        branch = bzrdir.open_branch()
121
123
        repo = branch.repository
122
 
        branch_config = branch.get_config()
 
124
        branch_config = branch.get_config_stack()
123
125
        gpg_strategy = gpg.GPGStrategy(branch_config)
124
126
 
125
127
        gpg_strategy.set_acceptable_keys(acceptable_keys)