← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Alexander Belchenko
  • Date: 2006-07-30 16:43:12 UTC
  • mto: (1711.2.111 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1906.
  • Revision ID: bialix@ukr.net-20060730164312-b025fd3ff0cee59e
rename  gpl.txt => COPYING.txt

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.
 
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
"""
20
19
 
21
20
import os
22
 
 
23
 
from bzrlib import (
24
 
    errors,
25
 
    revision as _mod_revision,
26
 
    )
27
 
from bzrlib.branch import Branch
28
21
from bzrlib.errors import BoundBranchOutOfDate
29
22
 
30
 
 
31
 
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
32
 
             local=False):
 
23
def test_remove(filename):
 
24
    if os.path.exists(filename):
 
25
        os.remove(filename)
 
26
    else:
 
27
        print '* file does not exist: %r' % filename
 
28
 
 
29
 
 
30
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
33
31
    """Remove the last revision from the supplied branch.
34
32
 
35
33
    :param dry_run: Don't actually change anything
36
34
    :param verbose: Print each step as you do it
37
35
    :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
36
    """
42
37
    unlockable = []
43
38
    try:
44
39
        if tree is not None:
45
40
            tree.lock_write()
46
41
            unlockable.append(tree)
47
 
 
 
42
        
48
43
        branch.lock_write()
49
44
        unlockable.append(branch)
50
45
 
51
46
        pending_merges = []
52
 
        if tree is not None:
53
 
            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)
70
57
 
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
 
58
        files_to_remove = []
 
59
        for r in range(revno-1, len(rh)):
 
60
            rev_id = rh.pop()
 
61
            rev = branch.repository.get_revision(rev_id)
86
62
            # When we finish popping off the pending merges, we want
87
63
            # them to stay in the order that they used to be.
88
64
            # but we pop from the end, so reverse the order, and
89
65
            # 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
95
 
 
 
66
            pending_merges.extend(reversed(rev.parent_ids[1:]))
 
67
            if verbose:
 
68
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
 
69
 
 
70
 
 
71
        # Committing before we start removing files, because
 
72
        # once we have removed at least one, all the rest are invalid.
96
73
        if not dry_run:
97
74
            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)
100
 
            if master is None:
101
 
                hook_local = None
102
 
                hook_master = branch
103
 
            else:
104
 
                hook_local = branch
105
 
                hook_master = master
106
 
            for hook in Branch.hooks['post_uncommit']:
107
 
                hook_new_tip = new_revision_id
108
 
                if hook_new_tip == _mod_revision.NULL_REVISION:
109
 
                    hook_new_tip = None
110
 
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
111
 
                     hook_new_tip)
 
75
                master.set_revision_history(rh)
 
76
            branch.set_revision_history(rh)
112
77
            if tree is not None:
113
 
                if not _mod_revision.is_null(new_revision_id):
114
 
                    parents = [new_revision_id]
115
 
                else:
116
 
                    parents = []
117
 
                parents.extend(reversed(pending_merges))
118
 
                tree.set_parent_ids(parents)
 
78
                tree.set_last_revision(branch.last_revision())
 
79
                pending_merges.reverse()
 
80
                tree.set_pending_merges(pending_merges)
119
81
    finally:
120
82
        for item in reversed(unlockable):
121
83
            item.unlock()