/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Robert Collins
  • Date: 2007-10-05 02:41:37 UTC
  • mto: (2592.3.166 repository)
  • mto: This revision was merged to the branch mainline in revision 2896.
  • Revision ID: robertc@robertcollins.net-20071005024137-kn7brcu07nu8cwl1
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
  ``KnitRepository`` by parameters to the constructor. (Robert Collins)
* ``bzrlib.xml_serializer.Serializer`` is now responsible for checking that
  mandatory attributes are present on serialisation and deserialisation.
  This fixes some holes in API usage and allows better separation between
  physical storage and object serialisation. (Robert Collins)

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