← 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: 2010-10-08 04:25:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5472.
  • Revision ID: andrew.bennetts@canonical.com-20101008042510-sg9vdhmnggilzxsk
Fix stray TAB in source.

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