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.
3
Remove the last revision from the history of the current branch.
23
from bzrlib.branch import Branch
24
from bzrlib.errors import BoundBranchOutOfDate
27
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
9
def test_remove(filename):
10
if os.path.exists(filename):
13
print '* file does not exist: %r' % filename
16
def uncommit(branch, remove_files=False,
17
dry_run=False, verbose=False, revno=None):
28
18
"""Remove the last revision from the supplied branch.
30
:param dry_run: Don't actually change anything
31
:param verbose: Print each step as you do it
32
:param revno: Remove back to this revision
20
:param remove_files: If True, remove files from the stores
22
:param force: Don't ask any questions
38
unlockable.append(tree)
41
unlockable.append(branch)
45
pending_merges = tree.get_parent_ids()[1:]
47
master = branch.get_master_branch()
48
if master is not None:
50
unlockable.append(master)
51
rh = branch.revision_history()
52
if master is not None and rh[-1] != master.last_revision():
53
raise BoundBranchOutOfDate(branch, master)
56
old_revno, old_tip = branch.last_revision_info()
60
for r in range(revno-1, len(rh)):
62
# NB: performance would be better using the revision graph rather
63
# than the whole revision.
64
rev = branch.repository.get_revision(rev_id)
65
# When we finish popping off the pending merges, we want
66
# them to stay in the order that they used to be.
67
# but we pop from the end, so reverse the order, and
68
# then get the order right at the end
69
pending_merges.extend(reversed(rev.parent_ids[1:]))
71
print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
73
# Committing before we start removing files, because
74
# once we have removed at least one, all the rest are invalid.
76
if master is not None:
77
master.set_revision_history(rh)
78
branch.set_revision_history(rh)
79
new_tip = branch.last_revision()
86
for hook in Branch.hooks['post_uncommit']:
87
hook(hook_local, hook_master, old_revno, old_tip, new_revno,
90
if new_tip is not None:
24
from bzrlib.atomicfile import AtomicFile
25
rh = branch.revision_history()
30
new_rev_history = AtomicFile(branch.controlfilename('revision-history'))
31
for r in range(revno-1, len(rh)):
34
print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
35
rev = branch.get_revision(rev_id)
36
inv = branch.get_revision_inventory(rev_id)
38
for p in rev.parent_ids:
39
inv_prev.append(branch.get_revision_inventory(p))
42
# Figure out what text-store entries are new
44
# In the future, when we have text_version instead of
45
# text_id, we can just check to see if the text_version
46
# equals the current revision id.
49
if not hasattr(ie, 'text_id'):
51
for other_inv in inv_prev:
52
if file_id in other_inv:
53
other_ie = other_inv[file_id]
54
if other_ie.text_id == ie.text_id:
94
parents.extend(reversed(pending_merges))
95
tree.set_parent_ids(parents)
97
for item in reversed(unlockable):
57
# None of the previous ancestors used
59
files_to_remove.append(branch.controlfilename(['text-store',
61
rev_file = branch.controlfilename(['revision-store',
63
files_to_remove.append(rev_file)
64
inv_file = branch.controlfilename(['inventory-store',
65
rev.inventory_id + '.gz'])
66
files_to_remove.append(inv_file)
68
if verbose and files_to_remove:
69
print 'Removing files:'
70
for f in files_to_remove:
71
print '\t%s' % branch.relpath(f)
73
new_rev_history.write('\n'.join(rh))
75
# Committing before we start removing files, because
76
# once we have removed at least one, all the rest are invalid.
78
new_rev_history.commit()
80
# Actually start removing files
81
for f in files_to_remove:
85
new_rev_history.abort()