~bzr-pqm/bzr/bzr.dev

1704.2.25 by Martin Pool
Remove obsolete shebang line; add copyright
1
# Copyright (C) 2006 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Remove the last revision from the history of the current branch.
0.3.1 by John Arbash Meinel
Creating a plugin for uncommitting the last revision.
18
"""
19
20
import os
21
import bzrlib
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
22
from bzrlib.errors import BoundBranchOutOfDate
0.3.1 by John Arbash Meinel
Creating a plugin for uncommitting the last revision.
23
24
def test_remove(filename):
25
    if os.path.exists(filename):
26
        os.remove(filename)
27
    else:
28
        print '* file does not exist: %r' % filename
29
30
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
31
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
0.3.1 by John Arbash Meinel
Creating a plugin for uncommitting the last revision.
32
    """Remove the last revision from the supplied branch.
33
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
34
    :param dry_run: Don't actually change anything
35
    :param verbose: Print each step as you do it
36
    :param revno: Remove back to this revision
0.3.1 by John Arbash Meinel
Creating a plugin for uncommitting the last revision.
37
    """
38
    from bzrlib.atomicfile import AtomicFile
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
39
    unlockable = []
40
    try:
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
41
        if tree is not None:
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
42
            tree.lock_write()
43
            unlockable.append(tree)
44
        
45
        branch.lock_write()
46
        unlockable.append(branch)
47
48
        master = branch.get_master_branch()
49
        if master is not None:
50
            master.lock_write()
51
            unlockable.append(master)
52
        rh = branch.revision_history()
53
        if master is not None and rh[-1] != master.last_revision():
54
            raise BoundBranchOutOfDate(branch, master)
55
        if revno is None:
56
            revno = len(rh)
57
58
        files_to_remove = []
59
        for r in range(revno-1, len(rh)):
60
            rev_id = rh.pop()
61
            if verbose:
62
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
63
64
65
        # Committing before we start removing files, because
66
        # once we have removed at least one, all the rest are invalid.
67
        if not dry_run:
68
            if master is not None:
69
                master.set_revision_history(rh)
70
            branch.set_revision_history(rh)
71
            if tree is not None:
72
                tree.set_last_revision(branch.last_revision())
73
    finally:
74
        for item in reversed(unlockable):
75
            item.unlock()