/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
17
"""Remove the last revision from the history of the current branch."""
18
19
# TODO: make the guts of this methods on tree, branch.
0.3.1 by John Arbash Meinel
Creating a plugin for uncommitting the last revision.
20
21
import os
1956.1.1 by John Arbash Meinel
Fix bug #57660: 'bzr uncommit' should preserve pending merges
22
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
23
from bzrlib import revision as _mod_revision
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
24
from bzrlib.branch import Branch
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
25
from bzrlib.errors import BoundBranchOutOfDate
0.3.1 by John Arbash Meinel
Creating a plugin for uncommitting the last revision.
26
27
3280.4.1 by John Arbash Meinel
Add uncommit --local.
28
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
29
             local=False):
0.3.1 by John Arbash Meinel
Creating a plugin for uncommitting the last revision.
30
    """Remove the last revision from the supplied branch.
31
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
32
    :param dry_run: Don't actually change anything
33
    :param verbose: Print each step as you do it
34
    :param revno: Remove back to this revision
0.3.1 by John Arbash Meinel
Creating a plugin for uncommitting the last revision.
35
    """
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
36
    unlockable = []
37
    try:
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
38
        if tree is not None:
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
39
            tree.lock_write()
40
            unlockable.append(tree)
41
        
42
        branch.lock_write()
43
        unlockable.append(branch)
44
1850.3.5 by John Arbash Meinel
Fix bug 31426, have uncommit keep track of pending merges.
45
        pending_merges = []
1956.1.1 by John Arbash Meinel
Fix bug #57660: 'bzr uncommit' should preserve pending merges
46
        if tree is not None:
1908.7.7 by Robert Collins
Deprecated WorkingTree.pending_merges.
47
            pending_merges = tree.get_parent_ids()[1:]
1850.3.5 by John Arbash Meinel
Fix bug 31426, have uncommit keep track of pending merges.
48
3280.4.1 by John Arbash Meinel
Add uncommit --local.
49
        if local:
50
            master = None
51
        else:
52
            master = branch.get_master_branch()
53
            if master is not None:
54
                master.lock_write()
55
                unlockable.append(master)
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
56
        rh = branch.revision_history()
57
        if master is not None and rh[-1] != master.last_revision():
58
            raise BoundBranchOutOfDate(branch, master)
59
        if revno is None:
60
            revno = len(rh)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
61
        old_revno, old_tip = branch.last_revision_info()
62
        new_revno = revno -1
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
63
64
        files_to_remove = []
65
        for r in range(revno-1, len(rh)):
66
            rev_id = rh.pop()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
67
            # NB: performance would be better using the revision graph rather
68
            # than the whole revision.
1850.3.5 by John Arbash Meinel
Fix bug 31426, have uncommit keep track of pending merges.
69
            rev = branch.repository.get_revision(rev_id)
70
            # When we finish popping off the pending merges, we want
71
            # them to stay in the order that they used to be.
72
            # but we pop from the end, so reverse the order, and
73
            # then get the order right at the end
74
            pending_merges.extend(reversed(rev.parent_ids[1:]))
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
75
            if verbose:
76
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
77
78
        # Committing before we start removing files, because
79
        # once we have removed at least one, all the rest are invalid.
80
        if not dry_run:
81
            if master is not None:
82
                master.set_revision_history(rh)
83
            branch.set_revision_history(rh)
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
84
            new_tip = _mod_revision.ensure_null(branch.last_revision())
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
85
            if master is None:
86
                hook_local = None
87
                hook_master = branch
88
            else:
89
                hook_local = branch
90
                hook_master = master
91
            for hook in Branch.hooks['post_uncommit']:
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
92
                hook_new_tip = new_tip
93
                if hook_new_tip == _mod_revision.NULL_REVISION:
94
                    hook_new_tip = None
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
95
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
96
                     hook_new_tip)
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
97
            if tree is not None:
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
98
                if not _mod_revision.is_null(new_tip):
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
99
                    parents = [new_tip]
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
100
                else:
101
                    parents = []
102
                parents.extend(reversed(pending_merges))
1908.6.3 by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.
103
                tree.set_parent_ids(parents)
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
104
    finally:
105
        for item in reversed(unlockable):
106
            item.unlock()