← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/sign_my_commits.py

  • Committer: John Arbash Meinel
  • Date: 2006-05-27 04:48:39 UTC
  • mto: (1711.2.26 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1734.
  • Revision ID: john@arbash-meinel.com-20060527044839-83fdd64ce7d708bb
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/sign_my_commits.py
1
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
 
#
 
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
 
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
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
16
"""Command which looks for unsigned commits by the current user, and signs them.
18
17
"""
19
18
 
20
 
from bzrlib.lazy_import import lazy_import
21
 
lazy_import(globals(), """
22
 
from bzrlib import (
23
 
    config,
24
 
    gpg,
25
 
    )
26
 
from bzrlib.bzrdir import BzrDir
27
 
""")
28
19
from bzrlib.commands import Command
 
20
import bzrlib.config
 
21
import bzrlib.errors as errors
 
22
import bzrlib.gpg
29
23
from bzrlib.option import Option
30
24
 
31
25
 
37
31
 
38
32
    This does not sign commits that already have signatures.
39
33
    """
40
 
    # Note that this signs everything on the branch's ancestry
41
 
    # (both mainline and merged), but not other revisions that may be in the
42
 
    # repository
43
34
 
44
 
    takes_options = [
45
 
            Option('dry-run',
46
 
                   help='Don\'t actually sign anything, just print'
47
 
                        ' the revisions that would be signed.'),
48
 
            ]
 
35
    takes_options = [Option('dry-run'
 
36
                            , help='Don\'t actually sign anything, just print'
 
37
                                   ' the revisions that would be signed')
 
38
                    ]
49
39
    takes_args = ['location?', 'committer?']
50
40
 
51
41
    def run(self, location=None, committer=None, dry_run=False):
52
42
        if location is None:
53
 
            bzrdir = BzrDir.open_containing('.')[0]
 
43
            from bzrlib.workingtree import WorkingTree
 
44
            # Open the containing directory
 
45
            wt = WorkingTree.open_containing('.')[0]
 
46
            b = wt.branch
54
47
        else:
55
48
            # Passed in locations should be exact
56
 
            bzrdir = BzrDir.open(location)
57
 
        branch = bzrdir.open_branch()
58
 
        repo = branch.repository
59
 
        branch_config = branch.get_config()
 
49
            from bzrlib.branch import Branch
 
50
            b = Branch.open(location)
 
51
        repo = getattr(b, 'repository', b)
 
52
 
 
53
        config = bzrlib.config.BranchConfig(b)
60
54
 
61
55
        if committer is None:
62
 
            committer = branch_config.username()
63
 
        gpg_strategy = gpg.GPGStrategy(branch_config)
 
56
            committer = config.username()
 
57
 
 
58
        gpg_strategy = bzrlib.gpg.GPGStrategy(config)
64
59
 
65
60
        count = 0
66
 
        repo.lock_write()
67
 
        try:
68
 
            repo.start_write_group()
69
 
            try:
70
 
                for rev_id in repo.get_ancestry(branch.last_revision())[1:]:
71
 
                    if repo.has_signature_for_revision_id(rev_id):
72
 
                        continue
73
 
                    rev = repo.get_revision(rev_id)
74
 
                    if rev.committer != committer:
75
 
                        continue
76
 
                    # We have a revision without a signature who has a
77
 
                    # matching committer, start signing
78
 
                    print rev_id
79
 
                    count += 1
80
 
                    if not dry_run:
81
 
                        repo.sign_revision(rev_id, gpg_strategy)
82
 
            except:
83
 
                repo.abort_write_group()
84
 
                raise
85
 
            else:
86
 
                repo.commit_write_group()
87
 
        finally:
88
 
            repo.unlock()
 
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)
89
76
        print 'Signed %d revisions' % (count,)
90
77
 
91
78