Rev 2321: (John Arbash Meinel) Change safe_*_id to issue a deprecation warning, and clean up places that were still generating unicode ids. in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Tue Mar 6 15:59:45 GMT 2007


------------------------------------------------------------
revno: 2321
revision-id: pqm at pqm.ubuntu.com-20070306155943-73eafa9adb83ea73
parent: pqm at pqm.ubuntu.com-20070306152511-aa137bb63d6e3a62
parent: john at arbash-meinel.com-20070306154347-ilhp9u2chs2nxm3b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-06 15:59:43 +0000
message:
  (John Arbash Meinel) Change safe_*_id to issue a deprecation warning, and clean up places that were still generating unicode ids.
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/bundle/bundle_data.py   read_changeset.py-20050619171944-c0d95aa685537640
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
  bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
  bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
  bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
  bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070306154347-ilhp9u2chs2nxm3b
    parent: john at arbash-meinel.com-20070306153636-hwdhiuapirt7p00q
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Tue 2007-03-06 09:43:47 -0600
    message:
      The parameter is 'conflict_path' not 'conflict_file_path'
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070306153636-hwdhiuapirt7p00q
    parent: john at arbash-meinel.com-20070306151218-b8ucoudmtdy5ls0m
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Tue 2007-03-06 09:36:36 -0600
    message:
      Conflicts go through Stanza so the need to be aware of utf8 versus unicode file ids.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070306151218-b8ucoudmtdy5ls0m
    parent: john at arbash-meinel.com-20070302192706-7npsqodk033g21al
    parent: pqm at pqm.ubuntu.com-20070306114711-2175c71920d9299c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Tue 2007-03-06 09:12:18 -0600
    message:
      [merge] bzr.dev 2319
      (broken) Conflicts generate unicode file ids, will fix in next commit.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070302192706-7npsqodk033g21al
    parent: john at arbash-meinel.com-20070302185900-8wyh1uzo0tlbupx7
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Fri 2007-03-02 13:27:06 -0600
    message:
      Change Branch5._gen_revision_history() to be a bit faster about reading all revisions.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070302185900-8wyh1uzo0tlbupx7
    parent: john at arbash-meinel.com-20070302171917-e2x26bl23cetyxw1
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Fri 2007-03-02 12:59:00 -0600
    message:
      (fixed) Fix the last few tests that were explicitly passing around unicode ids
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070302171917-e2x26bl23cetyxw1
    parent: john at arbash-meinel.com-20070302171052-yn19ifc2f323tvqs
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Fri 2007-03-02 11:19:17 -0600
    message:
      WorkingTree.merged_modified() needs to switch back to utf8 file ids.
      And AddCustomIDAction should also be generating utf8 ids.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070302171052-yn19ifc2f323tvqs
    parent: john at arbash-meinel.com-20070302170940-52wmugtm01zpzma2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Fri 2007-03-02 11:10:52 -0600
    message:
      TextStores don't require Unicode file_ids anymore. test_a passes
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070302170940-52wmugtm01zpzma2
    parent: john at arbash-meinel.com-20070302165124-pzxf42224e9j7ju2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Fri 2007-03-02 11:09:40 -0600
    message:
      Update VersionedFile tests to ensure that they can take Unicode,
      but issue a warning when doing so.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070302165124-pzxf42224e9j7ju2
    parent: john at arbash-meinel.com-20070302164035-sicgpxj3u88arycc
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Fri 2007-03-02 10:51:24 -0600
    message:
      Update the 'escaped store' tests to use both unicode and utf8 file ids.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070302164035-sicgpxj3u88arycc
    parent: john at arbash-meinel.com-20070302163503-8z3knxzmkzsqmogw
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Fri 2007-03-02 10:40:35 -0600
    message:
      Change bundle_data to use the sanitizing form of safe_*_id
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070302163503-8z3knxzmkzsqmogw
    parent: john at arbash-meinel.com-20070302161948-63n53irxqf5f72dp
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Fri 2007-03-02 10:35:03 -0600
    message:
      Change what warnings are raised, and add tests that they are used.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070302161948-63n53irxqf5f72dp
    parent: john at arbash-meinel.com-20070302160657-acwr7ptaigpwawle
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Fri 2007-03-02 10:19:48 -0600
    message:
      (broken) change safe_*_id to emit a warning.
      This causes lots of tests to start failing.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070302160657-acwr7ptaigpwawle
    parent: john at arbash-meinel.com-20070302155652-d64161mcg1rybs1o
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Fri 2007-03-02 10:06:57 -0600
    message:
      Change iter_entries_by_dir to avoid extra file id safety checks.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070302155652-d64161mcg1rybs1o
    parent: pqm at pqm.ubuntu.com-20070301073000-0bfe1394fee5e712
    parent: john at arbash-meinel.com-20070302152321-hgsk2328bwgi1e6g
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: unicode_id_warnings
    timestamp: Fri 2007-03-02 09:56:52 -0600
    message:
      [merge] iter_entries_by_dir fix



More information about the bazaar-commits mailing list