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  | 
|
| 
3280.4.4
by John Arbash Meinel
 uncommit --local in an unbound branch raises the same exception as commit --local  | 
23  | 
from bzrlib import (  | 
24  | 
errors,  | 
|
25  | 
revision as _mod_revision,  | 
|
26  | 
    )
 | 
|
| 
2246.1.3
by Robert Collins
 New branch hooks: post_push, post_pull, post_commit, post_uncommit. These  | 
27  | 
from bzrlib.branch import Branch  | 
| 
1558.9.1
by Aaron Bentley
 Fix uncommit to handle bound branches, and to do locking  | 
28  | 
from bzrlib.errors import BoundBranchOutOfDate  | 
| 
0.3.1
by John Arbash Meinel
 Creating a plugin for uncommitting the last revision.  | 
29  | 
|
30  | 
||
| 
3280.4.1
by John Arbash Meinel
 Add uncommit --local.  | 
31  | 
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,  | 
32  | 
local=False):  | 
|
| 
0.3.1
by John Arbash Meinel
 Creating a plugin for uncommitting the last revision.  | 
33  | 
"""Remove the last revision from the supplied branch.  | 
34  | 
||
| 
1185.62.10
by John Arbash Meinel
 Removed --all from bzr uncommit, it was broken anyway.  | 
35  | 
    :param dry_run: Don't actually change anything
 | 
36  | 
    :param verbose: Print each step as you do it
 | 
|
37  | 
    :param revno: Remove back to this revision
 | 
|
| 
3449.2.3
by John Arbash Meinel
 restore --verbose, and document --local  | 
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
 | 
|
40  | 
        local=True.
 | 
|
| 
0.3.1
by John Arbash Meinel
 Creating a plugin for uncommitting the last revision.  | 
41  | 
    """
 | 
| 
1558.9.1
by Aaron Bentley
 Fix uncommit to handle bound branches, and to do locking  | 
42  | 
unlockable = []  | 
43  | 
try:  | 
|
| 
1558.1.12
by Aaron Bentley
 Got uncommit working properly with checkouts  | 
44  | 
if tree is not None:  | 
| 
1558.9.1
by Aaron Bentley
 Fix uncommit to handle bound branches, and to do locking  | 
45  | 
tree.lock_write()  | 
46  | 
unlockable.append(tree)  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
47  | 
|
| 
1558.9.1
by Aaron Bentley
 Fix uncommit to handle bound branches, and to do locking  | 
48  | 
branch.lock_write()  | 
49  | 
unlockable.append(branch)  | 
|
50  | 
||
| 
1850.3.5
by John Arbash Meinel
 Fix bug 31426, have uncommit keep track of pending merges.  | 
51  | 
pending_merges = []  | 
| 
1956.1.1
by John Arbash Meinel
 Fix bug #57660: 'bzr uncommit' should preserve pending merges  | 
52  | 
if tree is not None:  | 
| 
1908.7.7
by Robert Collins
 Deprecated WorkingTree.pending_merges.  | 
53  | 
pending_merges = tree.get_parent_ids()[1:]  | 
| 
1850.3.5
by John Arbash Meinel
 Fix bug 31426, have uncommit keep track of pending merges.  | 
54  | 
|
| 
3280.4.1
by John Arbash Meinel
 Add uncommit --local.  | 
55  | 
if local:  | 
56  | 
master = None  | 
|
| 
3280.4.4
by John Arbash Meinel
 uncommit --local in an unbound branch raises the same exception as commit --local  | 
57  | 
if branch.get_bound_location() is None:  | 
58  | 
raise errors.LocalRequiresBoundBranch()  | 
|
| 
3280.4.1
by John Arbash Meinel
 Add uncommit --local.  | 
59  | 
else:  | 
60  | 
master = branch.get_master_branch()  | 
|
61  | 
if master is not None:  | 
|
62  | 
master.lock_write()  | 
|
63  | 
unlockable.append(master)  | 
|
| 
3449.2.1
by John Arbash Meinel
 bzr uncommit doesn't need to work in terms of 'revision_history()'  | 
64  | 
old_revno, old_tip = branch.last_revision_info()  | 
65  | 
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  | 
66  | 
raise BoundBranchOutOfDate(branch, master)  | 
67  | 
if revno is None:  | 
|
| 
3449.2.1
by John Arbash Meinel
 bzr uncommit doesn't need to work in terms of 'revision_history()'  | 
68  | 
revno = old_revno  | 
69  | 
new_revno = revno - 1  | 
|
| 
1558.9.1
by Aaron Bentley
 Fix uncommit to handle bound branches, and to do locking  | 
70  | 
|
| 
3449.2.1
by John Arbash Meinel
 bzr uncommit doesn't need to work in terms of 'revision_history()'  | 
71  | 
revid_iterator = branch.repository.iter_reverse_revision_history(  | 
72  | 
old_tip)  | 
|
73  | 
cur_revno = old_revno  | 
|
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  | 
|
79  | 
                break
 | 
|
| 
3449.2.3
by John Arbash Meinel
 restore --verbose, and document --local  | 
80  | 
if verbose:  | 
81  | 
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()'  | 
82  | 
cur_revno -= 1  | 
83  | 
parents = graph.get_parent_map([rev_id]).get(rev_id, None)  | 
|
84  | 
if not parents:  | 
|
85  | 
                continue
 | 
|
| 
1850.3.5
by John Arbash Meinel
 Fix bug 31426, have uncommit keep track of pending merges.  | 
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
 | 
|
| 
3449.2.1
by John Arbash Meinel
 bzr uncommit doesn't need to work in terms of 'revision_history()'  | 
90  | 
pending_merges.extend(reversed(parents[1:]))  | 
| 
3449.2.4
by John Arbash Meinel
 properly handle when you uncommit back to NULL_REVISION  | 
91  | 
else:  | 
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  | 
|
| 
1558.9.1
by Aaron Bentley
 Fix uncommit to handle bound branches, and to do locking  | 
95  | 
|
96  | 
if not dry_run:  | 
|
97  | 
if master is not None:  | 
|
| 
3449.2.1
by John Arbash Meinel
 bzr uncommit doesn't need to work in terms of 'revision_history()'  | 
98  | 
master.set_last_revision_info(new_revno, new_revision_id)  | 
99  | 
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  | 
100  | 
if master is None:  | 
101  | 
hook_local = None  | 
|
102  | 
hook_master = branch  | 
|
103  | 
else:  | 
|
104  | 
hook_local = branch  | 
|
105  | 
hook_master = master  | 
|
106  | 
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()'  | 
107  | 
hook_new_tip = new_revision_id  | 
| 
2598.5.2
by Aaron Bentley
 Got all tests passing with Branch returning 'null:' for null revision  | 
108  | 
if hook_new_tip == _mod_revision.NULL_REVISION:  | 
109  | 
hook_new_tip = None  | 
|
| 
2246.1.3
by Robert Collins
 New branch hooks: post_push, post_pull, post_commit, post_uncommit. These  | 
110  | 
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  | 
111  | 
hook_new_tip)  | 
| 
1558.9.1
by Aaron Bentley
 Fix uncommit to handle bound branches, and to do locking  | 
112  | 
if tree is not None:  | 
| 
3449.2.1
by John Arbash Meinel
 bzr uncommit doesn't need to work in terms of 'revision_history()'  | 
113  | 
if not _mod_revision.is_null(new_revision_id):  | 
114  | 
parents = [new_revision_id]  | 
|
| 
1908.6.1
by Robert Collins
 Change all callers of set_last_revision to use set_parent_trees.  | 
115  | 
else:  | 
116  | 
parents = []  | 
|
117  | 
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.  | 
118  | 
tree.set_parent_ids(parents)  | 
| 
1558.9.1
by Aaron Bentley
 Fix uncommit to handle bound branches, and to do locking  | 
119  | 
finally:  | 
120  | 
for item in reversed(unlockable):  | 
|
121  | 
item.unlock()  |