3
Remove the last revision from the history of the current branch.
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""Remove the last revision from the history of the current branch."""
19
# TODO: make the guts of this methods on tree, branch.
9
def test_remove(filename):
10
if os.path.exists(filename):
13
print '* file does not exist: %r' % filename
16
def uncommit(branch, dry_run=False, verbose=False, revno=None):
25
revision as _mod_revision,
27
from bzrlib.branch import Branch
28
from bzrlib.errors import BoundBranchOutOfDate
31
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
17
33
"""Remove the last revision from the supplied branch.
19
35
:param dry_run: Don't actually change anything
20
36
:param verbose: Print each step as you do it
21
37
:param revno: Remove back to this revision
38
:param local: If this branch is bound, only remove the revisions from the
39
local branch. If this branch is not bound, it is an error to pass
23
from bzrlib.atomicfile import AtomicFile
24
rh = branch.revision_history()
29
new_rev_history = AtomicFile(branch.control_files.controlfilename('revision-history'))
30
for r in range(revno-1, len(rh)):
33
print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
35
new_rev_history.write('\n'.join(rh))
37
# Committing before we start removing files, because
38
# once we have removed at least one, all the rest are invalid.
40
new_rev_history.commit()
42
new_rev_history.abort()
46
unlockable.append(tree)
49
unlockable.append(branch)
53
pending_merges = tree.get_parent_ids()[1:]
57
if branch.get_bound_location() is None:
58
raise errors.LocalRequiresBoundBranch()
60
master = branch.get_master_branch()
61
if master is not None:
63
unlockable.append(master)
64
old_revno, old_tip = branch.last_revision_info()
65
if master is not None and old_tip != master.last_revision():
66
raise BoundBranchOutOfDate(branch, master)
71
revid_iterator = branch.repository.iter_reverse_revision_history(
74
new_revision_id = old_tip
75
graph = branch.repository.get_graph()
76
for rev_id in revid_iterator:
77
if cur_revno == new_revno:
78
new_revision_id = rev_id
81
print 'Removing revno %d: %s' % (cur_revno, rev_id)
83
parents = graph.get_parent_map([rev_id]).get(rev_id, None)
86
# When we finish popping off the pending merges, we want
87
# them to stay in the order that they used to be.
88
# but we pop from the end, so reverse the order, and
89
# then get the order right at the end
90
pending_merges.extend(reversed(parents[1:]))
92
# We ran off the end of revisions, which means we should be trying
93
# to get to NULL_REVISION
94
new_revision_id = _mod_revision.NULL_REVISION
97
if master is not None:
98
master.set_last_revision_info(new_revno, new_revision_id)
99
branch.set_last_revision_info(new_revno, new_revision_id)
106
for hook in Branch.hooks['post_uncommit']:
107
hook_new_tip = new_revision_id
108
if hook_new_tip == _mod_revision.NULL_REVISION:
110
hook(hook_local, hook_master, old_revno, old_tip, new_revno,
113
if not _mod_revision.is_null(new_revision_id):
114
parents = [new_revision_id]
117
parents.extend(reversed(pending_merges))
118
tree.set_parent_ids(parents)
120
for item in reversed(unlockable):