~bzr-pqm/bzr/bzr.dev

4797.32.2 by John Arbash Meinel
merge 2.1, resolving NEWS conflict.
1
# Copyright (C) 2009, 2010 Canonical Ltd
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
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
"""Helpers for managing cleanup functions and the errors they might raise.
18
4744.3.1 by Andrew Bennetts
Merge do_with_cleanups from cleanup-hof, and drop (or at least make private) everything else from that branch.
19
The usual way to run cleanup code in Python is::
20
21
    try:
22
        do_something()
23
    finally:
24
        cleanup_something()
25
26
However if both `do_something` and `cleanup_something` raise an exception
27
Python will forget the original exception and propagate the one from
28
cleanup_something.  Unfortunately, this is almost always much less useful than
29
the original exception.
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
30
4634.85.6 by Andrew Bennetts
More tests.
31
If you want to be certain that the first, and only the first, error is raised,
32
then use::
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
33
4797.16.1 by Andrew Bennetts
Replace many try/finally blocks in merge.py with more robust OperationWithCleanups.
34
    operation = OperationWithCleanups(do_something)
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
35
    operation.add_cleanup(cleanup_something)
4797.16.1 by Andrew Bennetts
Replace many try/finally blocks in merge.py with more robust OperationWithCleanups.
36
    operation.run_simple()
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
37
4634.85.6 by Andrew Bennetts
More tests.
38
This is more inconvenient (because you need to make every try block a
39
function), but will ensure that the first error encountered is the one raised,
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
40
while also ensuring all cleanups are run.  See OperationWithCleanups for more
41
details.
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
42
"""
43
44
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
45
from collections import deque
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
46
import sys
4634.85.3 by Andrew Bennetts
Lots more tests.
47
from bzrlib import (
48
    debug,
49
    trace,
50
    )
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
51
4634.85.5 by Andrew Bennetts
Add unit test for -Dcleanup behaviour.
52
def _log_cleanup_error(exc):
4634.85.3 by Andrew Bennetts
Lots more tests.
53
    trace.mutter('Cleanup failed:')
54
    trace.log_exception_quietly()
4634.85.5 by Andrew Bennetts
Add unit test for -Dcleanup behaviour.
55
    if 'cleanup' in debug.debug_flags:
56
        trace.warning('bzr: warning: Cleanup failed: %s', exc)
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
57
58
4744.3.1 by Andrew Bennetts
Merge do_with_cleanups from cleanup-hof, and drop (or at least make private) everything else from that branch.
59
def _run_cleanup(func, *args, **kwargs):
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
60
    """Run func(*args, **kwargs), logging but not propagating any error it
61
    raises.
62
63
    :returns: True if func raised no errors, else False.
64
    """
65
    try:
66
        func(*args, **kwargs)
67
    except KeyboardInterrupt:
68
        raise
4634.85.5 by Andrew Bennetts
Add unit test for -Dcleanup behaviour.
69
    except Exception, exc:
70
        _log_cleanup_error(exc)
71
        return False
72
    return True
73
74
4744.3.3 by Andrew Bennetts
Remove _run_cleanup_reporting_errors.
75
def _run_cleanups(funcs):
76
    """Run a series of cleanup functions."""
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
77
    for func, args, kwargs in funcs:
78
        _run_cleanup(func, *args, **kwargs)
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
79
80
4744.3.2 by Andrew Bennetts
Add OperationWithCleanups helper, use it to make commit.py simpler and more robust.
81
class OperationWithCleanups(object):
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
82
    """A way to run some code with a dynamic cleanup list.
4744.3.2 by Andrew Bennetts
Add OperationWithCleanups helper, use it to make commit.py simpler and more robust.
83
84
    This provides a way to add cleanups while the function-with-cleanups is
85
    running.
86
87
    Typical use::
88
89
        operation = OperationWithCleanups(some_func)
90
        operation.run(args...)
91
92
    where `some_func` is::
93
4900.1.1 by Andrew Bennetts
Add add_cleanup to Command.
94
        def some_func(operation, args, ...):
4744.3.2 by Andrew Bennetts
Add OperationWithCleanups helper, use it to make commit.py simpler and more robust.
95
            do_something()
96
            operation.add_cleanup(something)
97
            # etc
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
98
99
    Note that the first argument passed to `some_func` will be the
4900.1.1 by Andrew Bennetts
Add add_cleanup to Command.
100
    OperationWithCleanups object.  To invoke `some_func` without that, use
101
    `run_simple` instead of `run`.
4744.3.2 by Andrew Bennetts
Add OperationWithCleanups helper, use it to make commit.py simpler and more robust.
102
    """
103
104
    def __init__(self, func):
105
        self.func = func
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
106
        self.cleanups = deque()
107
108
    def add_cleanup(self, cleanup_func, *args, **kwargs):
109
        """Add a cleanup to run.
110
111
        Cleanups may be added at any time before or during the execution of
112
        self.func.  Cleanups will be executed in LIFO order.
113
        """
114
        self.cleanups.appendleft((cleanup_func, args, kwargs))
4744.3.2 by Andrew Bennetts
Add OperationWithCleanups helper, use it to make commit.py simpler and more robust.
115
116
    def run(self, *args, **kwargs):
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
117
        return _do_with_cleanups(
118
            self.cleanups, self.func, self, *args, **kwargs)
119
4900.1.1 by Andrew Bennetts
Add add_cleanup to Command.
120
    def run_simple(self, *args, **kwargs):
121
        return _do_with_cleanups(
122
            self.cleanups, self.func, *args, **kwargs)
123
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
124
    def cleanup_now(self):
125
        _run_cleanups(self.cleanups)
126
        self.cleanups.clear()
127
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
128
129
def _do_with_cleanups(cleanup_funcs, func, *args, **kwargs):
4634.85.8 by Andrew Bennetts
Docstring and comment elaboration.
130
    """Run `func`, then call all the cleanup_funcs.
131
132
    All the cleanup_funcs are guaranteed to be run.  The first exception raised
133
    by func or any of the cleanup_funcs is the one that will be propagted by
134
    this function (subsequent errors are caught and logged).
135
136
    Conceptually similar to::
137
138
        try:
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
139
            return func(*args, **kwargs)
4634.85.8 by Andrew Bennetts
Docstring and comment elaboration.
140
        finally:
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
141
            for cleanup, cargs, ckwargs in cleanup_funcs:
142
                cleanup(*cargs, **ckwargs)
4634.85.8 by Andrew Bennetts
Docstring and comment elaboration.
143
144
    It avoids several problems with using try/finally directly:
145
     * an exception from func will not be obscured by a subsequent exception
146
       from a cleanup.
147
     * an exception from a cleanup will not prevent other cleanups from
148
       running (but the first exception encountered is still the one
149
       propagated).
150
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
151
    Unike `_run_cleanup`, `_do_with_cleanups` can propagate an exception from a
4634.85.8 by Andrew Bennetts
Docstring and comment elaboration.
152
    cleanup, but only if there is no exception from func.
153
    """
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
154
    # As correct as Python 2.4 allows.
155
    try:
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
156
        result = func(*args, **kwargs)
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
157
    except:
158
        # We have an exception from func already, so suppress cleanup errors.
4744.3.1 by Andrew Bennetts
Merge do_with_cleanups from cleanup-hof, and drop (or at least make private) everything else from that branch.
159
        _run_cleanups(cleanup_funcs)
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
160
        raise
161
    else:
162
        # No exception from func, so allow the first exception from
163
        # cleanup_funcs to propagate if one occurs (but only after running all
164
        # of them).
165
        exc_info = None
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
166
        for cleanup, c_args, c_kwargs in cleanup_funcs:
4634.85.3 by Andrew Bennetts
Lots more tests.
167
            # XXX: Hmm, if KeyboardInterrupt arrives at exactly this line, we
4634.85.8 by Andrew Bennetts
Docstring and comment elaboration.
168
            # won't run all cleanups... perhaps we should temporarily install a
169
            # SIGINT handler?
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
170
            if exc_info is None:
171
                try:
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
172
                    cleanup(*c_args, **c_kwargs)
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
173
                except:
174
                    # This is the first cleanup to fail, so remember its
175
                    # details.
176
                    exc_info = sys.exc_info()
177
            else:
178
                # We already have an exception to propagate, so log any errors
179
                # but don't propagate them.
4744.3.4 by Andrew Bennetts
Make OperationWithCleanups the only public API in bzrlib.cleanup, add test for it, add support for *args and **kwargs for func and for cleanups, use deque.appendleft rather than list.insert(0, ...).
180
                _run_cleanup(cleanup, *c_args, **kwargs)
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
181
        if exc_info is not None:
182
            raise exc_info[0], exc_info[1], exc_info[2]
4634.85.2 by Andrew Bennetts
Test and code tweak.
183
        # No error, so we can return the result
184
        return result
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
185
186