← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

Merge smart server changes that are already with PQM, and fix conflict and formatting nit in NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
102
102
                    return s.encode('utf8')
103
103
                return s
104
104
        except (AttributeError, TypeError, NameError, ValueError, KeyError), e:
105
 
            return 'Unprintable exception %s: dict=%r, fmt=%r, error=%s' \
 
105
            return 'Unprintable exception %s: dict=%r, fmt=%r, error=%r' \
106
106
                % (self.__class__.__name__,
107
107
                   self.__dict__,
108
108
                   getattr(self, '_fmt', None),
109
 
                   str(e))
 
109
                   e)
110
110
 
111
111
    def _get_format_string(self):
112
112
        """Return format string for this exception or None"""
154
154
                return s.encode('utf8')
155
155
            return s
156
156
        except (TypeError, NameError, ValueError, KeyError), e:
157
 
            return 'Unprintable exception %s(%r): %s' \
 
157
            return 'Unprintable exception %s(%r): %r' \
158
158
                % (self.__class__.__name__,
159
 
                   self.__dict__, str(e))
 
159
                   self.__dict__, e)
160
160
 
161
161
 
162
162
class AlreadyBuilding(BzrError):
1633
1633
    def __init__(self, from_path, to_path, extra=None):
1634
1634
        BzrMoveFailedError.__init__(self, from_path, to_path, extra)
1635
1635
 
 
1636
class BzrRemoveChangedFilesError(BzrError):
 
1637
    """Used when user is trying to remove changed files."""
 
1638
 
 
1639
    _fmt = ("Can't remove changed or unknown files:\n%(changes_as_text)s"
 
1640
        "Use --keep to not delete them, or --force to delete them regardless.")
 
1641
 
 
1642
    def __init__(self, tree_delta):
 
1643
        BzrError.__init__(self)
 
1644
        self.changes_as_text = tree_delta.get_changes_as_text()
 
1645
        #self.paths_as_string = '\n'.join(changed_files)
 
1646
        #self.paths_as_string = '\n'.join([quotefn(p) for p in changed_files])
 
1647
 
1636
1648
 
1637
1649
class BzrBadParameterNotString(BzrBadParameter):
1638
1650