← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Martin Pool
  • Date: 2005-05-10 07:15:48 UTC
  • Revision ID: mbp@sourcefrog.net-20050510071548-697b9223be79541e
- Fix from Lalo for unidiff output of newly added 
  and changed files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
1
 
# Copyright (C) 2006 Canonical Ltd
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
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.
20
 
 
21
 
import os
22
 
 
23
 
from bzrlib import (
24
 
    errors,
25
 
    revision as _mod_revision,
26
 
    )
27
 
from bzrlib.branch import Branch
28
 
from bzrlib.errors import BoundBranchOutOfDate
29
 
 
30
 
 
31
 
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
32
 
             local=False):
33
 
    """Remove the last revision from the supplied branch.
34
 
 
35
 
    :param dry_run: Don't actually change anything
36
 
    :param verbose: Print each step as you do it
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
 
    """
42
 
    unlockable = []
43
 
    try:
44
 
        if tree is not None:
45
 
            tree.lock_write()
46
 
            unlockable.append(tree)
47
 
 
48
 
        branch.lock_write()
49
 
        unlockable.append(branch)
50
 
 
51
 
        pending_merges = []
52
 
        if tree is not None:
53
 
            pending_merges = tree.get_parent_ids()[1:]
54
 
 
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():
66
 
            raise BoundBranchOutOfDate(branch, master)
67
 
        if revno is None:
68
 
            revno = old_revno
69
 
        new_revno = revno - 1
70
 
 
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
86
 
            # When we finish popping off the pending merges, we want
87
 
            # them to stay in the order that they used to be.
88
 
            # but we pop from the end, so reverse the order, and
89
 
            # 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
95
 
 
96
 
        if not dry_run:
97
 
            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)
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)
112
 
            if tree is not None:
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)
119
 
    finally:
120
 
        for item in reversed(unlockable):
121
 
            item.unlock()