← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-27 19:05:43 UTC
  • mto: This revision was merged to the branch mainline in revision 6450.
  • Revision ID: jelmer@samba.org-20120127190543-vk350mv4a0c7aug2
Fix weave test.

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
23
from bzrlib import (
24
24
    errors,
25
25
    revision as _mod_revision,
28
28
from bzrlib.errors import BoundBranchOutOfDate
29
29
 
30
30
 
 
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
 
31
52
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
32
 
             local=False):
 
53
             local=False, keep_tags=False):
33
54
    """Remove the last revision from the supplied branch.
34
55
 
35
56
    :param dry_run: Don't actually change anything
36
57
    :param verbose: Print each step as you do it
37
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.
38
64
    """
39
65
    unlockable = []
40
66
    try:
41
67
        if tree is not None:
42
68
            tree.lock_write()
43
69
            unlockable.append(tree)
44
 
        
 
70
 
45
71
        branch.lock_write()
46
72
        unlockable.append(branch)
47
73
 
58
84
            if master is not None:
59
85
                master.lock_write()
60
86
                unlockable.append(master)
61
 
        rh = branch.revision_history()
62
 
        if master is not None and rh[-1] != master.last_revision():
 
87
        old_revno, old_tip = branch.last_revision_info()
 
88
        if master is not None and old_tip != master.last_revision():
63
89
            raise BoundBranchOutOfDate(branch, master)
64
90
        if revno is None:
65
 
            revno = len(rh)
66
 
        old_revno, old_tip = branch.last_revision_info()
67
 
        new_revno = revno -1
 
91
            revno = old_revno
 
92
        new_revno = revno - 1
68
93
 
69
 
        files_to_remove = []
70
 
        for r in range(revno-1, len(rh)):
71
 
            rev_id = rh.pop()
72
 
            # NB: performance would be better using the revision graph rather
73
 
            # than the whole revision.
74
 
            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
75
107
            # When we finish popping off the pending merges, we want
76
108
            # them to stay in the order that they used to be.
77
109
            # but we pop from the end, so reverse the order, and
78
110
            # then get the order right at the end
79
 
            pending_merges.extend(reversed(rev.parent_ids[1:]))
80
 
            if verbose:
81
 
                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
82
116
 
83
 
        # Committing before we start removing files, because
84
 
        # once we have removed at least one, all the rest are invalid.
85
117
        if not dry_run:
86
118
            if master is not None:
87
 
                master.set_revision_history(rh)
88
 
            branch.set_revision_history(rh)
89
 
            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)
90
121
            if master is None:
91
122
                hook_local = None
92
123
                hook_master = branch
94
125
                hook_local = branch
95
126
                hook_master = master
96
127
            for hook in Branch.hooks['post_uncommit']:
97
 
                hook_new_tip = new_tip
 
128
                hook_new_tip = new_revision_id
98
129
                if hook_new_tip == _mod_revision.NULL_REVISION:
99
130
                    hook_new_tip = None
100
131
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
101
132
                     hook_new_tip)
 
133
            if not _mod_revision.is_null(new_revision_id):
 
134
                parents = [new_revision_id]
 
135
            else:
 
136
                parents = []
102
137
            if tree is not None:
103
 
                if not _mod_revision.is_null(new_tip):
104
 
                    parents = [new_tip]
105
 
                else:
106
 
                    parents = []
107
138
                parents.extend(reversed(pending_merges))
108
139
                tree.set_parent_ids(parents)
 
140
            if branch.supports_tags() and not keep_tags:
 
141
                remove_tags(branch, graph, old_tip, parents)
109
142
    finally:
110
143
        for item in reversed(unlockable):
111
144
            item.unlock()