1
# Copyright (C) 2006 Canonical Ltd
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.
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.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""Remove the last revision from the history of the current branch."""
19
# TODO: make the guts of this methods on tree, branch.
23
revision as _mod_revision,
25
from bzrlib.branch import Branch
26
from bzrlib.errors import BoundBranchOutOfDate
29
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
31
"""Remove the last revision from the supplied branch.
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
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
44
unlockable.append(tree)
47
unlockable.append(branch)
51
pending_merges = tree.get_parent_ids()[1:]
55
if branch.get_bound_location() is None:
56
raise errors.LocalRequiresBoundBranch()
58
master = branch.get_master_branch()
59
if master is not None:
61
unlockable.append(master)
62
old_revno, old_tip = branch.last_revision_info()
63
if master is not None and old_tip != master.last_revision():
64
raise BoundBranchOutOfDate(branch, master)
70
new_revision_id = old_tip
71
graph = branch.repository.get_graph()
72
for rev_id in graph.iter_lefthand_ancestry(old_tip):
73
if cur_revno == new_revno:
74
new_revision_id = rev_id
77
print 'Removing revno %d: %s' % (cur_revno, rev_id)
79
parents = graph.get_parent_map([rev_id]).get(rev_id, None)
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
86
pending_merges.extend(reversed(parents[1:]))
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
93
if master is not None:
94
master.set_last_revision_info(new_revno, new_revision_id)
95
branch.set_last_revision_info(new_revno, new_revision_id)
102
for hook in Branch.hooks['post_uncommit']:
103
hook_new_tip = new_revision_id
104
if hook_new_tip == _mod_revision.NULL_REVISION:
106
hook(hook_local, hook_master, old_revno, old_tip, new_revno,
109
if not _mod_revision.is_null(new_revision_id):
110
parents = [new_revision_id]
113
parents.extend(reversed(pending_merges))
114
tree.set_parent_ids(parents)
116
for item in reversed(unlockable):