← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
"""Remove the last revision from the history of the current branch.
18
 
"""
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
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.
19
20
 
20
21
import os
 
22
 
 
23
from bzrlib import (
 
24
    errors,
 
25
    revision as _mod_revision,
 
26
    )
 
27
from bzrlib.branch import Branch
21
28
from bzrlib.errors import BoundBranchOutOfDate
22
29
 
23
 
def test_remove(filename):
24
 
    if os.path.exists(filename):
25
 
        os.remove(filename)
26
 
    else:
27
 
        print '* file does not exist: %r' % filename
28
 
 
29
 
 
30
 
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
 
30
 
 
31
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
 
32
             local=False):
31
33
    """Remove the last revision from the supplied branch.
32
34
 
33
35
    :param dry_run: Don't actually change anything
34
36
    :param verbose: Print each step as you do it
35
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.
36
41
    """
37
42
    unlockable = []
38
43
    try:
39
44
        if tree is not None:
40
45
            tree.lock_write()
41
46
            unlockable.append(tree)
42
 
        
 
47
 
43
48
        branch.lock_write()
44
49
        unlockable.append(branch)
45
50
 
46
51
        pending_merges = []
 
52
        if tree is not None:
 
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)
 
68
            revno = old_revno
 
69
        new_revno = revno - 1
57
70
 
58
 
        files_to_remove = []
59
 
        for r in range(revno-1, len(rh)):
60
 
            rev_id = rh.pop()
61
 
            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
62
86
            # When we finish popping off the pending merges, we want
63
87
            # them to stay in the order that they used to be.
64
88
            # but we pop from the end, so reverse the order, and
65
89
            # then get the order right at the end
66
 
            pending_merges.extend(reversed(rev.parent_ids[1:]))
67
 
            if verbose:
68
 
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
69
 
 
70
 
 
71
 
        # Committing before we start removing files, because
72
 
        # once we have removed at least one, all the rest are invalid.
 
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
 
95
 
73
96
        if not dry_run:
74
97
            if master is not None:
75
 
                master.set_revision_history(rh)
76
 
            branch.set_revision_history(rh)
 
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)
77
112
            if tree is not None:
78
 
                tree.set_last_revision(branch.last_revision())
79
 
                pending_merges.reverse()
80
 
                tree.set_pending_merges(pending_merges)
 
113
                if not _mod_revision.is_null(new_revision_id):
 
114
                    parents = [new_revision_id]
 
115
                else:
 
116
                    parents = []
 
117
                parents.extend(reversed(pending_merges))
 
118
                tree.set_parent_ids(parents)
81
119
    finally:
82
120
        for item in reversed(unlockable):
83
121
            item.unlock()