Rev 1260: [merge] from bzr.dev in /home/mbp/work/bzr/bzr.mbp.storage

Martin Pool mbp at sourcefrog.net
Thu Jan 12 06:15:26 GMT 2006


------------------------------------------------------------
revno: 1260
revision-id: mbp at sourcefrog.net-20060112061522-cbd17c5ab7494910
parent: robertc at robertcollins.net-20060111235551-2450cf1d30a24fe8
parent: mbp at sourcefrog.net-20060112045444-cc2e49b5bae40e06
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.storage
timestamp: Thu 2006-01-12 17:15:22 +1100
message:
  [merge] from bzr.dev
added:
  bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
  bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
modified:
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/changeset.py            changeset.py-20050513021216-b02ab57fb9738913
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/hashcache.py            hashcache.py-20050706091756-fe3a8cc1143ff24f
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_sampler.py   testsampler.py-20051006114006-67f6d8ecb1fda6de
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  tutorial.txt                   tutorial.txt-20050804190939-9dcbba2ef053bc84
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060112045444-cc2e49b5bae40e06
    parent: mbp at sourcefrog.net-20060111023617-858327bfdccb46e3
    parent: denys.duchier at mozart-oz.org-20060111195859-3ffb9c90dba9caa9
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-01-12 15:54:44 +1100
    message:
      [merge] hashcache and related cleanups from Denys
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060111195859-3ffb9c90dba9caa9
    parent: denys.duchier at mozart-oz.org-20060111191838-1aa7989945935f65
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.cleanup
    timestamp: Wed 2006-01-11 20:58:59 +0100
    message:
      hashcache: new constants and improved comment
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060111191838-1aa7989945935f65
    parent: denys.duchier at mozart-oz.org-20060111191229-370396538858f412
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.cleanup
    timestamp: Wed 2006-01-11 20:18:38 +0100
    message:
      only write the hashcache when releasing the lock
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060111191229-370396538858f412
    parent: denys.duchier at mozart-oz.org-20060111191035-33f9defbfcd52b4d
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.cleanup
    timestamp: Wed 2006-01-11 20:12:29 +0100
    message:
      hashcache: missing import for BzrError
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060111191035-33f9defbfcd52b4d
    parent: denys.duchier at mozart-oz.org-20060111190925-7bbe15ef3ee7b3cd
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.cleanup
    timestamp: Wed 2006-01-11 20:10:35 +0100
    message:
      hashcache: remove useless os.readlink
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060111190925-7bbe15ef3ee7b3cd
    parent: denys.duchier at mozart-oz.org-20060109212309-919eac90ed3bb881
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.cleanup
    timestamp: Wed 2006-01-11 20:09:25 +0100
    message:
      hashcache: import only once from bzrlib.osutils
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060109212309-919eac90ed3bb881
    parent: denys.duchier at mozart-oz.org-20051223180321-b1aca26aa107990f
    parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.cleanup
    timestamp: Mon 2006-01-09 22:23:09 +0100
    message:
      merged from trunk
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
    parent: mbp at sourcefrog.net-20060108233527-3f536f604c954d72
    parent: mbp at sourcefrog.net-20060106121804-effcf89487f01864
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-01-09 12:51:38 +1100
    message:
      [merge] Move in tutorial text from wiki.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060106121804-effcf89487f01864
    parent: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-01-06 23:18:04 +1100
    message:
      Move in tutorial text from wiki.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
    parent: mbp at sourcefrog.net-20060105090132-968677325eab0148
    parent: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-01-06 12:13:05 +1100
    message:
      [merge] robertc
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
    parent: robertc at robertcollins.net-20060105214856-c88e035070de8465
    parent: robertc at robertcollins.net-20060105224446-a1ee05b67dead4fc
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Fri 2006-01-06 09:48:59 +1100
    message:
      Merge in :
        * bzrlib.osutils.safe_unicode now exists to provide parameter coercion
          for functions that need unicode strings. (Robert Collins)
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105224446-a1ee05b67dead4fc
    parent: robertc at robertcollins.net-20060105223059-a8b64f7b47cf12fb
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: safe_unicode
    timestamp: Fri 2006-01-06 09:44:46 +1100
    message:
      An extra test for John.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105223059-a8b64f7b47cf12fb
    parent: robertc at robertcollins.net-20060105214856-c88e035070de8465
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: safe_unicode
    timestamp: Fri 2006-01-06 09:30:59 +1100
    message:
       * bzrlib.osutils.safe_unicode now exists to provide parameter coercion
         for functions that need unicode strings. (Robert Collins)
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105214856-c88e035070de8465
    parent: robertc at robertcollins.net-20060105213257-72e57eb4e30b0bc2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Fri 2006-01-06 08:48:56 +1100
    message:
      Bugfix the symbol_versioning deprecation decorators to update the
      __module__ attribute of methods and functions. (Robert Collins)
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105213257-72e57eb4e30b0bc2
    parent: robertc at robertcollins.net-20060104233225-7ce047eb1fca63ec
    parent: robertc at robertcollins.net-20060105124646-af18da35bc3f64b4
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Fri 2006-01-06 08:32:57 +1100
    message:
       * Deprecated functions and methods can now be marked as such using the 
         bzrlib.symbol_versioning module. Marked method have their docstring
         updated and will issue a DeprecationWarning using the warnings module
         when they are used. (Robert Collins)
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105124646-af18da35bc3f64b4
    parent: robertc at robertcollins.net-20060105120726-6c818f10b227aa62
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: deprecation
    timestamp: Thu 2006-01-05 23:46:46 +1100
    message:
      Set the __name__ attribute on decorated methods and functions.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105120726-6c818f10b227aa62
    parent: robertc at robertcollins.net-20060105114350-e21c40532770563e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: deprecation
    timestamp: Thu 2006-01-05 23:07:26 +1100
    message:
      Update NEWS and HACKING for the symbol_versioning module.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105114350-e21c40532770563e
    parent: robertc at robertcollins.net-20060105110307-21db4cbdfd94f2c6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: deprecation
    timestamp: Thu 2006-01-05 22:43:50 +1100
    message:
      decorate docstrings in deprecated functions.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105110307-21db4cbdfd94f2c6
    parent: robertc at robertcollins.net-20060105104926-6e5dc14eff2352ca
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: deprecation
    timestamp: Thu 2006-01-05 22:03:07 +1100
    message:
      Implement deprecated_function.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105104926-6e5dc14eff2352ca
    parent: robertc at robertcollins.net-20060104233225-7ce047eb1fca63ec
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: deprecation
    timestamp: Thu 2006-01-05 21:49:26 +1100
    message:
      Implement deprecated_method
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060105090132-968677325eab0148
    parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-01-05 20:01:32 +1100
    message:
      todo idea from John
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060108233527-3f536f604c954d72
    parent: mbp at sourcefrog.net-20060108233414-d62c4e95c75a3f34
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-01-09 10:35:27 +1100
    message:
      Prepare for 0.7rc1 release
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060108233414-d62c4e95c75a3f34
    parent: mbp at sourcefrog.net-20060108223956-fcfb6cf192119490
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-01-09 10:34:14 +1100
    message:
      ignore .sw[nop] by default
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060108223956-fcfb6cf192119490
    parent: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-01-09 09:39:56 +1100
    message:
      Don't ignore Makefile.in by default (#6413)
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20051223180321-b1aca26aa107990f
    parent: denys.duchier at mozart-oz.org-20051222190314-bc62a9e63173500a
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.cleanup
    timestamp: Fri 2005-12-23 19:03:21 +0100
    message:
      removed apply_changeset_tree and get_inventory_change
      
      apply_changetset_tree not only was not used but called
      tree.update_source_inventory which is not defined anywhere
      
      get_inventory_change was only used by apply_changeset_tree
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060111023617-858327bfdccb46e3
    parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Wed 2006-01-11 13:36:17 +1100
    message:
      doc



More information about the bazaar-commits mailing list