← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-11 18:58:19 UTC
  • mto: (3649.3.2 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 3658.
  • Revision ID: jelmer@samba.org-20080611185819-o4shi1ranh9zh01e
Move ftp transport into separate directory.

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
import os
 
22
 
21
23
from bzrlib import (
22
24
    errors,
23
25
    revision as _mod_revision,
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
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
38
    """
40
39
    unlockable = []
41
40
    try:
42
41
        if tree is not None:
43
42
            tree.lock_write()
44
43
            unlockable.append(tree)
45
 
 
 
44
        
46
45
        branch.lock_write()
47
46
        unlockable.append(branch)
48
47
 
59
58
            if master is not None:
60
59
                master.lock_write()
61
60
                unlockable.append(master)
62
 
        old_revno, old_tip = branch.last_revision_info()
63
 
        if master is not None and old_tip != master.last_revision():
 
61
        rh = branch.revision_history()
 
62
        if master is not None and rh[-1] != master.last_revision():
64
63
            raise BoundBranchOutOfDate(branch, master)
65
64
        if revno is None:
66
 
            revno = old_revno
67
 
        new_revno = revno - 1
 
65
            revno = len(rh)
 
66
        old_revno, old_tip = branch.last_revision_info()
 
67
        new_revno = revno -1
68
68
 
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
 
69
        files_to_remove = []
 
70
        for r in range(revno-1, len(rh)):
 
71
            rev_id = rh.pop()
 
72
            # NB: performance would be better using the revision graph rather
 
73
            # than the whole revision.
 
74
            rev = branch.repository.get_revision(rev_id)
84
75
            # When we finish popping off the pending merges, we want
85
76
            # them to stay in the order that they used to be.
86
77
            # but we pop from the end, so reverse the order, and
87
78
            # then get the order right at the end
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
 
79
            pending_merges.extend(reversed(rev.parent_ids[1:]))
 
80
            if verbose:
 
81
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
93
82
 
 
83
        # Committing before we start removing files, because
 
84
        # once we have removed at least one, all the rest are invalid.
94
85
        if not dry_run:
95
86
            if master is not None:
96
 
                master.set_last_revision_info(new_revno, new_revision_id)
97
 
            branch.set_last_revision_info(new_revno, new_revision_id)
 
87
                master.set_revision_history(rh)
 
88
            branch.set_revision_history(rh)
 
89
            new_tip = _mod_revision.ensure_null(branch.last_revision())
98
90
            if master is None:
99
91
                hook_local = None
100
92
                hook_master = branch
102
94
                hook_local = branch
103
95
                hook_master = master
104
96
            for hook in Branch.hooks['post_uncommit']:
105
 
                hook_new_tip = new_revision_id
 
97
                hook_new_tip = new_tip
106
98
                if hook_new_tip == _mod_revision.NULL_REVISION:
107
99
                    hook_new_tip = None
108
100
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
109
101
                     hook_new_tip)
110
102
            if tree is not None:
111
 
                if not _mod_revision.is_null(new_revision_id):
112
 
                    parents = [new_revision_id]
 
103
                if not _mod_revision.is_null(new_tip):
 
104
                    parents = [new_tip]
113
105
                else:
114
106
                    parents = []
115
107
                parents.extend(reversed(pending_merges))