← 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: Martin Pool
  • Date: 2006-02-22 04:29:54 UTC
  • mfrom: (1566 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1569.
  • Revision ID: mbp@sourcefrog.net-20060222042954-60333f08dd56a646
[merge] from bzr.dev before integration
Fix undefined ordering in sign_my_revisions breaking tests

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
 
 
17
16
"""Command which looks for unsigned commits by the current user, and signs them.
18
17
"""
19
18
 
20
 
from bzrlib import config, gpg
21
19
from bzrlib.commands import Command
22
 
from bzrlib.bzrdir import BzrDir
 
20
import bzrlib.config
 
21
import bzrlib.errors as errors
 
22
import bzrlib.gpg
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
37
34
 
38
35
    takes_options = [Option('dry-run'
39
36
                            , help='Don\'t actually sign anything, just print'
43
40
 
44
41
    def run(self, location=None, committer=None, dry_run=False):
45
42
        if location is None:
46
 
            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
47
47
        else:
48
48
            # Passed in locations should be exact
49
 
            bzrdir = BzrDir.open(location)
50
 
        branch = bzrdir.open_branch()
51
 
        repo = branch.repository
52
 
        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)
53
54
 
54
55
        if committer is None:
55
 
            committer = branch_config.username()
56
 
        gpg_strategy = gpg.GPGStrategy(branch_config)
 
56
            committer = config.username()
 
57
 
 
58
        gpg_strategy = bzrlib.gpg.GPGStrategy(config)
 
59
 
 
60
        if not repo.revision_store.listable():
 
61
            raise errors.BzrCommandError('cannot sign revisions on non-listable transports')
57
62
 
58
63
        count = 0
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()
 
64
        # return in partial topological order for the sake of reproducibility
 
65
        for rev_id in repo.all_revision_ids():
 
66
            if repo.revision_store.has_id(rev_id, suffix='sig'):
 
67
                continue
 
68
            
 
69
            rev = repo.get_revision(rev_id)
 
70
            if rev.committer != committer:
 
71
                continue
 
72
 
 
73
            # We have a revision without a signature who has a 
 
74
            # matching committer, start signing
 
75
            print rev_id
 
76
            count += 1
 
77
            if not dry_run:
 
78
                repo.sign_revision(rev_id, gpg_strategy)
75
79
        print 'Signed %d revisions' % (count,)
76
80
 
77
81