← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Aaron Bentley
  • Date: 2012-07-13 19:32:33 UTC
  • mto: This revision was merged to the branch mainline in revision 6540.
  • Revision ID: aaron@aaronbentley.com-20120713193233-l6y0l0twwhd3wmka
Switch to much simpler implementation of restore_uncommitted.

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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Remove the last revision from the history of the current branch."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
# TODO: make the guts of this methods on tree, branch.
20
22
 
21
 
import os
22
 
 
23
 
from bzrlib import revision as _mod_revision
 
23
from bzrlib import (
 
24
    errors,
 
25
    revision as _mod_revision,
 
26
    )
24
27
from bzrlib.branch import Branch
25
28
from bzrlib.errors import BoundBranchOutOfDate
26
29
 
27
30
 
28
 
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
 
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):
29
54
    """Remove the last revision from the supplied branch.
30
55
 
31
56
    :param dry_run: Don't actually change anything
32
57
    :param verbose: Print each step as you do it
33
58
    :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.
34
64
    """
35
65
    unlockable = []
36
66
    try:
37
67
        if tree is not None:
38
68
            tree.lock_write()
39
69
            unlockable.append(tree)
40
 
        
 
70
 
41
71
        branch.lock_write()
42
72
        unlockable.append(branch)
43
73
 
45
75
        if tree is not None:
46
76
            pending_merges = tree.get_parent_ids()[1:]
47
77
 
48
 
        master = branch.get_master_branch()
49
 
        if master is not None:
50
 
            master.lock_write()
51
 
            unlockable.append(master)
52
 
        rh = branch.revision_history()
53
 
        if master is not None and rh[-1] != master.last_revision():
 
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():
54
89
            raise BoundBranchOutOfDate(branch, master)
55
90
        if revno is None:
56
 
            revno = len(rh)
57
 
        old_revno, old_tip = branch.last_revision_info()
58
 
        new_revno = revno -1
 
91
            revno = old_revno
 
92
        new_revno = revno - 1
59
93
 
60
 
        files_to_remove = []
61
 
        for r in range(revno-1, len(rh)):
62
 
            rev_id = rh.pop()
63
 
            # NB: performance would be better using the revision graph rather
64
 
            # than the whole revision.
65
 
            rev = branch.repository.get_revision(rev_id)
 
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
66
107
            # When we finish popping off the pending merges, we want
67
108
            # them to stay in the order that they used to be.
68
109
            # but we pop from the end, so reverse the order, and
69
110
            # then get the order right at the end
70
 
            pending_merges.extend(reversed(rev.parent_ids[1:]))
71
 
            if verbose:
72
 
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
 
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
73
116
 
74
 
        # Committing before we start removing files, because
75
 
        # once we have removed at least one, all the rest are invalid.
76
117
        if not dry_run:
77
118
            if master is not None:
78
 
                master.set_revision_history(rh)
79
 
            branch.set_revision_history(rh)
80
 
            new_tip = _mod_revision.ensure_null(branch.last_revision())
 
119
                master.set_last_revision_info(new_revno, new_revision_id)
 
120
            branch.set_last_revision_info(new_revno, new_revision_id)
81
121
            if master is None:
82
122
                hook_local = None
83
123
                hook_master = branch
85
125
                hook_local = branch
86
126
                hook_master = master
87
127
            for hook in Branch.hooks['post_uncommit']:
88
 
                hook_new_tip = new_tip
 
128
                hook_new_tip = new_revision_id
89
129
                if hook_new_tip == _mod_revision.NULL_REVISION:
90
130
                    hook_new_tip = None
91
131
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
92
132
                     hook_new_tip)
 
133
            if not _mod_revision.is_null(new_revision_id):
 
134
                parents = [new_revision_id]
 
135
            else:
 
136
                parents = []
93
137
            if tree is not None:
94
 
                if not _mod_revision.is_null(new_tip):
95
 
                    parents = [new_tip]
96
 
                else:
97
 
                    parents = []
98
138
                parents.extend(reversed(pending_merges))
99
139
                tree.set_parent_ids(parents)
 
140
            if branch.supports_tags() and not keep_tags:
 
141
                remove_tags(branch, graph, old_tip, parents)
100
142
    finally:
101
143
        for item in reversed(unlockable):
102
144
            item.unlock()