← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-05-06 11:40:10 UTC
  • mfrom: (3400.1.3 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20080506114010-jwclr2qtiekvawjg
Remove erroneous creation of branch-name file in cmd_branch

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
 
from __future__ import absolute_import
20
 
 
21
19
# TODO: make the guts of this methods on tree, branch.
22
20
 
 
21
import os
 
22
 
23
23
from bzrlib import (
24
24
    errors,
25
25
    revision as _mod_revision,
28
28
from bzrlib.errors import BoundBranchOutOfDate
29
29
 
30
30
 
31
 
def remove_tags(branch, graph, old_tip, parents):
32
 
    """Remove tags on revisions between old_tip and new_tip.
33
 
 
34
 
    :param branch: Branch to remove tags from
35
 
    :param graph: Graph object for branch repository
36
 
    :param old_tip: Old branch tip
37
 
    :param parents: New parents
38
 
    :return: Names of the removed tags
39
 
    """
40
 
    reverse_tags = branch.tags.get_reverse_tag_dict()
41
 
    ancestors = graph.find_unique_ancestors(old_tip, parents)
42
 
    removed_tags = []
43
 
    for revid, tags in reverse_tags.iteritems():
44
 
        if not revid in ancestors:
45
 
            continue
46
 
        for tag in tags:
47
 
            branch.tags.delete_tag(tag)
48
 
            removed_tags.append(tag)
49
 
    return removed_tags
50
 
 
51
 
 
52
31
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None,
53
 
             local=False, keep_tags=False):
 
32
             local=False):
54
33
    """Remove the last revision from the supplied branch.
55
34
 
56
35
    :param dry_run: Don't actually change anything
57
36
    :param verbose: Print each step as you do it
58
37
    :param revno: Remove back to this revision
59
 
    :param local: If this branch is bound, only remove the revisions from the
60
 
        local branch. If this branch is not bound, it is an error to pass
61
 
        local=True.
62
 
    :param keep_tags: Whether to keep tags pointing at the removed revisions
63
 
        around.
64
38
    """
65
39
    unlockable = []
66
40
    try:
67
41
        if tree is not None:
68
42
            tree.lock_write()
69
43
            unlockable.append(tree)
70
 
 
 
44
        
71
45
        branch.lock_write()
72
46
        unlockable.append(branch)
73
47
 
84
58
            if master is not None:
85
59
                master.lock_write()
86
60
                unlockable.append(master)
87
 
        old_revno, old_tip = branch.last_revision_info()
88
 
        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():
89
63
            raise BoundBranchOutOfDate(branch, master)
90
64
        if revno is None:
91
 
            revno = old_revno
92
 
        new_revno = revno - 1
 
65
            revno = len(rh)
 
66
        old_revno, old_tip = branch.last_revision_info()
 
67
        new_revno = revno -1
93
68
 
94
 
        cur_revno = old_revno
95
 
        new_revision_id = old_tip
96
 
        graph = branch.repository.get_graph()
97
 
        for rev_id in graph.iter_lefthand_ancestry(old_tip):
98
 
            if cur_revno == new_revno:
99
 
                new_revision_id = rev_id
100
 
                break
101
 
            if verbose:
102
 
                print 'Removing revno %d: %s' % (cur_revno, rev_id)
103
 
            cur_revno -= 1
104
 
            parents = graph.get_parent_map([rev_id]).get(rev_id, None)
105
 
            if not parents:
106
 
                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)
107
75
            # When we finish popping off the pending merges, we want
108
76
            # them to stay in the order that they used to be.
109
77
            # but we pop from the end, so reverse the order, and
110
78
            # then get the order right at the end
111
 
            pending_merges.extend(reversed(parents[1:]))
112
 
        else:
113
 
            # We ran off the end of revisions, which means we should be trying
114
 
            # to get to NULL_REVISION
115
 
            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)
116
82
 
 
83
        # Committing before we start removing files, because
 
84
        # once we have removed at least one, all the rest are invalid.
117
85
        if not dry_run:
118
86
            if master is not None:
119
 
                master.set_last_revision_info(new_revno, new_revision_id)
120
 
            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())
121
90
            if master is None:
122
91
                hook_local = None
123
92
                hook_master = branch
125
94
                hook_local = branch
126
95
                hook_master = master
127
96
            for hook in Branch.hooks['post_uncommit']:
128
 
                hook_new_tip = new_revision_id
 
97
                hook_new_tip = new_tip
129
98
                if hook_new_tip == _mod_revision.NULL_REVISION:
130
99
                    hook_new_tip = None
131
100
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
132
101
                     hook_new_tip)
133
 
            if not _mod_revision.is_null(new_revision_id):
134
 
                parents = [new_revision_id]
135
 
            else:
136
 
                parents = []
137
102
            if tree is not None:
 
103
                if not _mod_revision.is_null(new_tip):
 
104
                    parents = [new_tip]
 
105
                else:
 
106
                    parents = []
138
107
                parents.extend(reversed(pending_merges))
139
108
                tree.set_parent_ids(parents)
140
 
            if branch.supports_tags() and not keep_tags:
141
 
                remove_tags(branch, graph, old_tip, parents)
142
109
    finally:
143
110
        for item in reversed(unlockable):
144
111
            item.unlock()