~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: 2011-10-14 16:54:26 UTC
  • mfrom: (6216.1.1 remove-this-file)
  • Revision ID: pqm@pqm.ubuntu.com-20111014165426-tjix4e6idryf1r2z
(jelmer) Remove an accidentally committed .THIS file. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
 
22
20
from bzrlib.lazy_import import lazy_import
23
21
lazy_import(globals(), """
24
22
from bzrlib import (
63
61
 
64
62
        if committer is None:
65
63
            committer = branch_config.username()
66
 
        gpg_strategy = gpg.GPGStrategy(branch.get_config_stack())
 
64
        gpg_strategy = gpg.GPGStrategy(branch_config)
67
65
 
68
66
        count = 0
69
67
        repo.lock_write()
121
119
        bzrdir = controldir.ControlDir.open_containing(location)[0]
122
120
        branch = bzrdir.open_branch()
123
121
        repo = branch.repository
124
 
        branch_config = branch.get_config_stack()
 
122
        branch_config = branch.get_config()
125
123
        gpg_strategy = gpg.GPGStrategy(branch_config)
126
124
 
127
125
        gpg_strategy.set_acceptable_keys(acceptable_keys)