Rev 2119: (mbp) deprecate BzrNewError, change to using .internal_error on exceptions, etc in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Fri Nov 3 02:35:49 GMT 2006


------------------------------------------------------------
revno: 2119
revision-id: pqm at pqm.ubuntu.com-20061103023548-12e702bb911c4be2
parent: pqm at pqm.ubuntu.com-20061102234014-be7b4e5b6dac2996
parent: mbp at sourcefrog.net-20061103022332-8faa29378257aba3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-11-03 02:35:48 +0000
message:
  (mbp) deprecate BzrNewError, change to using .internal_error on exceptions, etc
modified:
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061103022332-8faa29378257aba3
    parent: mbp at sourcefrog.net-20061103022255-03efeee385b81b46
    parent: pqm at pqm.ubuntu.com-20061102234014-be7b4e5b6dac2996
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: cleanup-errors
    timestamp: Fri 2006-11-03 13:23:32 +1100
    message:
      merge bzr.dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061103022255-03efeee385b81b46
    parent: mbp at sourcefrog.net-20061103015212-1e5f881c2152d79f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: cleanup-errors
    timestamp: Fri 2006-11-03 13:22:55 +1100
    message:
      Update deprecation version
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061103015212-1e5f881c2152d79f
    parent: mbp at sourcefrog.net-20061103015126-427cb97a48404f42
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: cleanup-errors
    timestamp: Fri 2006-11-03 12:52:12 +1100
    message:
      Review comments
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061103015126-427cb97a48404f42
    parent: mbp at sourcefrog.net-20061102102019-9a5a02f485dff6f6
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: cleanup-errors
    timestamp: Fri 2006-11-03 12:51:26 +1100
    message:
      Error deprecations will come in for 0.13
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061102102019-9a5a02f485dff6f6
    parent: mbp at sourcefrog.net-20061102093721-b606445faedb3fb2
    parent: pqm at pqm.ubuntu.com-20061102080611-5462d2713bf4bc45
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: cleanup-errors
    timestamp: Thu 2006-11-02 21:20:19 +1100
    message:
      merge bzr.dev and reconcile several changes, also some test fixes
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061102093721-b606445faedb3fb2
    parent: mbp at sourcefrog.net-20061015115758-041391cf08503621
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: cleanup-errors
    timestamp: Thu 2006-11-02 20:37:21 +1100
    message:
      Error cleanup review comments:
      
      Change to 'internal_error'
      
      Migrate all builtin errors from using docstrings, but still support them.
      
      Fix typos and layout.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061015115758-041391cf08503621
    parent: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: cleanup-errors
    timestamp: Sun 2006-10-15 21:57:58 +1000
    message:
      Clean up BzrNewError, other exception classes and users.
      
      This cleans up the probably-mistaken BzrNewError behaviour of using error
      class docstrings as their format string.  Instead errors can define a _fmt
      attribute with the same meaning.  The docstring is now reserved for its
      regular purpose of documentation for programmers.  This behaviour is added to
      BzrError.  BzrNewError is left in place for compatibility but no builtin
      errors use it anymore and it gives a deprecation warning on construction.
      
      BzrError now accepts either a single preformatted string, or a set of named
      parameters to be substituted in to a format string for that class.  This 
      behaviour is cleaned up and a couple of callers that depended on the
      Python2.4-style exception args tuple are fixed.
      
      Display of unprintable errors is slightly more robust.
      
      errors.IncompatibleFormat was defined twice (shadowing the first
      definition), so one use was disambiguated to IncompatibleBundleFormat.
      
      UnsupportedEOLMarker called the wrong superclass constructor.
      
      test_time_creates_benchmark_in_result was too dependent on benchmark
      timing and has been loosened.
      
      Some error representations changed slightly because of this (e.g. in use
      of punctuation.)



More information about the bazaar-commits mailing list