← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

merge bzr.dev

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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Remove the last revision from the history of the current branch."""
18
18
 
19
19
# TODO: make the guts of this methods on tree, branch.
20
20
 
21
 
from bzrlib import (
22
 
    errors,
23
 
    revision as _mod_revision,
24
 
    )
 
21
import os
 
22
 
25
23
from bzrlib.branch import Branch
26
24
from bzrlib.errors import BoundBranchOutOfDate
27
25
 
28
26
 
29
 
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
30
 
             local=False):
 
27
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
31
28
    """Remove the last revision from the supplied branch.
32
29
 
33
30
    :param dry_run: Don't actually change anything
34
31
    :param verbose: Print each step as you do it
35
32
    :param revno: Remove back to this revision
36
 
    :param local: If this branch is bound, only remove the revisions from the
37
 
        local branch. If this branch is not bound, it is an error to pass
38
 
        local=True.
39
33
    """
40
34
    unlockable = []
41
35
    try:
42
36
        if tree is not None:
43
37
            tree.lock_write()
44
38
            unlockable.append(tree)
45
 
 
 
39
        
46
40
        branch.lock_write()
47
41
        unlockable.append(branch)
48
42
 
50
44
        if tree is not None:
51
45
            pending_merges = tree.get_parent_ids()[1:]
52
46
 
53
 
        if local:
54
 
            master = None
55
 
            if branch.get_bound_location() is None:
56
 
                raise errors.LocalRequiresBoundBranch()
57
 
        else:
58
 
            master = branch.get_master_branch()
59
 
            if master is not None:
60
 
                master.lock_write()
61
 
                unlockable.append(master)
62
 
        old_revno, old_tip = branch.last_revision_info()
63
 
        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():
64
53
            raise BoundBranchOutOfDate(branch, master)
65
54
        if revno is None:
66
 
            revno = old_revno
67
 
        new_revno = revno - 1
 
55
            revno = len(rh)
 
56
        old_revno, old_tip = branch.last_revision_info()
 
57
        new_revno = revno -1
68
58
 
69
 
        cur_revno = old_revno
70
 
        new_revision_id = old_tip
71
 
        graph = branch.repository.get_graph()
72
 
        for rev_id in graph.iter_lefthand_ancestry(old_tip):
73
 
            if cur_revno == new_revno:
74
 
                new_revision_id = rev_id
75
 
                break
76
 
            if verbose:
77
 
                print 'Removing revno %d: %s' % (cur_revno, rev_id)
78
 
            cur_revno -= 1
79
 
            parents = graph.get_parent_map([rev_id]).get(rev_id, None)
80
 
            if not parents:
81
 
                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)
82
65
            # When we finish popping off the pending merges, we want
83
66
            # them to stay in the order that they used to be.
84
67
            # but we pop from the end, so reverse the order, and
85
68
            # then get the order right at the end
86
 
            pending_merges.extend(reversed(parents[1:]))
87
 
        else:
88
 
            # We ran off the end of revisions, which means we should be trying
89
 
            # to get to NULL_REVISION
90
 
            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)
91
72
 
 
73
        # Committing before we start removing files, because
 
74
        # once we have removed at least one, all the rest are invalid.
92
75
        if not dry_run:
93
76
            if master is not None:
94
 
                master.set_last_revision_info(new_revno, new_revision_id)
95
 
            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()
96
80
            if master is None:
97
81
                hook_local = None
98
82
                hook_master = branch
100
84
                hook_local = branch
101
85
                hook_master = master
102
86
            for hook in Branch.hooks['post_uncommit']:
103
 
                hook_new_tip = new_revision_id
104
 
                if hook_new_tip == _mod_revision.NULL_REVISION:
105
 
                    hook_new_tip = None
106
87
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
107
 
                     hook_new_tip)
 
88
                    new_tip)
108
89
            if tree is not None:
109
 
                if not _mod_revision.is_null(new_revision_id):
110
 
                    parents = [new_revision_id]
 
90
                if new_tip is not None:
 
91
                    parents = [new_tip]
111
92
                else:
112
93
                    parents = []
113
94
                parents.extend(reversed(pending_merges))