← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Andrew Bennetts
  • Date: 2010-07-29 11:17:57 UTC
  • mfrom: (5050.3.17 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100729111757-018h3pcefo7z0dnq
Merge lp:bzr/2.2 into lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
26
26
from bzrlib.errors import BoundBranchOutOfDate
27
27
 
28
28
 
29
 
def remove_tags(branch, graph, old_tip, new_tip):
30
 
    """Remove tags on revisions between old_tip and new_tip.
31
 
 
32
 
    :param branch: Branch to remove tags from
33
 
    :param graph: Graph object for branch repository
34
 
    :param old_tip: Old branch tip
35
 
    :param new_tip: New branch tip
36
 
    :return: Names of the removed tags
37
 
    """
38
 
    reverse_tags = branch.tags.get_reverse_tag_dict()
39
 
    ancestors = graph.find_unique_ancestors(old_tip, [new_tip])
40
 
    removed_tags = []
41
 
    for revid, tags in reverse_tags.iteritems():
42
 
        if not revid in ancestors:
43
 
            continue
44
 
        for tag in tags:
45
 
            branch.tags.delete_tag(tag)
46
 
            removed_tags.append(tag)
47
 
    return removed_tags
48
 
 
49
 
 
50
29
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
51
 
             local=False, keep_tags=False):
 
30
             local=False):
52
31
    """Remove the last revision from the supplied branch.
53
32
 
54
33
    :param dry_run: Don't actually change anything
57
36
    :param local: If this branch is bound, only remove the revisions from the
58
37
        local branch. If this branch is not bound, it is an error to pass
59
38
        local=True.
60
 
    :param keep_tags: Whether to keep tags pointing at the removed revisions
61
 
        around.
62
39
    """
63
40
    unlockable = []
64
41
    try:
89
66
            revno = old_revno
90
67
        new_revno = revno - 1
91
68
 
 
69
        revid_iterator = branch.repository.iter_reverse_revision_history(
 
70
                            old_tip)
92
71
        cur_revno = old_revno
93
72
        new_revision_id = old_tip
94
73
        graph = branch.repository.get_graph()
95
 
        for rev_id in graph.iter_lefthand_ancestry(old_tip):
 
74
        for rev_id in revid_iterator:
96
75
            if cur_revno == new_revno:
97
76
                new_revision_id = rev_id
98
77
                break
128
107
                    hook_new_tip = None
129
108
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
130
109
                     hook_new_tip)
131
 
            if branch.supports_tags() and not keep_tags:
132
 
                remove_tags(branch, graph, old_tip, new_revision_id)
133
110
            if tree is not None:
134
111
                if not _mod_revision.is_null(new_revision_id):
135
112
                    parents = [new_revision_id]