← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Robert Collins
  • Date: 2006-06-13 16:26:09 UTC
  • mfrom: (1733.1.7 non-bzr-control-dirs)
  • mto: This revision was merged to the branch mainline in revision 1770.
  • Revision ID: robertc@robertcollins.net-20060613162609-779ae11bd22b2866
Merge the new ControlFormat core logic to support .hg, .svn etc formats. (Robert Collins, Jelmer Vernooij)

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
16
 
 
17
 
"""Remove the last revision from the history of the current branch."""
18
 
 
19
 
# TODO: make the guts of this methods on tree, branch.
20
 
 
21
 
from bzrlib import (
22
 
    errors,
23
 
    revision as _mod_revision,
24
 
    )
25
 
from bzrlib.branch import Branch
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
"""Remove the last revision from the history of the current branch.
 
18
"""
 
19
 
 
20
import os
 
21
import bzrlib
26
22
from bzrlib.errors import BoundBranchOutOfDate
27
23
 
28
 
 
29
 
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
30
 
             local=False):
 
24
def test_remove(filename):
 
25
    if os.path.exists(filename):
 
26
        os.remove(filename)
 
27
    else:
 
28
        print '* file does not exist: %r' % filename
 
29
 
 
30
 
 
31
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
31
32
    """Remove the last revision from the supplied branch.
32
33
 
33
34
    :param dry_run: Don't actually change anything
34
35
    :param verbose: Print each step as you do it
35
36
    :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
37
    """
 
38
    from bzrlib.atomicfile import AtomicFile
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
 
49
 
        pending_merges = []
50
 
        if tree is not None:
51
 
            pending_merges = tree.get_parent_ids()[1:]
52
 
 
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)
68
57
 
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
 
58
        files_to_remove = []
 
59
        for r in range(revno-1, len(rh)):
 
60
            rev_id = rh.pop()
78
61
            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
84
 
            # When we finish popping off the pending merges, we want
85
 
            # them to stay in the order that they used to be.
86
 
            # but we pop from the end, so reverse the order, and
87
 
            # 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
93
 
 
 
62
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
 
63
 
 
64
 
 
65
        # Committing before we start removing files, because
 
66
        # once we have removed at least one, all the rest are invalid.
94
67
        if not dry_run:
95
68
            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)
98
 
            if master is None:
99
 
                hook_local = None
100
 
                hook_master = branch
101
 
            else:
102
 
                hook_local = branch
103
 
                hook_master = master
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
108
 
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
109
 
                     hook_new_tip)
 
69
                master.set_revision_history(rh)
 
70
            branch.set_revision_history(rh)
110
71
            if tree is not None:
111
 
                if not _mod_revision.is_null(new_revision_id):
112
 
                    parents = [new_revision_id]
113
 
                else:
114
 
                    parents = []
115
 
                parents.extend(reversed(pending_merges))
116
 
                tree.set_parent_ids(parents)
 
72
                tree.set_last_revision(branch.last_revision())
117
73
    finally:
118
74
        for item in reversed(unlockable):
119
75
            item.unlock()