← 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-05-24 11:41:24 UTC
  • mfrom: (3449.1.2 unbreak-push-overwrite)
  • Revision ID: pqm@pqm.ubuntu.com-20080524114124-ubdyd5iqf7zxl2pn
Fix "bzr push --overwrite -r NNN". (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
35
35
    :param dry_run: Don't actually change anything
36
36
    :param verbose: Print each step as you do it
37
37
    :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
38
    """
42
39
    unlockable = []
43
40
    try:
61
58
            if master is not None:
62
59
                master.lock_write()
63
60
                unlockable.append(master)
64
 
        old_revno, old_tip = branch.last_revision_info()
65
 
        if master is not None and old_tip != master.last_revision():
 
61
        rh = branch.revision_history()
 
62
        if master is not None and rh[-1] != master.last_revision():
66
63
            raise BoundBranchOutOfDate(branch, master)
67
64
        if revno is None:
68
 
            revno = old_revno
69
 
        new_revno = revno - 1
 
65
            revno = len(rh)
 
66
        old_revno, old_tip = branch.last_revision_info()
 
67
        new_revno = revno -1
70
68
 
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
 
69
        files_to_remove = []
 
70
        for r in range(revno-1, len(rh)):
 
71
            rev_id = rh.pop()
 
72
            # NB: performance would be better using the revision graph rather
 
73
            # than the whole revision.
 
74
            rev = branch.repository.get_revision(rev_id)
86
75
            # When we finish popping off the pending merges, we want
87
76
            # them to stay in the order that they used to be.
88
77
            # but we pop from the end, so reverse the order, and
89
78
            # 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
 
79
            pending_merges.extend(reversed(rev.parent_ids[1:]))
 
80
            if verbose:
 
81
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
95
82
 
 
83
        # Committing before we start removing files, because
 
84
        # once we have removed at least one, all the rest are invalid.
96
85
        if not dry_run:
97
86
            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)
 
87
                master.set_revision_history(rh)
 
88
            branch.set_revision_history(rh)
 
89
            new_tip = _mod_revision.ensure_null(branch.last_revision())
100
90
            if master is None:
101
91
                hook_local = None
102
92
                hook_master = branch
104
94
                hook_local = branch
105
95
                hook_master = master
106
96
            for hook in Branch.hooks['post_uncommit']:
107
 
                hook_new_tip = new_revision_id
 
97
                hook_new_tip = new_tip
108
98
                if hook_new_tip == _mod_revision.NULL_REVISION:
109
99
                    hook_new_tip = None
110
100
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
111
101
                     hook_new_tip)
112
102
            if tree is not None:
113
 
                if not _mod_revision.is_null(new_revision_id):
114
 
                    parents = [new_revision_id]
 
103
                if not _mod_revision.is_null(new_tip):
 
104
                    parents = [new_tip]
115
105
                else:
116
106
                    parents = []
117
107
                parents.extend(reversed(pending_merges))