← 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: 2008-03-16 16:58:03 UTC
  • mfrom: (3224.3.1 news-typo)
  • Revision ID: pqm@pqm.ubuntu.com-20080316165803-tisoc9mpob9z544o
(Matt Nordhoff) Trivial NEWS typo fix

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