← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

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