← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-22 14:12:18 UTC
  • mfrom: (6155.3.1 jam)
  • Revision ID: pqm@pqm.ubuntu.com-20110922141218-86s4uu6nqvourw4f
(jameinel) Cleanup comments bzrlib/smart/__init__.py (John A Meinel)

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
 
29
50
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
30
 
             local=False):
 
51
             local=False, keep_tags=False):
31
52
    """Remove the last revision from the supplied branch.
32
53
 
33
54
    :param dry_run: Don't actually change anything
36
57
    :param local: If this branch is bound, only remove the revisions from the
37
58
        local branch. If this branch is not bound, it is an error to pass
38
59
        local=True.
 
60
    :param keep_tags: Whether to keep tags pointing at the removed revisions
 
61
        around.
39
62
    """
40
63
    unlockable = []
41
64
    try:
66
89
            revno = old_revno
67
90
        new_revno = revno - 1
68
91
 
69
 
        revid_iterator = branch.repository.iter_reverse_revision_history(
70
 
                            old_tip)
71
92
        cur_revno = old_revno
72
93
        new_revision_id = old_tip
73
94
        graph = branch.repository.get_graph()
74
 
        for rev_id in revid_iterator:
 
95
        for rev_id in graph.iter_lefthand_ancestry(old_tip):
75
96
            if cur_revno == new_revno:
76
97
                new_revision_id = rev_id
77
98
                break
107
128
                    hook_new_tip = None
108
129
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
109
130
                     hook_new_tip)
 
131
            if branch.supports_tags() and not keep_tags:
 
132
                remove_tags(branch, graph, old_tip, new_revision_id)
110
133
            if tree is not None:
111
134
                if not _mod_revision.is_null(new_revision_id):
112
135
                    parents = [new_revision_id]