/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/sign_my_commits.py

  • Committer: John Arbash Meinel
  • Date: 2007-03-20 00:49:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2366.
  • Revision ID: john@arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
Simplify the test even further....
Basically, if you have a file deleted as removed, and then you unversion its directory
it deletes all records in the dirblock, not realizing that some of them might
already be marked as removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/sign_my_commits.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
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
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Command which looks for unsigned commits by the current user, and signs them.
18
18
"""
30
30
 
31
31
 
32
32
class cmd_sign_my_commits(Command):
33
 
    __doc__ = """Sign all commits by a given committer.
 
33
    """Sign all commits by a given committer.
34
34
 
35
35
    If location is not specified the local tree is used.
36
36
    If committer is not specified the default committer is used.
41
41
    # (both mainline and merged), but not other revisions that may be in the
42
42
    # repository
43
43
 
44
 
    takes_options = [
45
 
            Option('dry-run',
46
 
                   help='Don\'t actually sign anything, just print'
47
 
                        ' the revisions that would be signed.'),
48
 
            ]
 
44
    takes_options = [Option('dry-run'
 
45
                            , help='Don\'t actually sign anything, just print'
 
46
                                   ' the revisions that would be signed')
 
47
                    ]
49
48
    takes_args = ['location?', 'committer?']
50
49
 
51
50
    def run(self, location=None, committer=None, dry_run=False):
65
64
        count = 0
66
65
        repo.lock_write()
67
66
        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()
 
67
            for rev_id in repo.get_ancestry(branch.last_revision())[1:]:
 
68
                if repo.has_signature_for_revision_id(rev_id):
 
69
                    continue
 
70
                rev = repo.get_revision(rev_id)
 
71
                if rev.committer != committer:
 
72
                    continue
 
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)
87
79
        finally:
88
80
            repo.unlock()
89
81
        print 'Signed %d revisions' % (count,)