/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
1
# Copyright (C) 2009 Canonical Ltd
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
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, ...).
34
    operation = OperationWithCleanups(lambda operation: do_something())
35
    operation.add_cleanup(cleanup_something)
36
    operation.run()
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
94
        def some_func(operation, args, ...)
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
100
    OperationWithCleanups object.
4744.3.2 by Andrew Bennetts
Add OperationWithCleanups helper, use it to make commit.py simpler and more robust.
101
    """
102
103
    def __init__(self, func):
104
        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, ...).
105
        self.cleanups = deque()
106
107
    def add_cleanup(self, cleanup_func, *args, **kwargs):
108
        """Add a cleanup to run.
109
110
        Cleanups may be added at any time before or during the execution of
111
        self.func.  Cleanups will be executed in LIFO order.
112
        """
113
        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.
114
115
    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, ...).
116
        return _do_with_cleanups(
117
            self.cleanups, self.func, self, *args, **kwargs)
118
4936.1.1 by Andrew Bennetts
Replace some fragile try/finally cleanups in bzrlib.reconcile with OperationWithCleanups (borrowing run_simple from command-cleanup branch).
119
    def run_simple(self, *args, **kwargs):
120
        return _do_with_cleanups(
121
            self.cleanups, self.func, *args, **kwargs)
122
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, ...).
123
124
def _do_with_cleanups(cleanup_funcs, func, *args, **kwargs):
4634.85.8 by Andrew Bennetts
Docstring and comment elaboration.
125
    """Run `func`, then call all the cleanup_funcs.
126
127
    All the cleanup_funcs are guaranteed to be run.  The first exception raised
128
    by func or any of the cleanup_funcs is the one that will be propagted by
129
    this function (subsequent errors are caught and logged).
130
131
    Conceptually similar to::
132
133
        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, ...).
134
            return func(*args, **kwargs)
4634.85.8 by Andrew Bennetts
Docstring and comment elaboration.
135
        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, ...).
136
            for cleanup, cargs, ckwargs in cleanup_funcs:
137
                cleanup(*cargs, **ckwargs)
4634.85.8 by Andrew Bennetts
Docstring and comment elaboration.
138
139
    It avoids several problems with using try/finally directly:
140
     * an exception from func will not be obscured by a subsequent exception
141
       from a cleanup.
142
     * an exception from a cleanup will not prevent other cleanups from
143
       running (but the first exception encountered is still the one
144
       propagated).
145
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, ...).
146
    Unike `_run_cleanup`, `_do_with_cleanups` can propagate an exception from a
4634.85.8 by Andrew Bennetts
Docstring and comment elaboration.
147
    cleanup, but only if there is no exception from func.
148
    """
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
149
    # As correct as Python 2.4 allows.
150
    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, ...).
151
        result = func(*args, **kwargs)
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
152
    except:
153
        # 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.
154
        _run_cleanups(cleanup_funcs)
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
155
        raise
156
    else:
157
        # No exception from func, so allow the first exception from
158
        # cleanup_funcs to propagate if one occurs (but only after running all
159
        # of them).
160
        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, ...).
161
        for cleanup, c_args, c_kwargs in cleanup_funcs:
4634.85.3 by Andrew Bennetts
Lots more tests.
162
            # XXX: Hmm, if KeyboardInterrupt arrives at exactly this line, we
4634.85.8 by Andrew Bennetts
Docstring and comment elaboration.
163
            # won't run all cleanups... perhaps we should temporarily install a
164
            # SIGINT handler?
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
165
            if exc_info is None:
166
                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, ...).
167
                    cleanup(*c_args, **c_kwargs)
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
168
                except:
169
                    # This is the first cleanup to fail, so remember its
170
                    # details.
171
                    exc_info = sys.exc_info()
172
            else:
173
                # We already have an exception to propagate, so log any errors
174
                # 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, ...).
175
                _run_cleanup(cleanup, *c_args, **kwargs)
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
176
        if exc_info is not None:
177
            raise exc_info[0], exc_info[1], exc_info[2]
4634.85.2 by Andrew Bennetts
Test and code tweak.
178
        # No error, so we can return the result
179
        return result
4634.85.1 by Andrew Bennetts
Begin defining cleanup helpers and their tests.
180
181