← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Vincent Ladeuil
  • Date: 2010-10-26 08:08:23 UTC
  • mfrom: (5514.1.1 665100-content-type)
  • mto: This revision was merged to the branch mainline in revision 5516.
  • Revision ID: v.ladeuil+lp@free.fr-20101026080823-3wggo03b7cpn9908
Correctly set the Content-Type header when POSTing http requests

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., 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
 
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
21
26
from bzrlib.errors import BoundBranchOutOfDate
22
27
 
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):
 
28
 
 
29
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
 
30
             local=False):
31
31
    """Remove the last revision from the supplied branch.
32
32
 
33
33
    :param dry_run: Don't actually change anything
34
34
    :param verbose: Print each step as you do it
35
35
    :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.
36
39
    """
37
40
    unlockable = []
38
41
    try:
39
42
        if tree is not None:
40
43
            tree.lock_write()
41
44
            unlockable.append(tree)
42
 
        
 
45
 
43
46
        branch.lock_write()
44
47
        unlockable.append(branch)
45
48
 
46
 
        master = branch.get_master_branch()
47
 
        if master is not None:
48
 
            master.lock_write()
49
 
            unlockable.append(master)
50
 
        rh = branch.revision_history()
51
 
        if master is not None and rh[-1] != master.last_revision():
 
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():
52
64
            raise BoundBranchOutOfDate(branch, master)
53
65
        if revno is None:
54
 
            revno = len(rh)
 
66
            revno = old_revno
 
67
        new_revno = revno - 1
55
68
 
56
 
        files_to_remove = []
57
 
        for r in range(revno-1, len(rh)):
58
 
            rev_id = rh.pop()
 
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
59
78
            if verbose:
60
 
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
61
 
 
62
 
 
63
 
        # Committing before we start removing files, because
64
 
        # once we have removed at least one, all the rest are invalid.
 
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
 
65
94
        if not dry_run:
66
95
            if master is not None:
67
 
                master.set_revision_history(rh)
68
 
            branch.set_revision_history(rh)
 
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
110
            if tree is not None:
70
 
                tree.set_last_revision(branch.last_revision())
 
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)
71
117
    finally:
72
118
        for item in reversed(unlockable):
73
119
            item.unlock()