Rev 1632: (mbp) storage escaping, cleanups in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Apr 12 09:40:17 BST 2006


------------------------------------------------------------
revno: 1632
revision-id: pqm at pqm.ubuntu.com-20060412084015-e6472a0717edbca6
parent: pqm at pqm.ubuntu.com-20060412082925-f1988a4619180117
parent: mbp at sourcefrog.net-20060412070200-b12b348eff529d60
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-12 09:40:15 +0100
message:
  (mbp) storage escaping, cleanups
added:
  bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
  bzrlib/transport/fakevfat.py   fakevfat.py-20060407072414-d59939fa1d6c79d9
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
  bzrlib/store/text.py           text.py-20050928201105-c26468dcb5d9b18b
  bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060412070200-b12b348eff529d60
    parent: mbp at sourcefrog.net-20060412065222-66347b5909aefb25
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Wed 2006-04-12 17:02:00 +1000
    message:
      Move small ImmutableMemoryStore class into test module, 
      which is the only place it's used
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060412065222-66347b5909aefb25
    parent: mbp at sourcefrog.net-20060412063753-65db5f7d28bbfd11
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Wed 2006-04-12 16:52:22 +1000
    message:
      Clean up clone-bzrdir code
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060412063753-65db5f7d28bbfd11
    parent: mbp at sourcefrog.net-20060412062257-f5a64d2ecff23f41
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Wed 2006-04-12 16:37:53 +1000
    message:
      Review cleanup of TransportStore.has_id
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060412062257-f5a64d2ecff23f41
    parent: mbp at sourcefrog.net-20060412061310-ab5e04ba4fd24368
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Wed 2006-04-12 16:22:57 +1000
    message:
      Remove dead and useless Repository.copy() method
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060412061310-ab5e04ba4fd24368
    parent: mbp at sourcefrog.net-20060412045220-5c60952c072a085a
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Wed 2006-04-12 16:13:10 +1000
    message:
      Use transport._can_roundtrip_unix_modebits to decide whether to check transport results
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060412045220-5c60952c072a085a
    parent: mbp at sourcefrog.net-20060412044532-fc8c5c9408aae88b
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Wed 2006-04-12 14:52:20 +1000
    message:
      Review style cleanups
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060412044532-fc8c5c9408aae88b
    parent: pqm at pqm.ubuntu.com-20060411070422-9167eccbd3e561a2
    parent: mbp at sourcefrog.net-20060411050425-618978fd42460c19
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.merge.escaped-stores
    timestamp: Wed 2006-04-12 14:45:32 +1000
    message:
      [merge][wip] Storage escaping
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060411050425-618978fd42460c19
    parent: mbp at sourcefrog.net-20060410083833-62a7d2e827fac66d
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Tue 2006-04-11 15:04:25 +1000
    message:
      (test_escaped_store) fix typo
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060410083833-62a7d2e827fac66d
    parent: mbp at sourcefrog.net-20060410074447-51bd678ad1bc3c5e
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Mon 2006-04-10 18:38:33 +1000
    message:
      Store-escaping must quote uppercase characters too, so that they're safely 
      stored on Windows.  We can't use urllib.quote anymore but must have our own 
      version that can do this.  Test.
      
      Make KnitRepository use escaped stores.
      
      Update existing storage-escaping tests.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060410074447-51bd678ad1bc3c5e
    parent: mbp at sourcefrog.net-20060410074413-7417ac0149c5643e
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Mon 2006-04-10 17:44:47 +1000
    message:
      (FakeVFAT) add test for detection of invalid characters
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060410074413-7417ac0149c5643e
    parent: mbp at sourcefrog.net-20060410074309-cee0d108e7b952a1
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Mon 2006-04-10 17:44:13 +1000
    message:
      (TransportDecorator) better assertions
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060410074309-cee0d108e7b952a1
    parent: mbp at sourcefrog.net-20060410061801-677145ba01f5445f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Mon 2006-04-10 17:43:09 +1000
    message:
      (FakeVFAT) implement more transport methods; disallow bad characters
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060410061801-677145ba01f5445f
    parent: mbp at sourcefrog.net-20060410061725-be42a126901fcaab
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Mon 2006-04-10 16:18:01 +1000
    message:
      Separate out BzrDir.initialize_on_transport so it
      can be run on any transport without requiring their url to be registered
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060410061725-be42a126901fcaab
    parent: mbp at sourcefrog.net-20060410061639-63bac88fca3560ab
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Mon 2006-04-10 16:17:25 +1000
    message:
      Rename supports_unix_modebits to _can_roundtrip_unix_modebits for clarity
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060410061639-63bac88fca3560ab
    parent: mbp at sourcefrog.net-20060409081242-eb44bff7db445694
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Mon 2006-04-10 16:16:39 +1000
    message:
      Cleanup escaped stores
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060409081242-eb44bff7db445694
    parent: mbp at sourcefrog.net-20060409022050-14d311b4d9ef853a
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Sun 2006-04-09 18:12:42 +1000
    message:
      Add Transport.supports_unix_modebits, so tests can 
      avoid testing them where they won't work.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060409022050-14d311b4d9ef853a
    parent: mbp at sourcefrog.net-20060409022012-e5b6adc7d28aa1af
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Sun 2006-04-09 12:20:50 +1000
    message:
      [broken] Add FakeFVATTransport
      currently failing some tests
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060409022012-e5b6adc7d28aa1af
    parent: mbp at sourcefrog.net-20060404104308-631ccdb35714bd29
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Sun 2006-04-09 12:20:12 +1000
    message:
      Add default Transport.rename() to TransportDecorator
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060404104308-631ccdb35714bd29
    parent: mbp at sourcefrog.net-20060404102054-77707fa58447e26a
    parent: pqm at pqm.ubuntu.com-20060404014851-ae9a2babfd810da1
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Tue 2006-04-04 20:43:08 +1000
    message:
      [merge] sync from bzr.dev
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060404102054-77707fa58447e26a
    parent: pqm at pqm.ubuntu.com-20060310021935-2da34b3a9b5d5e25
    parent: john at arbash-meinel.com-20060216064126-bc29375f7e01c08d
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.escape-stores
    timestamp: Tue 2006-04-04 20:20:54 +1000
    message:
      [merge] Storage filename escaping
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060216064126-bc29375f7e01c08d
    parent: john at arbash-meinel.com-20060216044554-14ba44a054046009
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-escape-stores
    timestamp: Thu 2006-02-16 00:41:26 -0600
    message:
      Adding progress indicators and improved get order for 'bzr branch'
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060216044554-14ba44a054046009
    parent: john at arbash-meinel.com-20060216044048-9a7c53e15a08632a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-escape-stores
    timestamp: Wed 2006-02-15 22:45:54 -0600
    message:
      Removing unneeded note statements.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060216044048-9a7c53e15a08632a
    parent: john at arbash-meinel.com-20060216042844-9e3db7cd84db5be7
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-escape-stores
    timestamp: Wed 2006-02-15 22:40:48 -0600
    message:
      Removing unneeded print statement
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060216042844-9e3db7cd84db5be7
    parent: john at arbash-meinel.com-20060216030605-c212d710550a1fb3
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-escape-stores
    timestamp: Wed 2006-02-15 22:28:44 -0600
    message:
      Changing the escapes so that we leave @ as unescaped.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060216030605-c212d710550a1fb3
    parent: john at arbash-meinel.com-20060216024100-aa9cc2e6c895d5d2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-escape-stores
    timestamp: Wed 2006-02-15 21:06:05 -0600
    message:
      Adding tests to make sure weave stores can retrieve the files they add.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060216024100-aa9cc2e6c895d5d2
    parent: john at arbash-meinel.com-20060210211648-4d8be6daa956ca87
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-escape-stores
    timestamp: Wed 2006-02-15 20:41:00 -0600
    message:
      Changing the escaping just a little bit. Now we can handle unicode characters.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060210211648-4d8be6daa956ca87
    parent: john at arbash-meinel.com-20060210200203-d39765285963fae4
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-escape-stores
    timestamp: Fri 2006-02-10 15:16:48 -0600
    message:
      We need to reference the basis_tree to get the proper executable bits.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060210200203-d39765285963fae4
    parent: john at arbash-meinel.com-20060210194417-f21bea235aeb9ebc
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-escape-stores
    timestamp: Fri 2006-02-10 14:02:03 -0600
    message:
      Fix merge so that it forces the old executable bit.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060210194417-f21bea235aeb9ebc
    parent: john at arbash-meinel.com-20060209183047-cbd6666d18efafd0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-escape-stores
    timestamp: Fri 2006-02-10 13:44:17 -0600
    message:
      Traced double locking code to WorkingTree creating its own control files.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060209183047-cbd6666d18efafd0
    parent: john at arbash-meinel.com-20060206135424-e20c6607c047b096
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-escape-stores
    timestamp: Thu 2006-02-09 12:30:47 -0600
    message:
      Text store and weave store both allow escaping fileid paths.



More information about the bazaar-commits mailing list