← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-12-02 14:58:47 UTC
  • mfrom: (5554.1.3 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20101202145847-fw822sd3nyhvrwmi
(vila) Merge 2.2 into trunk including fix for bug #583667 and bug
        #681885 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
16
16
 
17
17
"""Remove the last revision from the history of the current branch."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
# TODO: make the guts of this methods on tree, branch.
22
20
 
23
21
from bzrlib import (
28
26
from bzrlib.errors import BoundBranchOutOfDate
29
27
 
30
28
 
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
29
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
53
 
             local=False, keep_tags=False):
 
30
             local=False):
54
31
    """Remove the last revision from the supplied branch.
55
32
 
56
33
    :param dry_run: Don't actually change anything
59
36
    :param local: If this branch is bound, only remove the revisions from the
60
37
        local branch. If this branch is not bound, it is an error to pass
61
38
        local=True.
62
 
    :param keep_tags: Whether to keep tags pointing at the removed revisions
63
 
        around.
64
39
    """
65
40
    unlockable = []
66
41
    try:
91
66
            revno = old_revno
92
67
        new_revno = revno - 1
93
68
 
 
69
        revid_iterator = branch.repository.iter_reverse_revision_history(
 
70
                            old_tip)
94
71
        cur_revno = old_revno
95
72
        new_revision_id = old_tip
96
73
        graph = branch.repository.get_graph()
97
 
        for rev_id in graph.iter_lefthand_ancestry(old_tip):
 
74
        for rev_id in revid_iterator:
98
75
            if cur_revno == new_revno:
99
76
                new_revision_id = rev_id
100
77
                break
130
107
                    hook_new_tip = None
131
108
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
132
109
                     hook_new_tip)
133
 
            if not _mod_revision.is_null(new_revision_id):
134
 
                parents = [new_revision_id]
135
 
            else:
136
 
                parents = []
137
110
            if tree is not None:
 
111
                if not _mod_revision.is_null(new_revision_id):
 
112
                    parents = [new_revision_id]
 
113
                else:
 
114
                    parents = []
138
115
                parents.extend(reversed(pending_merges))
139
116
                tree.set_parent_ids(parents)
140
 
            if branch.supports_tags() and not keep_tags:
141
 
                remove_tags(branch, graph, old_tip, parents)
142
117
    finally:
143
118
        for item in reversed(unlockable):
144
119
            item.unlock()