← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

Merge bzr.dev (and fix NEWS)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
16
 
 
17
 
"""Remove the last revision from the history of the current branch."""
18
 
 
19
 
from __future__ import absolute_import
20
 
 
21
 
# TODO: make the guts of this methods on tree, branch.
22
 
 
23
 
from bzrlib import (
24
 
    errors,
25
 
    revision as _mod_revision,
26
 
    )
27
 
from bzrlib.branch import Branch
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
"""Remove the last revision from the history of the current branch.
 
18
"""
 
19
 
 
20
import os
 
21
 
28
22
from bzrlib.errors import BoundBranchOutOfDate
29
23
 
30
24
 
31
 
def remove_tags(branch, graph, old_tip, parents):
32
 
    """Remove tags on revisions between old_tip and new_tip.
33
 
 
34
 
    :param branch: Branch to remove tags from
35
 
    :param graph: Graph object for branch repository
36
 
    :param old_tip: Old branch tip
37
 
    :param parents: New parents
38
 
    :return: Names of the removed tags
39
 
    """
40
 
    reverse_tags = branch.tags.get_reverse_tag_dict()
41
 
    ancestors = graph.find_unique_ancestors(old_tip, parents)
42
 
    removed_tags = []
43
 
    for revid, tags in reverse_tags.iteritems():
44
 
        if not revid in ancestors:
45
 
            continue
46
 
        for tag in tags:
47
 
            branch.tags.delete_tag(tag)
48
 
            removed_tags.append(tag)
49
 
    return removed_tags
50
 
 
51
 
 
52
 
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
53
 
             local=False, keep_tags=False):
 
25
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
54
26
    """Remove the last revision from the supplied branch.
55
27
 
56
28
    :param dry_run: Don't actually change anything
57
29
    :param verbose: Print each step as you do it
58
30
    :param revno: Remove back to this revision
59
 
    :param local: If this branch is bound, only remove the revisions from the
60
 
        local branch. If this branch is not bound, it is an error to pass
61
 
        local=True.
62
 
    :param keep_tags: Whether to keep tags pointing at the removed revisions
63
 
        around.
64
31
    """
65
32
    unlockable = []
66
33
    try:
67
34
        if tree is not None:
68
35
            tree.lock_write()
69
36
            unlockable.append(tree)
70
 
 
 
37
        
71
38
        branch.lock_write()
72
39
        unlockable.append(branch)
73
40
 
74
41
        pending_merges = []
75
42
        if tree is not None:
76
 
            pending_merges = tree.get_parent_ids()[1:]
 
43
            pending_merges = tree.pending_merges()
77
44
 
78
 
        if local:
79
 
            master = None
80
 
            if branch.get_bound_location() is None:
81
 
                raise errors.LocalRequiresBoundBranch()
82
 
        else:
83
 
            master = branch.get_master_branch()
84
 
            if master is not None:
85
 
                master.lock_write()
86
 
                unlockable.append(master)
87
 
        old_revno, old_tip = branch.last_revision_info()
88
 
        if master is not None and old_tip != master.last_revision():
 
45
        master = branch.get_master_branch()
 
46
        if master is not None:
 
47
            master.lock_write()
 
48
            unlockable.append(master)
 
49
        rh = branch.revision_history()
 
50
        if master is not None and rh[-1] != master.last_revision():
89
51
            raise BoundBranchOutOfDate(branch, master)
90
52
        if revno is None:
91
 
            revno = old_revno
92
 
        new_revno = revno - 1
 
53
            revno = len(rh)
93
54
 
94
 
        cur_revno = old_revno
95
 
        new_revision_id = old_tip
96
 
        graph = branch.repository.get_graph()
97
 
        for rev_id in graph.iter_lefthand_ancestry(old_tip):
98
 
            if cur_revno == new_revno:
99
 
                new_revision_id = rev_id
100
 
                break
101
 
            if verbose:
102
 
                print 'Removing revno %d: %s' % (cur_revno, rev_id)
103
 
            cur_revno -= 1
104
 
            parents = graph.get_parent_map([rev_id]).get(rev_id, None)
105
 
            if not parents:
106
 
                continue
 
55
        files_to_remove = []
 
56
        for r in range(revno-1, len(rh)):
 
57
            rev_id = rh.pop()
 
58
            rev = branch.repository.get_revision(rev_id)
107
59
            # When we finish popping off the pending merges, we want
108
60
            # them to stay in the order that they used to be.
109
61
            # but we pop from the end, so reverse the order, and
110
62
            # then get the order right at the end
111
 
            pending_merges.extend(reversed(parents[1:]))
112
 
        else:
113
 
            # We ran off the end of revisions, which means we should be trying
114
 
            # to get to NULL_REVISION
115
 
            new_revision_id = _mod_revision.NULL_REVISION
116
 
 
 
63
            pending_merges.extend(reversed(rev.parent_ids[1:]))
 
64
            if verbose:
 
65
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
 
66
 
 
67
 
 
68
        # Committing before we start removing files, because
 
69
        # once we have removed at least one, all the rest are invalid.
117
70
        if not dry_run:
118
71
            if master is not None:
119
 
                master.set_last_revision_info(new_revno, new_revision_id)
120
 
            branch.set_last_revision_info(new_revno, new_revision_id)
121
 
            if master is None:
122
 
                hook_local = None
123
 
                hook_master = branch
124
 
            else:
125
 
                hook_local = branch
126
 
                hook_master = master
127
 
            for hook in Branch.hooks['post_uncommit']:
128
 
                hook_new_tip = new_revision_id
129
 
                if hook_new_tip == _mod_revision.NULL_REVISION:
130
 
                    hook_new_tip = None
131
 
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
132
 
                     hook_new_tip)
133
 
            if not _mod_revision.is_null(new_revision_id):
134
 
                parents = [new_revision_id]
135
 
            else:
136
 
                parents = []
 
72
                master.set_revision_history(rh)
 
73
            branch.set_revision_history(rh)
137
74
            if tree is not None:
138
 
                parents.extend(reversed(pending_merges))
139
 
                tree.set_parent_ids(parents)
140
 
            if branch.supports_tags() and not keep_tags:
141
 
                remove_tags(branch, graph, old_tip, parents)
 
75
                tree.set_last_revision(branch.last_revision())
 
76
                pending_merges.reverse()
 
77
                tree.set_pending_merges(pending_merges)
142
78
    finally:
143
79
        for item in reversed(unlockable):
144
80
            item.unlock()