← 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: 2008-01-29 15:16:31 UTC
  • mto: (3206.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3207.
  • Revision ID: v.ladeuil+lp@free.fr-20080129151631-vqjd13tb405mobx6
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.

* bzrlib/tests/test_transform.py:
(TestTransformMerge): Revert previous patch and cleanly call
preview.finalize now that we can.

* bzrlib/tests/test_merge.py:
(TestMerge.test_make_preview_transform): Catch TransformPreview
leak.

* bzrlib/builtins.py:
(cmd_merge._do_preview): Finalize the TransformPreview or the
limbodir will stay in /tmp.

* bzrlib/transform.py:
(TreeTransformBase.__init__): Create the _deletiondir since it's
reffered to by finalize.
(TreeTransformBase.finalize): Delete the dir only if _deletiondir
is set.
(TreeTransform.__init__): Use a temp var for deletiondir and set
the attribute after the base class __init__ has been called.
(TransformPreview.__init__): Read locks the tree since finalize
wants to unlock it (as suggested by Aaron).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
"""Remove the last revision from the history of the current branch.
18
 
"""
 
17
"""Remove the last revision from the history of the current branch."""
 
18
 
 
19
# TODO: make the guts of this methods on tree, branch.
19
20
 
20
21
import os
21
 
import bzrlib
 
22
 
 
23
from bzrlib import revision as _mod_revision
 
24
from bzrlib.branch import Branch
22
25
from bzrlib.errors import BoundBranchOutOfDate
23
26
 
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
27
 
31
28
def uncommit(branch, dry_run=False, verbose=False, revno=None, tree=None):
32
29
    """Remove the last revision from the supplied branch.
35
32
    :param verbose: Print each step as you do it
36
33
    :param revno: Remove back to this revision
37
34
    """
38
 
    from bzrlib.atomicfile import AtomicFile
39
35
    unlockable = []
40
36
    try:
41
37
        if tree is not None:
45
41
        branch.lock_write()
46
42
        unlockable.append(branch)
47
43
 
 
44
        pending_merges = []
 
45
        if tree is not None:
 
46
            pending_merges = tree.get_parent_ids()[1:]
 
47
 
48
48
        master = branch.get_master_branch()
49
49
        if master is not None:
50
50
            master.lock_write()
54
54
            raise BoundBranchOutOfDate(branch, master)
55
55
        if revno is None:
56
56
            revno = len(rh)
 
57
        old_revno, old_tip = branch.last_revision_info()
 
58
        new_revno = revno -1
57
59
 
58
60
        files_to_remove = []
59
61
        for r in range(revno-1, len(rh)):
60
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)
 
66
            # When we finish popping off the pending merges, we want
 
67
            # them to stay in the order that they used to be.
 
68
            # but we pop from the end, so reverse the order, and
 
69
            # then get the order right at the end
 
70
            pending_merges.extend(reversed(rev.parent_ids[1:]))
61
71
            if verbose:
62
72
                print 'Removing revno %d: %s' % (len(rh)+1, rev_id)
63
73
 
64
 
 
65
74
        # Committing before we start removing files, because
66
75
        # once we have removed at least one, all the rest are invalid.
67
76
        if not dry_run:
68
77
            if master is not None:
69
78
                master.set_revision_history(rh)
70
79
            branch.set_revision_history(rh)
 
80
            new_tip = _mod_revision.ensure_null(branch.last_revision())
 
81
            if master is None:
 
82
                hook_local = None
 
83
                hook_master = branch
 
84
            else:
 
85
                hook_local = branch
 
86
                hook_master = master
 
87
            for hook in Branch.hooks['post_uncommit']:
 
88
                hook_new_tip = new_tip
 
89
                if hook_new_tip == _mod_revision.NULL_REVISION:
 
90
                    hook_new_tip = None
 
91
                hook(hook_local, hook_master, old_revno, old_tip, new_revno,
 
92
                     hook_new_tip)
71
93
            if tree is not None:
72
 
                tree.set_last_revision(branch.last_revision())
 
94
                if not _mod_revision.is_null(new_tip):
 
95
                    parents = [new_tip]
 
96
                else:
 
97
                    parents = []
 
98
                parents.extend(reversed(pending_merges))
 
99
                tree.set_parent_ids(parents)
73
100
    finally:
74
101
        for item in reversed(unlockable):
75
102
            item.unlock()