/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

Merge bzr.dev r3466

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
20
20
 
21
21
import os
22
22
 
23
 
from bzrlib import revision as _mod_revision
 
23
from bzrlib import (
 
24
    errors,
 
25
    revision as _mod_revision,
 
26
    )
24
27
from bzrlib.branch import Branch
25
28
from bzrlib.errors import BoundBranchOutOfDate
26
29
 
27
30
 
28
 
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
 
31
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
 
32
             local=False):
29
33
    """Remove the last revision from the supplied branch.
30
34
 
31
35
    :param dry_run: Don't actually change anything
32
36
    :param verbose: Print each step as you do it
33
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.
34
41
    """
35
42
    unlockable = []
36
43
    try:
45
52
        if tree is not None:
46
53
            pending_merges = tree.get_parent_ids()[1:]
47
54
 
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():
 
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():
54
66
            raise BoundBranchOutOfDate(branch, master)
55
67
        if revno is None:
56
 
            revno = len(rh)
57
 
        old_revno, old_tip = branch.last_revision_info()
58
 
        new_revno = revno -1
 
68
            revno = old_revno
 
69
        new_revno = revno - 1
59
70
 
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)
 
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
66
86
            # When we finish popping off the pending merges, we want
67
87
            # them to stay in the order that they used to be.
68
88
            # but we pop from the end, so reverse the order, and
69
89
            # then get the order right at the end
70
 
            pending_merges.extend(reversed(rev.parent_ids[1:]))
71
 
            if verbose:
72
 
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
 
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
73
95
 
74
 
        # Committing before we start removing files, because
75
 
        # once we have removed at least one, all the rest are invalid.
76
96
        if not dry_run:
77
97
            if master is not None:
78
 
                master.set_revision_history(rh)
79
 
            branch.set_revision_history(rh)
80
 
            new_tip = _mod_revision.ensure_null(branch.last_revision())
 
98
                master.set_last_revision_info(new_revno, new_revision_id)
 
99
            branch.set_last_revision_info(new_revno, new_revision_id)
81
100
            if master is None:
82
101
                hook_local = None
83
102
                hook_master = branch
85
104
                hook_local = branch
86
105
                hook_master = master
87
106
            for hook in Branch.hooks['post_uncommit']:
88
 
                hook_new_tip = new_tip
 
107
                hook_new_tip = new_revision_id
89
108
                if hook_new_tip == _mod_revision.NULL_REVISION:
90
109
                    hook_new_tip = None
91
110
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
92
111
                     hook_new_tip)
93
112
            if tree is not None:
94
 
                if not _mod_revision.is_null(new_tip):
95
 
                    parents = [new_tip]
 
113
                if not _mod_revision.is_null(new_revision_id):
 
114
                    parents = [new_revision_id]
96
115
                else:
97
116
                    parents = []
98
117
                parents.extend(reversed(pending_merges))