← 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: Jelmer Vernooij
  • Date: 2012-02-28 10:06:39 UTC
  • mfrom: (6437.40.2 rmbranch-colo)
  • mto: This revision was merged to the branch mainline in revision 6482.
  • Revision ID: jelmer@samba.org-20120228100639-p5gndu91wuqwugti
Merge rmbranch-colo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit_signature_commands.py
59
59
            bzrdir = controldir.ControlDir.open(location)
60
60
        branch = bzrdir.open_branch()
61
61
        repo = branch.repository
62
 
        branch_config = branch.get_config()
 
62
        branch_config = branch.get_config_stack()
63
63
 
64
64
        if committer is None:
65
 
            committer = branch_config.username()
66
 
        gpg_strategy = gpg.GPGStrategy(branch.get_config_stack())
 
65
            committer = branch_config.get('email')
 
66
        gpg_strategy = gpg.GPGStrategy(branch_config)
67
67
 
68
68
        count = 0
69
69
        repo.lock_write()