← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/sign_my_commits.py

Merge Tree.changes_from work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/sign_my_commits.py
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
16
17
"""Command which looks for unsigned commits by the current user, and signs them.
17
18
"""
18
19
 
 
20
from bzrlib import config, gpg
19
21
from bzrlib.commands import Command
20
 
import bzrlib.config
21
 
import bzrlib.errors as errors
22
 
import bzrlib.gpg
 
22
from bzrlib.bzrdir import BzrDir
23
23
from bzrlib.option import Option
24
24
 
25
25
 
31
31
 
32
32
    This does not sign commits that already have signatures.
33
33
    """
 
34
    # Note that this signs everything on the branch's ancestry
 
35
    # (both mainline and merged), but not other revisions that may be in the
 
36
    # repository
34
37
 
35
38
    takes_options = [Option('dry-run'
36
39
                            , help='Don\'t actually sign anything, just print'
40
43
 
41
44
    def run(self, location=None, committer=None, dry_run=False):
42
45
        if location is None:
43
 
            from bzrlib.workingtree import WorkingTree
44
 
            # Open the containing directory
45
 
            wt = WorkingTree.open_containing('.')[0]
46
 
            b = wt.branch
 
46
            bzrdir = BzrDir.open_containing('.')[0]
47
47
        else:
48
48
            # Passed in locations should be exact
49
 
            from bzrlib.branch import Branch
50
 
            b = Branch.open(location)
51
 
        repo = getattr(b, 'repository', b)
52
 
 
53
 
        config = bzrlib.config.BranchConfig(b)
 
49
            bzrdir = BzrDir.open(location)
 
50
        branch = bzrdir.open_branch()
 
51
        repo = branch.repository
 
52
        branch_config = branch.get_config()
54
53
 
55
54
        if committer is None:
56
 
            committer = config.username()
57
 
 
58
 
        gpg_strategy = bzrlib.gpg.GPGStrategy(config)
 
55
            committer = branch_config.username()
 
56
        gpg_strategy = gpg.GPGStrategy(branch_config)
59
57
 
60
58
        count = 0
61
 
        # return in partial topological order for the sake of reproducibility
62
 
        for rev_id in repo.all_revision_ids():
63
 
            if repo.has_signature_for_revision_id(rev_id):
64
 
                continue
65
 
            
66
 
            rev = repo.get_revision(rev_id)
67
 
            if rev.committer != committer:
68
 
                continue
69
 
 
70
 
            # We have a revision without a signature who has a 
71
 
            # matching committer, start signing
72
 
            print rev_id
73
 
            count += 1
74
 
            if not dry_run:
75
 
                repo.sign_revision(rev_id, gpg_strategy)
 
59
        repo.lock_write()
 
60
        try:
 
61
            for rev_id in repo.get_ancestry(branch.last_revision())[1:]:
 
62
                if repo.has_signature_for_revision_id(rev_id):
 
63
                    continue
 
64
                rev = repo.get_revision(rev_id)
 
65
                if rev.committer != committer:
 
66
                    continue
 
67
                # We have a revision without a signature who has a 
 
68
                # matching committer, start signing
 
69
                print rev_id
 
70
                count += 1
 
71
                if not dry_run:
 
72
                    repo.sign_revision(rev_id, gpg_strategy)
 
73
        finally:
 
74
            repo.unlock()
76
75
        print 'Signed %d revisions' % (count,)
77
76
 
78
77