← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

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