← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Andrew Bennetts
  • Date: 2007-03-26 06:24:01 UTC
  • mto: This revision was merged to the branch mainline in revision 2376.
  • Revision ID: andrew.bennetts@canonical.com-20070326062401-k3nbefzje5332jaf
Deal with review comments from Robert:

  * Add my name to the NEWS file
  * Move the test case to a new module in branch_implementations
  * Remove revision_history cruft from identitymap and test_identitymap
  * Improve some docstrings

Also, this fixes a bug where revision_history was not returning a copy of the
cached data, allowing the cache to be corrupted.

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 (
24
 
    errors,
25
 
    revision as _mod_revision,
26
 
    )
27
23
from bzrlib.branch import Branch
28
24
from bzrlib.errors import BoundBranchOutOfDate
29
25
 
30
26
 
31
 
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
32
 
             local=False):
 
27
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
33
28
    """Remove the last revision from the supplied branch.
34
29
 
35
30
    :param dry_run: Don't actually change anything
36
31
    :param verbose: Print each step as you do it
37
32
    :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
33
    """
42
34
    unlockable = []
43
35
    try:
52
44
        if tree is not None:
53
45
            pending_merges = tree.get_parent_ids()[1:]
54
46
 
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():
 
47
        master = branch.get_master_branch()
 
48
        if master is not None:
 
49
            master.lock_write()
 
50
            unlockable.append(master)
 
51
        rh = branch.revision_history()
 
52
        if master is not None and rh[-1] != master.last_revision():
66
53
            raise BoundBranchOutOfDate(branch, master)
67
54
        if revno is None:
68
 
            revno = old_revno
69
 
        new_revno = revno - 1
 
55
            revno = len(rh)
 
56
        old_revno, old_tip = branch.last_revision_info()
 
57
        new_revno = revno -1
70
58
 
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
 
59
        files_to_remove = []
 
60
        for r in range(revno-1, len(rh)):
 
61
            rev_id = rh.pop()
 
62
            # NB: performance would be better using the revision graph rather
 
63
            # than the whole revision.
 
64
            rev = branch.repository.get_revision(rev_id)
86
65
            # When we finish popping off the pending merges, we want
87
66
            # them to stay in the order that they used to be.
88
67
            # but we pop from the end, so reverse the order, and
89
68
            # 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
 
69
            pending_merges.extend(reversed(rev.parent_ids[1:]))
 
70
            if verbose:
 
71
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
95
72
 
 
73
        # Committing before we start removing files, because
 
74
        # once we have removed at least one, all the rest are invalid.
96
75
        if not dry_run:
97
76
            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)
 
77
                master.set_revision_history(rh)
 
78
            branch.set_revision_history(rh)
 
79
            new_tip = branch.last_revision()
100
80
            if master is None:
101
81
                hook_local = None
102
82
                hook_master = branch
104
84
                hook_local = branch
105
85
                hook_master = master
106
86
            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
87
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
111
 
                     hook_new_tip)
 
88
                    new_tip)
112
89
            if tree is not None:
113
 
                if not _mod_revision.is_null(new_revision_id):
114
 
                    parents = [new_revision_id]
 
90
                if new_tip is not None:
 
91
                    parents = [new_tip]
115
92
                else:
116
93
                    parents = []
117
94
                parents.extend(reversed(pending_merges))