~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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1704.2.25 by Martin Pool
Remove obsolete shebang line; add copyright
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
3280.4.4 by John Arbash Meinel
uncommit --local in an unbound branch raises the same exception as commit --local
21
from bzrlib import (
22
    errors,
23
    revision as _mod_revision,
24
    )
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
25
from bzrlib.branch import Branch
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
26
from bzrlib.errors import BoundBranchOutOfDate
0.3.1 by John Arbash Meinel
Creating a plugin for uncommitting the last revision.
27
28
3280.4.1 by John Arbash Meinel
Add uncommit --local.
29
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
30
             local=False):
0.3.1 by John Arbash Meinel
Creating a plugin for uncommitting the last revision.
31
    """Remove the last revision from the supplied branch.
32
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
33
    :param dry_run: Don't actually change anything
34
    :param verbose: Print each step as you do it
35
    :param revno: Remove back to this revision
3449.2.3 by John Arbash Meinel
restore --verbose, and document --local
36
    :param local: If this branch is bound, only remove the revisions from the
37
        local branch. If this branch is not bound, it is an error to pass
38
        local=True.
0.3.1 by John Arbash Meinel
Creating a plugin for uncommitting the last revision.
39
    """
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
40
    unlockable = []
41
    try:
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
42
        if tree is not None:
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
43
            tree.lock_write()
44
            unlockable.append(tree)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
45
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
46
        branch.lock_write()
47
        unlockable.append(branch)
48
1850.3.5 by John Arbash Meinel
Fix bug 31426, have uncommit keep track of pending merges.
49
        pending_merges = []
1956.1.1 by John Arbash Meinel
Fix bug #57660: 'bzr uncommit' should preserve pending merges
50
        if tree is not None:
1908.7.7 by Robert Collins
Deprecated WorkingTree.pending_merges.
51
            pending_merges = tree.get_parent_ids()[1:]
1850.3.5 by John Arbash Meinel
Fix bug 31426, have uncommit keep track of pending merges.
52
3280.4.1 by John Arbash Meinel
Add uncommit --local.
53
        if local:
54
            master = None
3280.4.4 by John Arbash Meinel
uncommit --local in an unbound branch raises the same exception as commit --local
55
            if branch.get_bound_location() is None:
56
                raise errors.LocalRequiresBoundBranch()
3280.4.1 by John Arbash Meinel
Add uncommit --local.
57
        else:
58
            master = branch.get_master_branch()
59
            if master is not None:
60
                master.lock_write()
61
                unlockable.append(master)
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
62
        old_revno, old_tip = branch.last_revision_info()
63
        if master is not None and old_tip != master.last_revision():
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
64
            raise BoundBranchOutOfDate(branch, master)
65
        if revno is None:
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
66
            revno = old_revno
67
        new_revno = revno - 1
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
68
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
69
        cur_revno = old_revno
70
        new_revision_id = old_tip
71
        graph = branch.repository.get_graph()
5972.2.1 by Jelmer Vernooij
Deprecate Repository.iter_reverse_revision_history.
72
        for rev_id in graph.iter_lefthand_ancestry(old_tip):
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
73
            if cur_revno == new_revno:
74
                new_revision_id = rev_id
75
                break
3449.2.3 by John Arbash Meinel
restore --verbose, and document --local
76
            if verbose:
77
                print 'Removing revno %d: %s' % (cur_revno, rev_id)
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
78
            cur_revno -= 1
79
            parents = graph.get_parent_map([rev_id]).get(rev_id, None)
80
            if not parents:
81
                continue
1850.3.5 by John Arbash Meinel
Fix bug 31426, have uncommit keep track of pending merges.
82
            # When we finish popping off the pending merges, we want
83
            # them to stay in the order that they used to be.
84
            # but we pop from the end, so reverse the order, and
85
            # then get the order right at the end
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
86
            pending_merges.extend(reversed(parents[1:]))
3449.2.4 by John Arbash Meinel
properly handle when you uncommit back to NULL_REVISION
87
        else:
88
            # We ran off the end of revisions, which means we should be trying
89
            # to get to NULL_REVISION
90
            new_revision_id = _mod_revision.NULL_REVISION
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
91
92
        if not dry_run:
93
            if master is not None:
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
94
                master.set_last_revision_info(new_revno, new_revision_id)
95
            branch.set_last_revision_info(new_revno, new_revision_id)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
96
            if master is None:
97
                hook_local = None
98
                hook_master = branch
99
            else:
100
                hook_local = branch
101
                hook_master = master
102
            for hook in Branch.hooks['post_uncommit']:
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
103
                hook_new_tip = new_revision_id
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
104
                if hook_new_tip == _mod_revision.NULL_REVISION:
105
                    hook_new_tip = None
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
106
                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
107
                     hook_new_tip)
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
108
            if tree is not None:
3449.2.1 by John Arbash Meinel
bzr uncommit doesn't need to work in terms of 'revision_history()'
109
                if not _mod_revision.is_null(new_revision_id):
110
                    parents = [new_revision_id]
1908.6.1 by Robert Collins
Change all callers of set_last_revision to use set_parent_trees.
111
                else:
112
                    parents = []
113
                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.
114
                tree.set_parent_ids(parents)
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
115
    finally:
116
        for item in reversed(unlockable):
117
            item.unlock()