~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: John Arbash Meinel
  • Date: 2008-05-23 05:37:53 UTC
  • mto: This revision was merged to the branch mainline in revision 3461.
  • Revision ID: john@arbash-meinel.com-20080523053753-frkmeyg4uowpau6f
bzr uncommit doesn't need to work in terms of 'revision_history()'

Show diffs side-by-side

added added

removed removed

Lines of Context:
58
58
            if master is not None:
59
59
                master.lock_write()
60
60
                unlockable.append(master)
61
 
        rh = branch.revision_history()
62
 
        if master is not None and rh[-1] != master.last_revision():
 
61
        old_revno, old_tip = branch.last_revision_info()
 
62
        if master is not None and old_tip != master.last_revision():
63
63
            raise BoundBranchOutOfDate(branch, master)
64
64
        if revno is None:
65
 
            revno = len(rh)
66
 
        old_revno, old_tip = branch.last_revision_info()
67
 
        new_revno = revno -1
 
65
            revno = old_revno
 
66
        new_revno = revno - 1
68
67
 
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)
 
68
        revid_iterator = branch.repository.iter_reverse_revision_history(
 
69
                            old_tip)
 
70
        cur_revno = old_revno
 
71
        new_revision_id = old_tip
 
72
        graph = branch.repository.get_graph()
 
73
        for rev_id in revid_iterator:
 
74
            if cur_revno == new_revno:
 
75
                new_revision_id = rev_id
 
76
                break
 
77
            cur_revno -= 1
 
78
            parents = graph.get_parent_map([rev_id]).get(rev_id, None)
 
79
            if not parents:
 
80
                continue
75
81
            # When we finish popping off the pending merges, we want
76
82
            # them to stay in the order that they used to be.
77
83
            # but we pop from the end, so reverse the order, and
78
84
            # then get the order right at the end
79
 
            pending_merges.extend(reversed(rev.parent_ids[1:]))
80
 
            if verbose:
81
 
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
 
85
            pending_merges.extend(reversed(parents[1:]))
82
86
 
83
 
        # Committing before we start removing files, because
84
 
        # once we have removed at least one, all the rest are invalid.
85
87
        if not dry_run:
86
88
            if master is not None:
87
 
                master.set_revision_history(rh)
88
 
            branch.set_revision_history(rh)
89
 
            new_tip = _mod_revision.ensure_null(branch.last_revision())
 
89
                master.set_last_revision_info(new_revno, new_revision_id)
 
90
            branch.set_last_revision_info(new_revno, new_revision_id)
90
91
            if master is None:
91
92
                hook_local = None
92
93
                hook_master = branch
94
95
                hook_local = branch
95
96
                hook_master = master
96
97
            for hook in Branch.hooks['post_uncommit']:
97
 
                hook_new_tip = new_tip
 
98
                hook_new_tip = new_revision_id
98
99
                if hook_new_tip == _mod_revision.NULL_REVISION:
99
100
                    hook_new_tip = None
100
101
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
101
102
                     hook_new_tip)
102
103
            if tree is not None:
103
 
                if not _mod_revision.is_null(new_tip):
104
 
                    parents = [new_tip]
 
104
                if not _mod_revision.is_null(new_revision_id):
 
105
                    parents = [new_revision_id]
105
106
                else:
106
107
                    parents = []
107
108
                parents.extend(reversed(pending_merges))