Merge lp:~vila/bzr/cleanup into lp:bzr

[Vincent Ladeuil]

This patch cleans a bunch of import in tests.
Most of them focus on get_transport being imported as a symbol which makes it impossible to wrap.

[Vincent Ladeuil (vila)]

Oh, and it fixes some bugs in the http tests regarding parametrisation, no bugs in the code were uncovered though.

[lp:~vila/bzr/cleanup]

5318. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-24

(lifeless) Make the interbranch test_no_get_parent_map_after_insert_stream
 test work for looms. (Robert Collins)

5319. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-25

(spiv) Fix BzrDir.sprout to respect default stacking policies (#597942)
 (Andrew Bennetts)

5320. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-25

(lifeless) Teach BzrDir.find_bzrdirs to handle PermissionDenied errors.
 (Marius Kruger) (Robert Collins)

5321. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-25

(mbp) flush stream parts after each length-prefixed bit,
 like we do when sending (Martin Pool)

5322. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-28

(spiv) Implement __sizeof__ in StaticTuple. (Andrew Bennetts)

5323. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-28

(lifeless) Do not return bzrdirs in find_bzrdirs where there is a branch
 with no repository available to it. (Marius Kruger) (Robert Collins)

5324. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-28

(lifeless) Make the trace module managed more cleanly by BzrLibraryState.
 (Robert Collins)

5325. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-28

(Martin von Gagern) Deal with branch: revision specs in readonly
 transactions

5326. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-30

(vila) Cleanup tests importing get_transport. (Vincent Ladeuil)

5327. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-30

(jameinel) locking for cmd_ignore is now in add_cleanup. (Parth Malwankar)

5328. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-01

(spiv) Fix Branch._unstack to work with repeatedly locked RemoteBranch
 objects. (#551525) (Andrew Bennetts)

5329. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-01

(parthm) fixed import order of lazy_regex w.r.t _format_version_tuple
 definition in bzrlib (Parth Malwankar)

5330. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-02

(jameinel) fixed trace import in bzrlib_initialize (Parth Malwankar)

5331. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-03

(jameinel) a couple of doc cleanups about the ppa (Martin Pool)

5332. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-04

(lifeless) Make lsprof usage serialise rather than generated corrupted
 results when used concurrently in a threaded application. Can now cause
 deadlocks when used reentrantly. (Robert Collins)

5333. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-04

(gz) Make windows installer use a 2 second resolution for plugin script
 timestamps to avoid recompilation at runtime (Martin [gz])

5334. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-05

(lifeless) Fix regression from r5326 that caused infinite recursion in
 osutils._win32_mkdtemp (Martin [gz])

5335. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-05

(lifeless) Remove duplicate test get_parent_map_after_insert_stream. (Robert
 Collins)

5336. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-06

(lifeless) Document the basedir on WorkingTree. (Robert Collins)

5337. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-07

(mbp) developer docs about testing (Martin Pool)

5338. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-07

(jameinel) Use a better list of PyQt includes and excludes. (Gary van der
 Merwe)

5339. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-08

(parthm) Better regex compile errors (Parth Malwankar)

5340. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-09

(jameinel) Rename errors.InvalidPattern argument message=>msg to work with
 multiple Python versions. (Parth Malwankar)

5341. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-12

(jam) Merge 2.2b4 to dev, bump the version numbers.

5342. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-13

(jam) Bump trunk to 2.3-dev1

5343. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-13

(mbp) change some test tearDowns to addCleanup or overrideAttr (Martin Pool)

5344. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-13

(mbp) more documentation about maintaing the ppa (Martin Pool)

5345. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-13

(vila) Merge 2.2 into bzr.dev including fixes for bug #525571 and bug
 #494221

5346. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-15

(mbp) document some tricks about testing bzr (tmpfs, tc qdisc,
 parallel) (Martin Pool)

5347. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-16

(vila) Delete deprecated code. (Vincent Ladeuil)

5348. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-16

(mbp) developer docs about transports and symlinks (Martin Pool)

5349. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-16

(vila) Cleanup some bogus rest constructs in the doc. (Vincent Ladeuil)

5350. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-19

(jameinel) Give a better traceback when a user tries to add files to
 different trees. (Martin Pool)

5351. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-19

(mbp) tree_files and internal_tree files moved to WorkingTree (Martin Pool)

5352. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-19

(mbp) bug 234708: An error is displayed if both --diff-options and --using
 is set (Martin Pool)

5353. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-19

(mbp) Transport.stat('') on a symlink returns info about the link (Martin
 Pool)

5354. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-20

(vila) Dont print internal object names in invalid revision spec
 error (Neil Martinsen-Burrell)

5355. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-20

(vila) Set a Content-Length header on errors for HTTP/1.1 (Vincent Ladeuil)

5356. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-21

(vila) texinfo extension for shpinx (Vincent Ladeuil)

5357. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-21

(vila) Cleanup some test imports (Vincent Ladeuil)

5358. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-21

(jam) Prefer to create content from the repo than from another
 working tree. (bug #607298)

5359. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-23

Add InterBranch.copy_content_into() stub.

5360. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-24

(gz) Correct selftest bzr script location lookup logic when bzrlib is in the
 cwd (Martin [gz])

5361. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-26

(garyvdm, gz) Hack py2exe so that we can have a library.zip built with
 optimize=2, but every thing else has optimize=1.

5362. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-29

(spiv) Expand lp:~/ to lp:~username/ if a user has already logged in. (John
 A Meinel)

5363. By Canonical.com Patch Queue Manager <email address hidden> on 2010-07-29

(mbp) delete deprecated RootEntry class and InventoryEntry methods (Martin
 Pool)

5364. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-02

[r=jam] Add VersionedFiles.get_annotator() stub. (Jelmer)

5365. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-02

(Andrew Bennetts) Merge 2.2 branch back into trunk

5366. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-05

(spiv) Fixed small formatting issue. (Alexander Belchenko)

5367. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-05

(spiv) Reduce the memory consumption of InventoryEntry instances. (Andrew
 Bennetts)

5368. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-05

(spiv) Better (and simpler) algorithm for partition_tests. (Andrew Bennetts)

5369. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-06

(jam) Add __sizeof__ to our extension types.

5370. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-06

Cope with trees without user_url property in UncomittedChanges
 exception. (Jelmer)

5371. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-06

(jam) Merge 2.2.0 into trunk

5372. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-07

(jameinel) Handle [:digit:] globbing tests better for python2.7 (Martin [gz])

5373. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-07

(jameinel) Fix file open flags for python2.7 (Martin [gz])

5374. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-07

(jameinel) Use a custom object for build details to save a decent amount of
 memory (John A Meinel)

5375. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-10

(spiv) Delete some unused private methods on InventoryEntry classes. (Andrew
 Bennetts)

5376. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-11

(jameinel) Decrease peak memory during 'bzr send',
 but releasing texts no longer needed. (John A Meinel)

5377. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-16

(spiv) Add hidden option 'bzr reconcile --canonicalize-chks' to repair repos
 affected by bug 522637. (Andrew Bennetts)

5378. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-17

(spiv) Fix typo in merge hook example. (Andrew Bennetts)

5379. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-17

(spiv) Merge lp:bzr/2.2 into lp:bzr, including fixes for #192859,
 #224373, #300062, #585667, #614404, #617503.

5380. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-18

(mbp) slightly better error handling in ftp transport (Martin Pool)

5381. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-19

(garyvdm) update-changelogs.sh now makes dch use the default location
 for debian/changelog.

5382. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-19

(garyvdm) Update ppa doc.

5383. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-20

(mbp) Start whatsnew for 2.3; update ppa developer docs (Martin Pool)

5384. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-20

(mbp) handle diff --using --diff-options

5385. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-20

(vila) `bzr remove` now just backs up changed files instead of
 annoying you (Marius Kruger)

5386. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-21

(parthm) EACCES error during clean-tree is now shown as a warning and bzr
 does not error out. (Parth Malwankar)

5387. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-21

(parthm) Remove 'encoding' option from NEWS modeline as its an error in Vim
 7.3+ (Parth Malwankar)

5388. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-24

(jam, trivial, bug #623208) Fix a broken link in the developer docs.

5389. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-24

(jelmer) Split generic interface code out of bzrlib.bzrdir.BzrDir into
 bzrlib.controldir.ControlDir. (Jelmer Vernooij)

5390. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-24

(jam) Use a custom C type for CHK index entries, saves memory

5391. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-27

(jameinel) Document moving packaging branches to the standand ~bzr/ubuntu/*
 layouts" (Max Bowsher)

5392. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-27

(jameinel) `decode` parameter to get() method in FtpTransport and
 GioTransport classes is deprecated. (Alexander Belchenko)

5393. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-27

(jameinel) use StaticTuple for dirstate and don't use sets in _id_index for
 improved memory use (John A Meinel)

5394. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-29

(gz) Adapt tuned_gzip to changes to gzip module crc handling in Python 2.7
 (Martin [gz])

5395. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-30

(vila) Config files in bazaar home now use a lock (Vincent Ladeuil)

5396. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-30

(vila) Fix most of the leaking tests (Vincent Ladeuil)

5397. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-30

(parthm) bzr homepage url fixed in docs. (Parth Malwankar)

5398. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-30

(vila, jam) Get PQM running correctly again (bug #626667),
 skip test_bzr_connect_to_bzr_ssh (bug #626876)

5399. By Canonical.com Patch Queue Manager <email address hidden> on 2010-08-31

(vila) Cleanup warnings.filters after running selftest (Vincent
 Ladeuil)

5400. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-01

(vila) Catch EPIPE when shutting down test servers. (Vincent Ladeuil)

5401. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-01

(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

5402. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-01

(mbp) disable strace tests broken under maverick (Martin Pool)

5403. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-01

(jelmer) Add development8-subtree development format which combines nested
 tree support and CHK repositories. (Jelmer Vernooij)

5404. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-01

(vila) Cleanups in bzrlib.transform.py (Vincent Ladeuil)

5405. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-02

(jameinel) Fix bug #626876 by properly waiting for the paramiko.Transport
 thread to finish its work. (John A Meinel)

5406. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-02

(jameinel) Check os.name for 'posix' to enable os.kill,
 since kill exists on win32 in python2.7 (Martin [gz])

5407. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-03

(jameinel) Remove monkey patching for elementtree,
 we do it differently anyway (Martin [gz])

5408. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-03

(jameinel) Use StringIO rather than real files on disk for log files in
 tests. (Andrew Bennetts)

5409. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-03

(jameinel) Restore TestSuite and TestLoader as attributes of bzrlib.tests
 (John A Meinel)

5410. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-06

(vila) Cleanup imports in bt.per_wt.test_pull (most of them were useless).
 (Vincent Ladeuil)

5411. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-08

(mbp) support for pre_status and post_status hooks. (Parth Malwankar)

5412. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-08

(mbp) Add check in lazy import ScopeReplacer to ensure it's not trying to
 replace itself (Martin [gz])

5413. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-08

(gz) Permit non-integer bug ids for generic bug trackers (Alexandre Garnier)

5414. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-09

(jelmer) Add ControlDirFormat.supports_workingtrees cvar. (Jelmer Vernooij)

5415. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-09

(mbp) Deprecate casting PushResult and PullResult to int to get the relative
 revno change (Martin Pool)

5416. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-09

(mbp) ignore __pycache__ by default (Andrea Corbellini)

5417. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-10

(mbp) split out ui-factory docs (Martin Pool)

5418. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-10

(jelmer) More work allowing the per_controldir tests to run against foreign
 formats. (Jelmer Vernooij)

5419. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-13

(spiv) Merge lp:bzr/2.2, including fixes for #619872, #631350,
 #633745.

5420. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-13

(mbp) various developer document improvements (Martin Pool)

5421. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-13

(gz) Cleanup and test selftest thread leak detection (Martin [gz])

5422. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-13

(mbp) improve scriptrunner handling of blanks, newlines,
 and lines without newlines (Martin Pool)

5423. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-14

(mbp) split out ProgressRecordingUIFactory (Martin Pool)

5424. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-14

(jelmer) Allow control directories to not support create_workingtree(),
 even if they are local. (Jelmer Vernooij)

5425. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-14

(gz) Warn if platform doesn't support selftest --parallel=fork (Martin [gz])

5426. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-15

(mbp) add structured confirmations to the ui_factory (Martin Pool)

5427. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-15

(jameinel) Fix bug #638034,
 Inventory.entries() should handle the empty inventory. (Daniel Knittl-Frank)

5428. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-16

(spiv) Fix random test_bad_connection_ssh failures (Vincent Ladeuil)

5429. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-16

(spiv) Remove some cruft apparently leftover from previous refactorings of
 InterDifferingSerializer. (Andrew Bennetts)

5430. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-16

(spiv) Remove some code in bzrlib/tests/__init__.py that is no longer used.
 (Andrew Bennetts)

5431. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-17

(spiv) Merge lp:bzr/2.2, including fixes for #625574, #636930,
 #254278.

5432. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-17

(gz) Display the correct test count at the start when selftest is run in
 verbose mode (Martin [gz])

5433. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-20

(spiv) Suppress "maximum recursion depth exceeded in __subclasscheck__"
 warnings during selftest. (Andrew Bennetts)

5434. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-20

(spiv) Improve help for 'bzr update', fix typo in help for 'bzr join',
 add docstrings in lsprof.py. (John C Barstow) (Andrew Bennetts)

5435. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-20

(vila) Re-open bzr.dev for dev as 2.3.0dev2 (Vincent Ladeuil)

5436. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-20

(vila) Tweak tools/check-newsbug.py and do some light editing in
 doc/developers/ppa.txt. (Vincent Ladeuil)

5437. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-21

(spiv) Add a brief explanation/reminder to do SRUs after we do a
 stable-series release. (Martin Pool)

5438. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-21

(spiv) Simplify connect_ssh/sftp error handling (Andrew Bennetts)

5439. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-21

(spiv) Fix traceback with python 2.7's xmlrpclib. (Toshio Kuratomi)

5440. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-23

(spiv) Merge lp:bzr/2.2. (Andrew Bennetts)

5441. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-24

(spiv) Change links to user-reference/bzr_man.html to corresponding pages
 everywhere in the User Guide (Alexander Belchenko)

5442. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-24

(spiv) Mention applyDeprecated in the Testing Guide. (#602996) (John C
 Barstow)

5443. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-24

(spiv) Add 'mainline' and 'annotate' revision specs. (Aaron Bentley) (Andrew
 Bennetts)

5444. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-24

(parthm) 'bzr status' now displays shelve summary (#403687). (Parth
 Malwankar)

5445. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-26

(jameinel) Remove 'log' information from "successful" tests (John A Meinel)

5446. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-26

(vila) SRU bug nomination clarifications (Vincent Ladeuil)

5447. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-26

(jameinel) Update bug url for squid (Martin Pool)

5448. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-27

(vila) Merge lp:bzr/2.2 into trunk including fixes for #644855,
 #646133, #632387 (Vincent Ladeuil)

5449. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-29

(vila) Use TestCaseInTempDir for TestGlobalConfig tests requiring disk
 resources (Vincent Ladeuil)

5450. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-29

(gz) Correct some use of "it's" and "its" in bzrlib (Martin [gz])

5451. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-29

(jam) Reduce the peak memory in GroupCompressBlock

5452. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-29

(mbp) Add 'break-lock --force'

5453. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-01

(gz) Allow arbitrary bytes for unshelve diffs rather than throwing
 UnicodeDecodeError on non-ascii contents (Andrej A Antonov)

5454. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-01

(gz) Allow arbitrary bytes from version-info rather than throwing
 UnicodeDecodeError on a non-utf-8 terminal (Andrej A Antonov)

5455. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-01

(gz) Enable use of 3-way conflict markers in pull and update by adding
 --show-base option (Rory Yorke)

5456. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-01

(jameinel) Fix the documentation mention of "lp-propose-merge" (John C
 Barstow)

5457. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-01

(jameinel) Rewrap the environment variables documentation to be <80 chars.
 (John C Barstow)

5458. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-01

(jameinel) fixed link to main smart server doc from http smart server doc
 (dmuir)

5459. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-01

(jameinel) Update documentation to make it clearer that we support HTTPS.
 (#596239) (John C Barstow)

5460. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-05

(gz) Fix typo in test for bug 187207 (Martin [gz])

5461. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-05

(gz) Fix signature of RemoteBzrDir.create_workingtree (Neil
 Martinsen-Burrell) (Martin Pool)

5462. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-05

(gz) Add support for GNU lsh as a secure shell client (Matthew Gordon)

5463. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-07

(mbp) trivial bug number correction in news (Martin Pool)

5464. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-07

(mbp) Change bzr tags to use a natural sort order by default (Neil
 Martinsen-Burrell)

5465. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-07

(vila) add 'bzr rm --no-backup' and deprecate the --force opting to be
 consitent with revert (Marius Kruger)

5466. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-07

(vila) Provide more detailed help on the Launchpad plugin (Neil
 Martinsen-Burrell)

5467. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-07

(vila) Use testtools timing mechanisms. (Martin [gz])

5468. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-07

(vila) Don't force openssh to use protocol=2 (Neil Martinsen-Burrell)

5469. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-07

(vila) Bump API version to 2.3.0 (Vincent Ladeuil)

5470. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-08

(spiv) Fix BZR_TEST_PDB. (#504070) (Martin [gz])

5471. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-08

(spiv) Move NEWS items that belong under 2.3b2 from under 2.3b1. (Andrew
 Bennetts)

5472. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-08

(spiv) Give slightly more informative errors when a bad object or str is
 passed to _chk_map_pyx._bytes_to_text_key. (Andrew Bennetts)

5473. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-08

(mbp) reset global verbosity after each command and test (Martin Pool)

5474. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-08

(vila) Merge 2.2 into trunk including fixes for bug #651706 and bug
 #646133 (Vincent Ladeuil)

5475. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-08

(vila) Open trunk again as 2.3dev3(Vincent Ladeuil)

5476. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-09

(mbp) empty output in shell-like tests is no longer a wildcard (Martin Pool)

5477. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-10

(vila) Fix NEWS entry

5478. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-11

(mbp) show http error body text with pycurl (Martin Pool)

5479. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-11

(vila) Fix the documentation on using the smart server with Apache
 (Neil Martinsen-Burrell)

5480. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-11

(vila) Make it clearer that 'bzr st' can be used to determine which files
 changed in a particular revision (John C Barstow)

5481. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-11

(vila) Add a ``default_format`` configuration option (Neil
 Martinsen-Burrell)

5482. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-11

(vila) Make "bzr tag --quiet" really quiet (Neil Martinsen-Burrell)

5483. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-11

(mbp) cleanup test_http to use scenarios;
 add load_tests_from_scenarios (Martin Pool)

5484. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-12

(mbp) add -Dmem_dump (Martin Pool)

5485. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-12

(vila) Fix PATH in start_bzr.bat (Matthäus G. Chajdas)

5486. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-12

(vila) Add ubuntu: and debianlp: shortcuts (Vincent Ladeuil)

5487. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-12

(mbp) avoid "KeyError: port" in urllib authentication callback (Martin Pool)

5488. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-12

(vila) Add a --no-tree option for init and push (Matthew Gordon)

5489. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-12

(gz) Fix failing bb.test_filesystem_cicp tests (Martin [gz])

5490. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-13

(mbp) clean up news sections (Martin Pool)

5491. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-13

(vila) Tweak the release process based on ML discussion (Vincent Ladeuil)

5492. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-13

(vila) Find when a bug was fixed in NEWS from its number or a regexp
 matching a news entry (Vincent Ladeuil)

5493. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-13

(gz) Fix ensure_config_dir_exists logic when parent dir exists (Martin [gz])

5494. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-14

(gz) Fix bzrlib._format_version_tuple doctest (Martin [gz])

5495. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-14

(mbp) document standards for updating news, whatsnew, etc (Martin Pool)

5496. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-15

(mbp) Remove installation of apport configuration from setup.py (Max Bowsher)

5497. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-15

(spiv) Remove ForwardingResult,
 which has been obsoleted by testtools. (Andrew Bennetts)

5498. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-15

(spiv) Split NEWS into per-series release notes,
 now found in doc/en/release-notes (Andrew Bennetts)

5499. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-15

(vila) Add ``bzr config` command. (Vincent Ladeuil)

5500. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-15

(vila) Add bzrlib/pyutils.py,
 and replace uses of __import__ with calls to pyutils.get_named_object
 (Andrew Bennetts)

5501. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-15

(vila) Add a new hidden ``test-script`` command (Vincent Ladeuil)

5502. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-15

(vila) Unbreak pqm by commenting out the bogus use of doctest +SKIP
 not supported by python2.4 (Vincent Ladeuil)

5503. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-15

(vila) remove troublesome pointless news entry (Martin Pool)

5504. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-15

(vila) Provides a ``bzr.transform.orphan_policy`` option to control
 orphan handling when merging directory deletion (Vincent Ladeuil)

5505. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-18

(vila) document the comment character in ignore files (Neil
 Martinsen-Burrell)

5506. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-18

(vila) Document hunk editing when shelving.(Neil Martinsen-Burrell)

5507. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-18

(vila) Document revision ranges for diff. (Neil Martinsen-Burrell)

5508. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-18

(vila) Add a temporary indirection on get_transport to fix the remaining
 test leaks. (Martin [gz])

5509. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-19

(vila) Don't require 'get_shelf_manager' to exist on Tree objects inside the
 status code. (John A Meinel)

5510. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-19

(gz) Check committer values are ascii or unicode and fix a test where it was
 not (Martin [gz])

5511. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-21

(vila) Fix spurious test failures related to the http pipe cleanup. (Vincent
 Ladeuil)

5512. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-22

(mbp) Use only latin alphabet names in release notes (Martin Pool)

5513. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-22

(gz) Fix test-script making bzr help depend on testtools (Martin von Gagern)

5514. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-22

(gz) Disallow urls like 'file:///C:' rather than raising IndexError (Jared
 Bunting)

5515. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-26

(vila) Correctly set the Content-Type header when POSTing http requests.
 (Vincent Ladeuil)

5516. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-26

(vila) Correctly set the Content-Type header when POSTing http
 requests (Vincent Ladeuil)

5517. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-26

(vila) TestCaseWithWorkingTree.make_branch_builder respects its 'relpath'
 parameter (Vincent Ladeuil)

5518. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-28

(gz) Throw valid SyntaxError from shell-like tests when a command is not
 found (Martin [gz])

5519. By Canonical.com Patch Queue Manager <email address hidden> on 2010-10-29

(mbp) status shows missing newly-added files (Rory Yorke)

5520. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-02

(gz) Add tests for bug 205636 and fix closely related bug 251864 (Martin
 [gz])

5521. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-02

(gz) Use ConfigObj encoding parameter rather than indirecting through
 options dict (Max Bowsher)

5522. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-04

(jameinel) Run setup.py with --root rather than with --prefix. (Jelmer
 Vernooij)

5523. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-05

(vila) Respect --directory when path parameters are also used for shelve and
 restore (Vincent Ladeuil)

5524. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-05

(vila) Merge 2.2 into trunk resolving conflicts and including fix for
 bug #632465 (Vincent Ladeuil)

5525. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-05

(vila) Release 2.3.b3 (Vincent Ladeuil)

5526. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-05

(vila) Open trunk again as 2.3dev4 (Vincent Ladeuil)

5527. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-05

(jam) Catch UnicodeError for optparse parsing (ryorke)

5528. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-06

(vila) Move NEWS entry into the correct section (Vincent Ladeuil)

5529. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-06

(vila) Catch UnicodeError for optparse parsing (Rory Yorke)

5530. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-06

(vila) Display only the active value when a single option is provided to
 ``bzr config``. (Vincent Ladeuil)

5531. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-07

(vila) Merge 2.2 into trunk including fix for bug #646961 (Vincent
 Ladeuil)

5532. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-08

(vila) Add an option to accept any output from commands in shell-like tests.
 (Vincent Ladeuil)

5533. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-08

(vila) Fix news entry

5534. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-09

(vila) Friendlier message while setting ownership of the ``.bazaar``
 directory (Parth Malwankar)

5535. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-09

(GaryvdM) Exclude SHFOLDER.dll from py2exe builds,
 as it breaks subvertpy.

5536. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-10

(spiv) Merge lp:bzr/2.2, including fix towards #603395. (Andrew Bennetts)

5537. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-11

(vila) More feedback about the conflicts just resolved and the remaining
 ones. (Vincent Ladeuil)

5538. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-12

(spiv) Cache a branch's tags during a read-lock. (Andrew Bennetts)

5539. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-12

(gz) Documentation fixes for its uses of "its" when it's meaning "it's"
 (Zearin)

5540. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-16

(spiv) Remove broken, unused elif branch,
 and remove some unused imports. (Andrew Bennetts)

5541. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-18

(vila) Create commit message files in TMPDIR instead of the current dir
 (Vincent Ladeuil)

5542. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-18

(vila) Takes config policies into account and display the section names when
 needed. (Vincent Ladeuil)

5543. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-18

Make merge correctly locate a lca where there is a criss-cross merge
 of a new root.

5544. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-18

(vila) ``bzr config`` properly displays list values (Vincent Ladeuil)

5545. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-19

(vila) Fix spurious orphan reports (Vincent Ladeuil)

5546. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-22

(spiv) Tags.merge_to now updates the master branch as well,
 if any. (#603395) (Andrew Bennetts)

5547. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-22

(spiv) Remove RepositoryFormatCHK1 and RepositoryFormatCHK2. (Andrew
 Bennetts)

5548. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-22

(spiv) Move InterKnitRepo and InterWeaveRepo out of bzrlib/repository.py
 (Jelmer Vernooij)

5549. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-23

Add lp-find-proposal command.

5550. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-24

(gz) Change minimum required testtools version for selftest to 0.9.5 for
 unicode fixes (Martin [gz])

5551. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-24

(gz) Backslash escape selftest output when printing to non-unicode consoles
 (Martin [gz])

5552. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-26

(vila) Merge 2.2 into trunk (Vincent Ladeuil)

5553. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-29

(spiv) Support configuration files located in $XDG_CONFIG_HOME/bazaar (Neil
 Martinsen-Burrell) (Andrew Bennetts)

5554. By Canonical.com Patch Queue Manager <email address hidden> on 2010-11-30

(mbp) Clarify the description of merge's "--revision" option.
 Plus a drive-by fix. (Eric Siegerman)

5555. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-02

(vila) Merge 2.2 into trunk including fix for bug #583667 and bug
 #681885 (Vincent Ladeuil)

5556. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-02

(vila) Release 2.3b4 (Vincent Ladeuil)

5557. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-02

(vila) Open trunk again as 2.3dev5 (Vincent Ladeuil)

5558. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-03

(vila) Implement resolve --take-this and --take-other for text conflicts.
 (Vincent Ladeuil)

5559. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-03

(vila) Catch the fugitive TestDebuntuExpansions tests and bring them back in
 the isolation jail (Vincent Ladeuil)

5560. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-06

(vila) Mention some tricks about running check-dist-tarball (Vincent
 Ladeuil)

5561. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-07

(vila) Catch spurious and bogus ssl TypeError exceptions. (Vincent Ladeuil)

5562. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-08

(vila) Skip win32utils case insensitive globbing tests on OS X (Martin [gz])

5563. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-08

(vila) Skip test for bug 488519 on OS X (Martin [gz])

5564. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-10

(mbp) change ad-hoc test loading to load_tests_apply_scenarios (Martin Pool)

5565. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-10

(vila) Tweak 'revert' help. (Andrew Bennetts)

5566. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-12

(jelmer) Add GraphThunkIdsToKeys.add_node. (Jelmer Vernooij)

5567. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-14

(vila) Get rid of references to bazaar-vcs.org (Vincent Ladeuil)

5568. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-14

(vila) Check sphinx version for tests that need it. (Vincent Ladeuil)

5569. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-14

(spiv) Remove redundant parent inventories calculation during fetch. (Andrew
 Bennetts)

5570. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-15

(spiv) Avoid reopening (and relocking) the same branches/repositories in
 ControlDir.sprout. (Andrew Bennetts)

5571. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-16

(mbp) developer guidelines about exception classes (Martin Pool)

5572. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-16

(mbp) change acronyms to uppercase in docs (Martin Pool)

5573. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-16

(vila) Fix test isolation leaks destroying env variables. (Vincent Ladeuil)

5574. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-16

(gz) Merge 2.2 to bzr.dev to pick up fixes for lp:686611 and lp:687653
 (Martin [gz])

5575. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-20

(spiv) Tweak freshmeat announcement rules (Vincent Ladeuil)

5576. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-20

(vila) Smoother upgrades (Matthew Fuller)

5577. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-20

(spiv) testr: Add magic for listing tests. (Jelmer Vernooij)

5578. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-21

(vila) Provides a better isolation from os.environ for tests. (Vincent
 Ladeuil)

5579. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-21

(vila) test imports cleanup (Vincent Ladeuil)

5580. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-24

(vila) Merge 2.2 into trunk including fix for bug #693880 (Vincent
 Ladeuil)

5581. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-27

(jelmer) Convert the doctest on bzrlib.timestamp.unpack_highres_date to a
 unit test. (Jelmer Vernooij)

5582. By Canonical.com Patch Queue Manager <email address hidden> on 2010-12-27

(jelmer) Only track threads on bzrlib testcases. (Martin [gz])

5583. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-10

(vila) Isolate doctests from os.environ (Vincent Ladeuil)

5584. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(vila) Get rid of TestCase._old_env and _captureVar (Vincent Ladeuil)

5585. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(vila) Fix lp plugin test failures related to xmlrpc changes in
 python-2.7 (Vincent Ladeuil)

5586. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(jelmer) Support adding new sort mechanisms to 'bzr tags'. (Jelmer Vernooij)

5587. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(jelmer) Refer to ppa:bzr/daily rather than no longer updated
 ppa:bzr-nightly-ppa/ppa in the documentation. (Jelmer Vernooij)

5588. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(jelmer) Remove some unused imports in the test code. (Jelmer Vernooij)

5589. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(vila) Document the packaging helper scripts. (Max Bowsher)

5590. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(vila) Tweak ppa descriptions. (Max Bowsher)

5591. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(vila) Remove backwards compatibility delegates deprecated since bzr 0.15.
 (Jelmer Vernooij)

5592. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(vila) Fix bug #701212,
 don't set the tag dict of the master branch you are updating from. (John A
 Meinel)

5593. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(vila) Add icons for tbzrcommand (iwata)

5594. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(spiv) Fix -Drelock warnings in cmd_modified. (Andrew Bennetts)

5595. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-11

(vila) Fix socketpair-based SSH transport leaking socket into other
 child processes (Max Bowsher)

5596. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-12

(jameinel) Stop using bzrlib.tuned_gzip.GzipFile. (John A Meinel)

5597. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-12

(jelmer) Remove some hardcoded dependencies on weave-era formats in bzrlib
 and clean up more imports. (Jelmer Vernooij)

5598. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-12

(vila) Accept 0 to mean no limit for BZR_COLUMNS (Neil
 Martinsen-Burrell)

5599. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-12

(jameinel) Allow commits to stacked branches (John A Meinel)

5600. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-12

(vila) Fix PEP-8 violation in PythonVersionInfoBuilder's output (Soren
 Hansen)

5601. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-12

(jameinel) Decode config_dir() environment variables on Windows using 'mbcs'
 (John A Meinel)

5602. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-12

(jameinel) Bug #389674,
 avoid using Tree.inventory during merge (dealing with unversioned parent
 dirs), since PreviewTree doesn't implement it. (John A Meinel)

5603. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-12

(vila) Avoid PermissionDenied errors on Windows when breaking corrupted
 locks. (John A Meinel)

5604. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-12

(jameinel) Use Transport.get_bytes() instead of Transport.get().read() in
 the test suite. (John A Meinel)

5605. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-12

(jameinel) Bug #581311,
 treat WSAECONNABORTED as ConnectionReset. (John A Meinel)

5606. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-13

(jameinel) Transform.rename test shouldn't assume the str form of the
 exception because of locale issues. (Martin [gz])

5607. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-13

(jelmer) More lazy loading of bzrlib.ui and bzrlib.urlutils. (Jelmer
 Vernooij)

5608. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-13

(jelmer) Avoid hardcoded list of repository formats that do not support
 funky characters in filenames. (Jelmer Vernooij)

5609. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-13

(jelmer) Remove more unused imports and more use of specific formats in
 tests. (Jelmer Vernooij)

5610. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-14

(vila) Open trunk as 2.4dev1,
 bumping api_minimum_version to 2.4.0 (Vincent Ladeuil)

5611. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-14

(vila) RepositoryFormat7 does not support funky characters (Jelmer Vernooij)

5612. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-14

(jelmer) Add a developer doc on the topic of fetch. (Andrew Bennetts)

5613. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-14

(jelmer) Cope with IPv6 addresses in ``bzr serve`` (Jelmer Vernooij)

5614. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-15

(jelmer) Fix 'bzr push --overwrite -rREV' for old mainline revisions.
 (Jelmer Vernooij)

5615. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-15

(vila) Merge 2.3 into trunk including fix for bug #660935 (Vincent
 Ladeuil)

5616. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-17

(jelmer) Lazy load a couple of modules in
 bzrlib.plugins.launchpad.lp_propose. (Jelmer Vernooij)

5617. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-19

(jelmer) Add support for qastaging in the launchpad plugin. (Jelmer Vernooij)

5618. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-19

(jelmer) Support finding default target for packaging branches in
 lp-propose. (Jelmer Vernooij)

5619. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-19

(jelmer) Omit Proc Maps from the apport debug when bzr crashes. (Martin Pool)

5620. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-19

(jelmer) Print error when both --email and a new identity are specified to
 'bzr whoami'. (Jelmer Vernooij)

5621. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-19

(jelmer) Allow cat-revision to be used in a tree-less branch. (Jelmer
 Vernooij)

5622. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-19

(jelmer) Allow not specifying default reviewer to lp-propose. (Jelmer
 Vernooij)

5623. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-19

(jelmer) Fix a typo in specifying_revisions.txt. (Vladimir Bychkovsky)

5624. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-19

(jelmer) Support short option '-F' as alternative for 'bzr diff --format'.
 (Jelmer Vernooij)

5625. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-19

(jelmer) Various more fixes in preparation of moving the weave formats into
 a plugin. (Jelmer Vernooij)

5626. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-19

(jelmer) Remove references to Weave from VersionedFileStore. (Jelmer
 Vernooij)

5627. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-21

(jelmer) Exit with 1 if there were tag conflicts during 'bzr pull'. (Jelmer
 Vernooij)

5628. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-21

(vila) Merge 2.3 into trunk including bugfix for #701940 (Vincent
 Ladeuil)

5629. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-21

(jelmer) Fix test_locale test on systems where the default locale is not C.
 (Jelmer Vernooij)

5630. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-21

(mbp) Don't show messages about plugins incompatible with bzr (Martin Pool)

5631. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-25

(vila) Restore compatibility with older launchpadlib. (Vincent Ladeuil)

5632. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-25

(vila) Added external merge tool management module,
 bzrlib.mergetools. (Gordon Tyler)

5633. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-25

(jameinel) Fix case-sensitive test failures on Windows. (John A Meinel)

5634. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-26

(gz) Don't cast paths to str in workingtree move error conditions (Martin
 [gz])

5635. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-27

(vila) Merge 2.3 into trunk (Vincent Ladeuil)

5636. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-27

(jameinel) Add 'bzr reset-workingtree' as a way to fix a corrupted dirstate
 file. (John A Meinel)

5637. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-28

(vila) Fix lp-propose for regular branches. (Vincent Ladeuil)

5638. By Canonical.com Patch Queue Manager <email address hidden> on 2011-01-28

(vila) Mark test failures on windows as KnownFailures pending investigation.
 (Vincent Ladeuil)

5639. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-01

(vila) Update ppa related documentation. (Max Bowsher)

5640. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-03

(spiv) Add PreviewTree testing docs. (Andrew Bennetts)

5641. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-03

(spiv) Link to What's New in 2.4 (rather than 2.3) in doc index,
 and add missing comma in doc. (Andrew Bennetts)

5642. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-03

(vila) Merge 2.3 into trunk including fix for lp:707075. (Max Bowsher)

5643. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-04

(mbp) more correct parsing of the NO_PROXY list (Martin Pool)

5644. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-04

(jelmer) Remove obsolete scripts from contrib/ (Jelmer Vernooij)

5645. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-04

(jelmer) Allow the registration of "extra" branch formats in the branch
 format registry. (Jelmer Vernooij)

5646. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-04

(jelmer) Remove obsolete scripts from tools/ (Jelmer Vernooij)

5647. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-07

(spiv) Expand doc/developers/overview.txt a little,
 and fix some formatting nits. (Andrew Bennetts)

5648. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-07

(spiv) Fetch tagged revisions (not just tags) during branch,
 merge and pull. (Andrew Bennetts)

5649. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-07

(spiv) Add docstrings to AbstractSearch and AbstractSearchResult. (Andrew
 Bennetts)

5650. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-07

(vila) msgeditor use cmdline.split (Martin Pool)

5651. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-07

(jelmer) Allow registering "extra" working tree formats that can not be used
 in meta dirs. (Jelmer Vernooij)

5652. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-08

(vila) Merge 2.3 into trunk including fixes for bug #715058 and bug
 #713258 (Vincent Ladeuil)

5653. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-09

(vila) Annotate deleted files if they can be found in the specified
 revision. (Andrew King)

5654. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-09

(vila) News entry for bug #537442 (Andrew King)

5655. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-09

(vila) Moves CatchingExceptionThread out of the bzrlib.tests hierarchy.
 (Vincent Ladeuil)

5656. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-09

(vila) Fix a traceback attempting to "bzr dump-btree --raw" a btree file
 that's well formed, but has no data rows. (Eric Siegerman)

5657. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-09

(vila) Merge 2.3 into trunk including fix for bug #715000 (Vincent
 Ladeuil)

5658. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-10

(jelmer) Allow registration of extra repository formats. (Jelmer Vernooij)

5659. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-11

(jelmer) Fix ``bzr lp-mirror`` to work on command line branch URLs and
 branches without an explicit public location. (Max Bowsher)

5660. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-11

(vila) Copy tagged revisions as part of 'bzr reconfigure --unstacked'
 (#401646) (Andrew Bennetts)

5661. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-11

(vila) Use cethread to avoid ambiguity with python module. (Vincent Ladeuil)

5662. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-12

(jelmer) Add a WorkingTreeFormat.missing_parent_conflicts flag. (Jelmer
 Vernooij)

5663. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-14

(mbp) rename _fallback_vfs to _immediate_fallback_vfs to make the meaning
 more clear (Martin Pool)

5664. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-14

(spiv) Preserve identity of default values in the pretty decorators.
 (#718569) (Andrew Bennetts)

5665. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-16

(jelmer) Document no_tree argument to ControlDir.clone_on_transport. (Jelmer
 Vernooij)

5666. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-16

(jelmer) Set proper permissions on directories in zip files. (Jelmer
 Vernooij)

5667. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-18

(jelmer) Clarify that --detritus also cleans up revert backups. (Jelmer
 Vernooij)

5668. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-18

(jelmer) Add some methods to allow lazy loading of hook callbacks. (Jelmer
 Vernooij)

5669. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-18

(jelmer) Allow installing hooks without importing the hook point. (Jelmer
 Vernooij)

5670. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-19

(jelmer) Remove dependencies on weave formats in bzrlib.tests.test_bzrdir.
 (Jelmer Vernooij)

5671. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-19

(jelmer) Remove use of WorkingTreeFormat2 in test_selftest. (Jelmer Vernooij)

5672. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-20

(jelmer) Remove any methods/arguments that were deprecated before 2.0.
 (Jelmer Vernooij)

5673. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-21

(jelmer) Use lazy imports in bzrlib.merge_directive. (Jelmer Vernooij)

5674. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-21

(jelmer) Remove unused serializer class,
 rearrange inheritance ordering of xml serializers to be more efficient.
 (Jelmer Vernooij)

5675. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-21

(jelmer) Move Repository._find_text_key_references_from_xml_inventory_lines
 onto the serializer. (Jelmer Vernooij)

5676. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-22

(vila) Merge 2.3 into trunk including fix for bug #710410 (Alexander
 Belchenko)

5677. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-22

(jelmer) Add BranchFormat.supports_leaving_lock and
 RepositoryFormat.supports_leaving_lock flags. (Jelmer Vernooij)

5678. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-23

(jelmer) Remove some dependencies on weave formats in
 bt.per_controldir.test_controldir. (Jelmer Vernooij)

5679. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-23

(jelmer) Remove dependencies on weave repository formats from
 bt.test_repository. (Jelmer Vernooij)

5680. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-23

(jelmer) Add a BranchFormatRegistry. (Jelmer Vernooij)

5681. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-23

(jelmer) Add BzrDirFormat.fixed_components. (Jelmer Vernooij)

5682. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-23

(jelmer) Add WorkingTreeFormatRegistry. (Jelmer Vernooij)

5683. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-23

(jelmer) Use multiprocessing.cpu_count() to retrieve the number of CPUs on
 Python >= 2.6. (Jelmer Vernooij)

5684. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-24

(vila) Add the opt-in ability to expand options in config files (Vincent
 Ladeuil)

5685. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-24

(jelmer) Add stub WorkingTreeFormat.initialize(). (Jelmer Vernooij)

5686. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-25

(jelmer) Factor out common code from BranchFormatRegistry,
 RepositoryFormatRegistry and WorkingTreeFormatRegistry into
 ControlComponentFormatRegistry. (Jelmer Vernooij)

5687. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-25

(jelmer) Allow the lazy registration of DWIM revspecs. (Jelmer Vernooij)

5688. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-25

(jelmer) Allow repositories to provide extra combinations to run
 bzrlib.tests.per_interrepo with. (Jelmer Vernooij)

5689. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-25

(jelmer) Add ControlDir.create_repository() stub. (Jelmer Vernooij)

5690. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-26

(jelmer) Enable the FreeBSD hacks in test_permissions for Debian
 GNU/kFreeBSD based systems. (Jelmer Vernooij)

5691. By Canonical.com Patch Queue Manager <email address hidden> on 2011-02-28

(gz) Fix test failure on alpha by correcting format string for
 gc_chk_sha1_record (Martin [gz])

5692. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-02

(jelmer) Support branches with ghosts in their mainline and tags on
 revisions not in the branch ancestry in "bzr tags". (Jelmer Vernooij)

5693. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-03

(jelmer) Add RepositoryFormat.is_deprecated(). (Jelmer Vernooij)

5694. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-03

(spiv) Give clearer errors when remote operation fails with MemoryError or
 other unexpected exception (Martin [gz])

5695. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-03

(spiv) Add Branch.heads_to_fetch API and HPSS request. (Andrew Bennetts)

5696. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-03

(spiv) Merge lp:bzr/2.3 into lp:bzr,
 including fix for #726584. (Andrew Bennetts)

5697. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-03

(jelmer) Move Converter from bzrlib.bzrdir to bzrlib.controldir. (Jelmer
 Vernooij)

5698. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-03

(jelmer) Move WorkingTreeFormat2 into a separate file. (Jelmer Vernooij)

5699. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-04

Add bzrlib.workingtree_2 to the list of forbidden modules for 'bzr
 st' in test_import_tariff.

5700. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-06

(jelmer) In bzrlib.tests.per_controldir allow new control directories to not
 derive from BzrDir but only from ControlDir. (Jelmer Vernooij)

5701. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-07

(jelmer) Move is_control_filename() from Tree to MutableTree. (Jelmer
 Vernooij)

5702. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-07

(jelmer) Require foreign branch formats to raise IncompatibleFormat when
 creating in meta dir. (Jelmer Vernooij)

5703. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-07

(jelmer) More lazy loading in bzrlib.revisionspec. (Jelmer Vernooij)

5704. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-07

(jelmer) Move weave-era branch formats to bzrlib.branch_weave.
 (Jelmer Vernooij)

5705. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-08

(jelmer) Move get_{workingtree, branch,
 repository}_transport methods from ControlDir to BzrDir. (Jelmer
 Vernooij)

5706. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-08

(vila) Correctly parse partial range specifiers in the HTTP test server.
 (Vincent Ladeuil)

5707. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-08

(jelmer) Avoid using weave formats in the blackbox upgrade tests. (Jelmer
 Vernooij)

5708. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-08

(jelmer) Avoid using BzrBranchFormat4 in meta directories. (Jelmer
 Vernooij)

5709. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-08

(jelmer) Move some tests that rely on the full VersionedFiles API to
 bzrlib.tests.per_repository_vf. (Jelmer Vernooij)

5710. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-09

(jelmer) Move VersionedFile-specific reconcile tests to
 bzrlib.tests.per_repository_vf. (Jelmer Vernooij)

5711. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-09

(vila) Remove cruft relating to obsolete/unused transport URL schemes. (Max
 Bowsher)

5712. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-09

(vila) Tweak test_commit_builder.py for easier debugging. (Jelmer Vernooij)

5713. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-10

(vila) Tweak release instructions (Vincent Ladeuil)

5714. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-11

(vila) Merge 2.3 into trunk including fix for bug #437003 (Vincent
 Ladeuil)

5715. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-11

(vila) Activate the sphinx tests again. (Vincent Ladeuil)

5716. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-11

(jelmer) Add Prober.known_formats() in favour of
 BzrDirFormat.register_format() and ControlDirFormat.register_format().
 (Jelmer Vernooij)

5717. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-11

(jelmer) Move weave-era BzrDir formats into a separate module. (Jelmer
 Vernooij)

5718. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-12

(jelmer) Add Prober.known_formats() in favour of
 BzrDirFormat.register_format() and ControlDirFormat.register_format().
 (Jelmer Vernooij)

5719. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-14

(jelmer) Fix an import in bzrlib.export.tar_exporter. (Jelmer Vernooij)

5720. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-14

(jelmer) Fix various import issues,
 allow ControlDir.destroy_branch to raise UnsupportedOperation. (Jelmer
 Vernooij)

5721. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-14

(jelmer) Skip more tests for repositories that don't implement the full
 versionedfiles API. (Jelmer Vernooij)

5722. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-14

(jelmer) Allow CommitBuilder implementations to not provide a
 record_entry_contents implementation. (Jelmer Vernooij)

5723. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-14

(vila) Merge 2.3 into trunk including additional fix for #654733
 (Vincent Ladeuil)

5724. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-15

(jelmer) Fix some export bugs. (Jelmer Vernooij)

5725. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-15

(jam) 'bzr export' needs to be in binary encoding for exporting to
 '-'.

5726. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-16

(spiv) Add 'changelog_merge' plugin. (Andrew Bennetts)

5727. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-17

(vila) Release 2.4b1 (Vincent Ladeuil)

5728. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-17

(vila) Open trunk again as 2.4dev2 (Vincent Ladeuil)

5729. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-22

(jameinel) Fix tar exporters to always write to binary streams. (John A
 Meinel)

5730. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-22

(jameinel) Fix bug #737234. When running iter_entries_by_dir preload all the
 data if we are going to be looking at it all. (John A Meinel)

5731. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-22

(gz) Change diff-delta.c code so MemoryError can be raised from OOM rather
 than AssertionError (Martin [gz])

5732. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-23

(spiv) Merge lp:bzr/2.3,
 including fixes for #465517 and #733350. (Andrew Bennetts)

5733. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-23

(jelmer) test_log: Added test cases for the --show-ids switch on 'long' and
 'short' log formatters. (Matt Giuca)

5734. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-23

(jelmer) Fix bzrlib.tests.blackbox.test_info when used with --no-plugins.
 (Jelmer Vernooij)

5735. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-23

(jelmer) Add tests for using log on branches with ghosts in mainline.
 (Jelmer Vernooij)

5736. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-23

(jameinel) Fix bug #397739,
 resolve 'lp:foo' locally as long as we have a launchpad-login to use
 bzr+ssh. (John A Meinel)

5737. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-23

(jelmer) Add ControlDir.check_support_status() which can print upgrade
 recommendations and raise incompatible format errors. (Jelmer Vernooij)

5738. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-24

(jelmer) Move bzr-specific implementation of ControlDir.sprout to Bzrdir.
 (Jelmer Vernooij)

5739. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-24

(spiv) Add documentation for using a shared SSH account with bzr+ssh.
 (Russel Smith)

5740. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-24

(spiv) Correction: r5739 was contributed Russell Smith. Also add
 release note for the improved docs.

5741. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-24

(jam) Bug #741375,
 local lp: resolution should use absolute paths when ~user is
 supplied. Also, support qastaging/dev/etc.

5742. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-26

(jelmer) Move Branch.fetch implementation to InterBranch. (Jelmer Vernooij)

5743. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-28

(vila) Post 2.4b1 release trivial tweaks (Vincent Ladeuil)

5744. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-30

(jelmer) Reset lazy hooks between test runs. (Jelmer Vernooij)

5745. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-31

(mbp) remove dead code in lockdir and fetch tests (Martin Pool)

5746. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-31

(vila) Remove debug code (Vincent Ladeuil)

5747. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-31

(jelmer) Support installing lazy hooks for all existing hook points,
 deprecate Hooks.create_hook. (Jelmer Vernooij)

5748. By Canonical.com Patch Queue Manager <email address hidden> on 2011-03-31

(jelmer) Support installing lazy hooks for all existing hook points,
 deprecate Hooks.create_hook. (Jelmer Vernooij)

5749. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-01

(mbp) bzrlib.initialize() now actually initializes,
 as well as returning a context manager (Martin Pool)

5750. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-01

(jelmer) Remove bzrlib.foreign from test_import_tariff blacklist. (Jelmer
 Vernooij)

5751. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-02

(jelmer) Add Hooks.uninstall_named_hook(). (Jelmer Vernooij)

5752. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-02

(jelmer) Allow extra data to be returned by Repository.gather_stats().
 (Jelmer Vernooij)

5753. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-04

(jameinel) Remove now unused test code. (John A Meinel)

5754. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-05

(jelmer) Use public Repository.control_transport rather than
 Repository._transport where possible. (Jelmer Vernooij)

5755. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-05

(jam) Merge 2.3 into bzr.dev, resolving some conflicts

5756. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-05

(jelmer) Use lazy imports in bzrlib.ignores. (Jelmer Vernooij)

5757. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-05

(jelmer) Remove unused lazy imports, fix two scope bugs. (Jelmer Vernooij)

5758. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-05

(jameinel) Add osutils.lstat/fstat so that even on Windows lstat(fname) ==
 fstat(open(fname).fileno()) (John A Meinel)

5759. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-05

(jameinel) WT._observed_sha1() will update the sha1, packed_stat,
 and st_size fields. (John A Meinel)

5760. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-06

(mbp,
 for bialix) bzr.exe: add "site-packages" directory to sys.path to
 allow "installing" third-party libs required by some plugins

5761. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-06

(spiv) Fix accidental mutation of _DEFAULT_REQUEST_PARAMS in
 bzrlib.log._apply_log_request_defaults (Andrew Bennetts)

5762. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-06

(mbp) add 'make realclean' target (Jelmer Vernooij)

5763. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-06

(mbp) fix ReST syntax;
 stop recommending people use SFTP in the quick guide (Martin Pool)

5764. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-06

(jelmer) Update tests for no user identity being configured so they work
 when one can be inferred. (Martin Pool)

5765. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-07

(jelmer) Add a RepositoryFormat.supports_signatures flag. (Jelmer Vernooij)

5766. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-07

(jameinel) TreeTransform.create_file and new_file can be passed sha1,
 which will trigger a call to Tree._observed_sha1,
 caching the sha and stat information. (John A Meinel)

5767. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-08

(spiv) log no longer raises NoSuchRevision against revisions in the
 repository which are not in the current branch (#241998). Such revisions
 have no revno,
 so display the revision-id instead. It is now possible for a LogRevision to
 have a revno of None. (Matt Giuca) (Andrew Bennetts)

5768. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-08

(spiv) Update the PointlessCommit error message. [a=Federico Culloca] (John
 A Meinel)

5769. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-08

(spiv) Recommend SSH rather than SFTP in user documentation examples (Martin
 Pool)

5770. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-08

(spiv) Use lazy imports in bzrlib.tree. (Jelmer Vernooij)

5771. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-08

(jelmer) Move knitpack repository format classes to
 bzrlib.repofmt.knitpack_repo. (Jelmer Vernooij)

5772. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-08

(jelmer) Make GroupCHKStreamSource independent of KnitPackStreamSource.
 (Jelmer Vernooij)

5773. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-08

(jelmer) Move default ReconcilePacker from bzrlib.repofmt.pack_repo to
 bzrlib.repofmt.knitpack_repo. (Jelmer Vernooij)

5774. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-08

(jelmer) Move PackRepository.__init__ to KnitPackRepository.__init__ (Jelmer
 Vernooij)

5775. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-08

(jameinel) Change ``bzrlib.transform.build_tree`` to pass the sha1 of newly
 created files. This avoids re-hashing content on the next 'bzr st'. Saving
 ~30s on a gcc-sized tree. (John A Meinel)

5776. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-09

(jelmer) Move _DirectPackAccess to bzrlib.repofmt.pack_repo. (Jelmer
 Vernooij)

5777. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-09

(jelmer) Move revision_graph_can_have_wrong_parents from Repository to
 RepositoryFormat. (Jelmer Vernooij)

5778. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-11

(jelmer) Two trivial fixes for bzrlib.tree and bzrlib.workingtree. (Jelmer
 Vernooij)

5779. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-11

(jelmer) Skip tests for CommitBuilder.commit(exclude=...) for repositories
 that don't support it. (Jelmer Vernooij)

5780. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-11

(jelmer) Catch ImportWarning as well when checking for modules in features.
 (Jelmer Vernooij)

5781. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-11

(jelmer) Split inventory-specific functionality out of Tree into
 InventoryTree. (Jelmer Vernooij)

5782. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-11

(jelmer) Split inventory-specific bits out of MutableTree into
 MutableInventoryTree. (Jelmer Vernooij)

5783. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-11

(vila) Merge 2.3 to trunk (Vincent Ladeuil)

5784. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-12

(jameinel) Fix bug #758695,
 correctly order cfn and cfi in callgrind output. (John A Meinel)

5785. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-14

(jelmer) Clarify and split up LocationConfig._get_matching_sections.
 (Vincent Ladeuil)

5786. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-15

(jameinel) Make 'bzr merge' much faster by not walking unchanged entries.
 (John A Meinel)

5787. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-15

(jelmer) Split inventory-specific implementation out of MutableTree into
 MutableInventoryTree. (Jelmer Vernooij)

5788. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-15

(mbp) stop using failIf, failUnless, etc (Martin Pool)

5789. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-16

(mbp) rename and deprecate failUnlessExists and failIfExists (Martin Pool)

5790. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-16

(jelmer) Make PackRepository subclass MetaDirRepository rather than
 KnitRepository. (Jelmer Vernooij)

5791. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-16

(jelmer) Add --lossy option to 'bzr commit'.

5792. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-16

(Jelmer) Add support for bound branches for 'bzr commit --lossy'.

5793. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-17

(jelmer) Avoid using working tree inventories in "bzr info". Rather,
 use the standard tree API. (Jelmer Vernooij)

5794. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-18

(jelmer) The rules topic used an invalid eol value (dos) as an example,
 changed it to native. (Marius Kruger)

5795. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-18

(jelmer) Split InventoryRevisionTree out of RevisionTree. (Jelmer Vernooij)

5796. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-18

Use -Wignore::ImportWarning rather than catching it,
 to restore py2.4 compatibility

5797. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-18

(mbp) better message when argv can't be decoded in the application locale
 (Martin [gz])

5798. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-18

(mbp) Rewrite test_report_bug_legacy away from using doctest (see bug
 764188) (Martin Pool)

5799. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-18

(mbp) remove unnecessary TestShowDiffTreesHelper from tests (Martin Pool)

5800. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-19

(jelmer) Split KnitPackRepository-specific bits out of Packer class into
 KnitPacker. (Jelmer Vernooij)

5801. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-19

(jelmer) Move _KeyRefs from bzrlib.knit to bzrlib.versionedfile. (Jelmer
 Vernooij)

5802. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-19

(mbp) Deprecate 'bzr clone' and 'bzr get' (bug 506265) (Martin Pool)

5803. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-19

(jelmer) Add RevisionTree.get_file_revision,
 replacing an existing static method on Tree.
 This should also make it unnecessary to access the inventory in a couple
 more cases. (Jelmer Vernooij)

5804. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-19

(Jelmer) Make TestamentTree use a Tree rather than an Inventory.
 (Jelmer Vernooij)

5805. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-19

(jelmer) Raise InvalidRevisionId when None is specified to
 Branch.set_last_revision_info(). (Jelmer Vernooij)

5806. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-20

(jelmer) Split Inventory._get_mutable_inventory() out into
 mutable_inventory_from_tree. (Jelmer Vernooij)

5807. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-20

(jelmer) Move more tests that require the full versioned file API from
 bt.per_repository to bt.per_repository_vf. (Jelmer Vernooij)

5808. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-20

(Jelmer) Deprecate Branch.set_revision_history(). (Jelmer Vernooij)

5809. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-21

(jameinel) Fix bug #765881,
 we don't need to save the dirstate file for trivial changes. (John A Meinel)

5810. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-28

(jelmer) Make Branch.fetch() no longer take a fetch_spec (Jelmer Vernooij)

5811. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-28

(vila) Merge 2.3 into trunk resolving conflicts (Vincent Ladeuil)

5812. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-28

(vila) Release 2.4b2 (Vincent Ladeuil)

5813. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-28

(vila) Open trunk again as 2.4dev3 (Vincent Ladeuil)

5814. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-29

(jelmer) Allow realname to be empty in tests. (Jelmer Vernooij)

5815. By Canonical.com Patch Queue Manager <email address hidden> on 2011-04-29

(jameinel) Skip a test that called os.utime(dir) if the filesystem doesn't
 support it. (John A Meinel)

5816. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-02

(jelmer) Remove unused RepositoryFormat._get_versioned_file_store. (Jelmer
 Vernooij)

5817. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Add a tariff test for 'bzr serve --inet'. (Jelmer Vernooij)

5818. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Support lazily setting the default format for working trees.
 (Jelmer Vernooij)

5819. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Don't load working tree implementations during 'bzr serve'. (Jelmer
 Vernooij)

5820. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Small fixes to developer documentation. (Jonathan Riddell)

5821. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Skip tests that require an inventory when run against a WorkingTree
 that is not inventory based. (Jelmer Vernooij)

5822. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Avoid using inventories in some repository tests. (Jelmer Vernooij)

5823. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Move more tests that require the full versioned files API to
 bzrlib.tests.per_repository_vf. (Jelmer Vernooij)

5824. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Set LC_ALL and LANG in
 TestExceptionReporting.test_undecodable_argv. (Jelmer Vernooij)

5825. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Skip per_tree tests that are InventoryTree-specific if they're run
 against non-inventory trees. (Jelmer Vernooij)

5826. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Avoid directly accessing VersionedFiles.annotate();
 rather, access it through RevisionTree.annotate_iter(). (Jelmer Vernooij)

5827. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Bug #273160,
 tweaks to the Bazaar Quick Reference Card from Clemens Tolboom. (John A
 Meinel)

5828. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Make InterBranch.update_revisions private. (Jelmer Vernooij)

5829. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-05

(jelmer) Move more VersionedFiles-specific tests to bt.per_repository_vf.
 (Jelmer Vernooij)

5830. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-05

(jelmer) Split WorkingTree3 out into a separate file. (Jelmer Vernooij)

5831. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-05

(spiv) Slightly reduce memory use while fetching to/from 2a repositories.
 (Andrew Bennetts)

5832. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-05

(vila) Building blocks to implement a new config scheme (Section,
 Store, Stack) (Vincent Ladeuil)

5833. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-05

(mbp) add RuleSearcher.get_single_value() (Martin Pool)

5834. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-05

(vila) Enable exporting all Tree types. (Aaron Bentley)

5835. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-06

(vila) Set correct parent when using 'switch -b' with bound branches (Fix
 for Bug #513709). (Dr Al)

5836. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-06

(jameinel) Bug #380202,
 don't bother rewriting the dirstate if <10 items have changed. (John A
 Meinel)

5837. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-07

(gz) Bug #656170, be more aggressive about closing file handles (Martin [gz])

5838. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-08

(jelmer) Avoid Repository.texts.add_lines in the testsuite as it is not
 available for some repository implementations. (Jelmer Vernooij)

5839. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-09

(spiv) Make better use of smart server when a local repository is stacked on
 a remote repository. (Andrew Bennetts)

5840. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-09

(jelmer) Require the default for Inter.get to be explicitly registered.
 (Jelmer Vernooij)

5841. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-09

(vila) Use a proper version for the weave_format plugin (Vincent
 Ladeuil)

5842. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-09

(jelmer) Make default Branch implementation oriented to storing just tip
 rather than full history. (Jelmer Vernooij)

5843. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-09

(jelmer) Deprecate Tree.__iter__. (Jelmer Vernooij)

5844. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-09

(jelmer) Split VersionedFiles-specific bits out of bzrlib.repository into
 bzrlib.vf_repository. (Jelmer Vernooij)

5845. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-10

(jelmer) Remove bzrlib.deprecated_graph. (Jelmer Vernooij)

5846. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-10

(jameinel) Support RevTree.iter_changes(WT) when WT has a TreeReference (bug
 #764677) (John A Meinel)

5847. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-10

(jameinel) Make 'bzr revert' much faster in large trees,
 bug #759096 (John A Meinel)

5848. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-11

(jameinel) Make set_parent_trees() ~5% faster by improving the sort key
 function. (John A Meinel)

5849. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-11

(jameinel) Update WT.pull to use fast Repository iter_changes when
 .fast_deltas is true. (bug #780677) (John A Meinel)

5850. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-11

(jameinel) Default to using Cython for compiling code,
 rather than Pyrex. (John A Meinel)

5851. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-11

(jameinel) Finally break compatibility with python 2.4/5. bzr-2.4.0 will be
 officially only compatible with python2.6/7 (John A Meinel)

5852. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-12

(jelmer) Use osutils.sha_string / osutils.sha_strings in a couple more
 places. (Jelmer Vernooij)

5853. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-12

(jelmer) Move the tests for VersionedFileRepository._generate_text_key_index
 to bt.per_repository_vf. (Jelmer Vernooij)

5854. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-12

(vila) Fix Registry.register_lazy docstring (Vincent Ladeuil)

5855. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-12

(jelmer) Move VersionedFiles-specific write group tests out of
 bzrlib.tests.per_repository into bzrlib.tests.per_repository_vf. (Jelmer
 Vernooij)

5856. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-13

(spiv) Fix ValueError in changelog_merge plugin. (Andrew Bennetts)

5857. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-13

(jelmer) Remove use of inventory in a commit builder tests,
 remove broken and duplicate test_break_lock in per_foreign_vcs. (Jelmer
 Vernooij)

5858. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-13

(jelmer) Move Repository.find_text_key_references to
 VersionedFileRepository. (Jelmer Vernooij)

5859. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-13

(jelmer) Split versioned-file specific bits out Check into
 VersionedFileCheck. (Jelmer Vernooij)

5860. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-13

(jelmer) Add optional path argument to Tree.get_symlink_target(). (Jelmer
 Vernooij)

5861. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-13

(vila) Merge 2.3 into trunk resolving conflicts (Vincent Ladeuil)

5862. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-14

(jelmer) CommitBuilder.any_changes() no longer returns True for changes that
 only set the tree root. (Jelmer Vernooij)

5863. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-14

(jelmer) Add Repository.get_file_graph(). (Jelmer Vernooij)

5864. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(vila) Fix some ReST typos in the configuration help and restore the
 workaround for dotted format names breaking sphinx. (Vincent Ladeuil)

5865. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(spiv) Move duplicate definitions of {Knit,
 GroupCompress}VersionedFiles.get_known_graph_ancestry into
 VersionedFilesWithFallbacks. (Andrew Bennetts)

5866. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(mbp) _format_version_tuple handles more different input patterns (Martin
 Pool)

5867. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(jelmer) Move Tree._get_check_refs-dependent test from
 bzrlib.tests.per_repository to bzrlib.tests.per_repository_vf. (Jelmer
 Vernooij)

5868. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(jelmer) Avoid using O(history) Branch._lefthand_history call in default
 Branch implementation. (Jelmer Vernooij)

5869. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(mbp) add licence to documentation files (Jonathan Riddell)

5870. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(jameinel) Add bzr.groupcompress.max_bytes_to_index to limit peak memory
 when delta-compressing large files (bug #602614) (John A Meinel)

5871. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(gz) Make the plugins command work again on ckj terminals (Martin [gz])

5872. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(jelmer) Add tests for Repository.is_locked. (Jelmer Vernooij)

5873. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(vila) Extract messages for translation. (INADA Naoki)

5874. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-16

(vila) Add support for double width characters to textwrap. (INADA Naoki)

5875. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-17

(vila) Add an helper for per_workingtree scenarios that plugins can reuse
 (Vincent Ladeuil)

5876. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-17

(vila) ``bzr merge --no-remember location`` never sets ``submit_branch``
 (Vincent Ladeuil)

5877. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-17

(jelmer) Make lossy an argument to Branch.pull. (Jelmer Vernooij)

5878. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-17

(jelmer) Raise TestNotApplicable for tests that use
 WorkingTree.apply_inventory_delta against formats that don't support the
 full versionedfiles API. (Jelmer Vernooij)

5879. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-17

(jameinel) doc typo fix (Jonathan Riddell)

5880. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-17

(jameinel) Fix bug #781168,
 and allow WT.update_basis_by_delta to not require the delta makes the basis
 match the current state. (John A Meinel)

5881. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-17

(jelmer) Remove check for Repository.revisions attribute in per_foreign_vcs.
 (Jelmer Vernooij)

5882. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-17

(mbp) merge help: disclaimer about untracked cherry picks (bug 783992) (Matt
 Giuca)

5883. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-17

(jelmer) Remove the use of inventory in another CommitBuilder test. (Jelmer
 Vernooij)

5884. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(vila) Generalises the --no-remember support for send/pull/push (Vincent
 Ladeuil)

5885. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(vila) Merge 2.3 into trunk (Vincent Ladeuil)

5886. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(vila) stacks for bazaar, locations and branch (Vincent Ladeuil)

5887. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(jelmer) Move VersionedFiles-specific implementation from InterRepository to
 InterVersionedFileRepository. (Jelmer Vernooij)

5888. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(gz) Make test unexpected successes count as failures (Martin [gz])

5889. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(vila) Do not show exception to user on pointless commit error. (Jonathan
 Riddell)

5890. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(jameinel) Close file objects a bit earlier in _seek_and_read. Helps PyPy's
 lazy collector. (Martin [gz])

5891. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(mbp) add build_mo command to setup.py (INADA Naoki)

5892. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(mbp) better handling of subprocesses with non-ascii encodings and filenames
 (bug 523746) (INADA Naoki)

5893. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(mbp) be more careful about closing files in selftest,
 so that more of it passes on pypy (Wouter van Heyst)

5894. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-18

(mbp) large Japanese documentation update (INADA Naoki)

5895. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-19

(spiv) Update 'api-docs' make target to use pydoctor,
 and fix the formatting of many docstrings. (Andrew Bennetts)

5896. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-19

(spiv) Fix the formatting of more docstrings. (Andrew Bennetts)

5897. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-19

(jr) Add an error message when merging into empty branch (Jonathan Riddell)

5898. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-19

(spiv) Stop expecting subunit to get unexpected successes wrong if it has
 the recent fix. (Martin [gz])

5899. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-19

(mbp) In log output,
 allow the author field width to grow as the line gets longer. (Neil
 Martinsen-Burrell)

5900. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-19

(jameinel) (bug #780544) when updating the WT,
 allow it to be done with a fast delta,
 rather than setting the state from scratch. (John A Meinel)

5901. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-20

(jameinel) Bug #613247,
 clean up a bunch of test cases to avoid putting 'self' in the reference
 cycle. (John A Meinel)

5902. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-20

(jameinel) Cleanup the log infrastructure to reduce the chance of
 self-cycles. (John A Meinel)

5903. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-20

(jelmer) Add limit argument to Branch.fetch(). (Jelmer Vernooij)

5904. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-20

(jelmer) Only reset the ignores on the unlock of the last lock on a tree,
 not every unlock. (Jelmer Vernooij)

5905. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-20

(jelmer) Some minor interface definition fixes. (Jelmer Vernooij)

5906. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-20

(spiv) Merge lp:bzr/2.3,
 including improvements to stacking docs in the User Guide. (Andrew Bennetts)

5907. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-21

(gz) Fix unicode handling in bzrlib.conflicts ui code (Martin [gz])

5908. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-21

(jameinel) improved mini-tutorial (Martin Pool)

5909. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-22

(gz) Require UnicodeFilenameFeature for new tests in bb.test_conflicts
 (Martin [gz])

5910. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-24

(jr) "add missing docs bracket" (Jonathan Riddell)

5911. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-24

(jam) Merge bzr-2.3 into bzr.dev

5912. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-24

(jam) Tell bzr.dev that we really do want mgz's changes.

5913. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-25

(jameinel) Fix the failing 'worth_saving_limit' test for win32 (John A
 Meinel)

5914. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-25

(jameinel) Properly escape a newline character in the docs. (Jonathan
 Riddell)

5915. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-25

(jameinel) Fix spurious windows-specific test failure (Vincent Ladeuil)

5916. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-26

(mbp) remove test_breakin (Martin Pool)

5917. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-26

(jameinel) Delete local 'exc_info' variables when they go out of scope,
 to avoid cycles with the exception tracebacks. (John A Meinel)

5918. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-26

(spiv) Removed bzrlib.branch._run_with_write_locked_target. Use
 bzrlib.cleanup instead. (Andrew Bennetts)

5919. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-26

(vila) Release 2.4b3 (Vincent Ladeuil)

5920. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-26

(vila) Open trunk again as 2.4dev4 (Vincent Ladeuil)

5921. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-26

(vila) Don't swallow the original error when reporting an
 InvalidHttpResponse. (Vincent Ladeuil)

5922. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-26

(vila) Generates en.mo file. (INADA Naoki)

5923. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-27

(vila) Fix some imports and other pyflakes failures. (Martin Pool)

5924. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-27

(vila) Add an option to check-newsbug to get a quicker access to bugs that
 needs to be closed (Vincent Ladeuil)

5925. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-27

(vila) Require prompts to always be unicode (Jelmer Vernooij)

5926. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-27

(jr) Give an appropriate error when merging a non-existant file (Jonathan
 Riddell)

5927. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-27

(jr) New hook server_exception in bzrlib.smart.server to catch any exception
 caused while running bzr serve. (Jonathan Riddell,
 #274578) (Jonathan Riddell)

5928. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-27

(jameinel) Fix bug #787122,
 pass build_mo to all the builders. (John A Meinel)

5929. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-27

(vila) Thou should not fill stderr pipe while in a subprocess (Andrew
 Bennetts)

5930. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-27

(vila) Support multiple selftest --exclude options (Vincent Ladeuil)

5931. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-27

(vila) Skip tests broken by sphinx monkeypatching (Vincent Ladeuil)

5932. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-27

(vila) Introduce bzrlib.i18n (INADA Naoki)

5933. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-28

(mbp) test that socket.error doesn't give a traceback (Toon Nolten)

5934. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-28

(vila) Skip tests broken by sphinx monkeypatching (Vincent Ladeuil)

5935. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-28

sphinx-1.0.7 still has bug #785098 (Vincent Ladeuil)

5936. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-28

(vila) Fix spurious test failure on OSX for WorkingTreeFormat2 (Vincent
 Ladeuil)

5937. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-29

(vila) Preserve $HOME/.bzr.log from tests (Vincent Ladeuil)

5938. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-29

(vila) Fix a race condition in a smart server hook test (Vincent Ladeuil)

5939. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-30

(vila) Why tariff tests escape the isolation jail (Vincent Ladeuil)

5940. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-31

(Martin von Gagern) Use transport.move instead of transport.rename to
 allow overwriting pack files over sftp, (bug #421776)

5941. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-31

(vila) Implement config locking. (Vincent Ladeuil)

5942. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-31

(vila) Implement branch config locking. (Vincent Ladeuil)

5943. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-31

(vila) Support config remote branch config file. (Vincent Ladeuil)

5944. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-31

(vila) Implement config.Option and its associated registry. (Vincent Ladeuil)

5945. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-31

(vila) Migrate 'editor' to the new config scheme. (Vincent Ladeuil)

5946. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-01

(spiv) Include log details from start_bzr_subprocess in test failures.
 (Andrew Bennetts)

5947. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-01

(jameinel) Bug #767307,
 improve the merge --force documentation. (Neil Martinsen-Burrell)

5948. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-01

(gz) Handle bug #597686, if we open() try to delete the file,
 even if there was an error.

5949. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-01

(jameinel) Don't use real $HOME in test_import_tariffs (while still
 exercising plugins). (Andrew Bennetts)

5950. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-01

(jameinel) Improve import_tarriff isolation by leaving BZR_PLUGIN_PATH
 available. (Vincent Ladeuil)

5951. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-01

(jameinel) Forget weakref for branch <-> config (Vincent Ladeuil)

5952. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-01

(jelmer) (jelmer) Bug #146165,
 use apply_inventory_delta instead of _write_inventory for 'bzr add'" (Jelmer
 Vernooij)

5953. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-02

(jelmer) Allow for preceding lines when checking that we warn if argv is
 undecodable. (Jelmer Vernooij)

5954. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-02

(jr) Display error when zlib corruption occurs rather than a backtrace
 (Jonathan Riddell)

5955. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-06

(spiv) Fix edge cases in handling interrupts during _rename_in_limbo.
 (Andrew Bennetts)

5956. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-06

(vila) Doc cleanups. (Vincent Ladeuil)

5957. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-06

(jelmer) Split out ImportTariffTestCase so it can be used by plugins.
 (Jelmer Vernooij)

5958. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-07

(spiv) Add a section about stacking constraints to doc/developers/fetch.txt.
 (Andrew Bennetts)

5959. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-07

(vila) Tweak the http Authorization tests to make some parts easier to reuse
 (parametrization mostly). (Vincent Ladeuil)

5960. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-07

(vila) Support pyftplib-0.6.0 as an ftp test server (Vincent Ladeuil)

5961. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-07

(vila) Exporting may now be done with a generator (Geoff)

5962. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-07

(vila) Don't leak credentials with -Dhttp (Vincent Ladeuil)

5963. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-08

(vila) Allow -S as shorthand for --log-format=short (Martin von Gagern)

5964. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-09

(spiv) Clarify wording of fetch.txt regarding stacking invariants and
 revisions with multiple parents. (Andrew Bennetts)

5965. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-09

(jr) New hook set_commit_message in bzrlib.msgeditor to set a commit message
 and revision properties. (Jonathan Riddell, #274578) (Jonathan Riddell)

5966. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-09

(vila) Merge 2.3 into trunk (Vincent Ladeuil)

5967. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-10

Cleanups and fixes for merging into null tree. (Aaron Bentley)

5968. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-13

Support merging into empty tree.

5969. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-13

(vila) Rewrite the eager
 bb.test_merge.TestMerge.test_merge_reversed_revision_range test (Vincent
 Ladeuil)

5970. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-14

(mbp) optionally detect and steal dead locks from the same machine and user
 (bug 220464) (Martin Pool)

5971. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-14

(jr) ``bzr annotate`` can be run without setting whoami data first.
 (Jonathan Riddell, LP: #667408) (Jonathan Riddell)

5972. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-14

(jr) * Do not treat configuration option 'check_signatures = require' as if
 it were 'create_signatures = always'. * Make docs for configuration options
 for digital signatures match reality. * Add user-guide page on GPG
 signatures. (Jonathan Riddell)

5973. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-15

(mbp) remove bzrlib.tree.file_status (Martin Pool)

5974. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-15

Bug #795557,
 allow exporting a subdir when also exporting the timestamps.
 (Szilveszter Farkas)

5975. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-15

(vila) Make ContentConflict resolution more robust (Vincent Ladeuil)

5976. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-16

(vila) Implement config hooks (Vincent Ladeuil)

5977. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-16

(spiv) "bzr mv --after old_name new_name" now works if new_name is newly
 added. (Benoit PIERRE)

5978. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-16

(jameinel) Fix bug #798130, if a file changes case on a cicp filesystem,
 don't treat it as a new file in 'bzr add' (John A Meinel)

5979. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-16

(jelmer) Deprecate Repository.iter_reverse_revision_history(). (Jelmer
 Vernooij)

5980. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-16

(vila) Merge 2.3 into trunk (Vincent Ladeuil)

5981. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-16

(vila) Add -Econfig_stats for selftest (Vincent Ladeuil)

5982. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-16

(vila) Release 2.4b4 (Vincent Ladeuil)

5983. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-16

(vila) Remove debug statement in test (Vincent Ladeuil)

5984. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-16

(vila) Open trunk again as 2.4dev5 (Vincent Ladeuil)

5985. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-18

(vila) Tighten BZR_LOG file handling in tests (Vincent Ladeuil)

5986. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-19

(mbp) remove noise about trailing ws, long lines,
 from test_source (Martin Pool)

5987. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-19

(jelmer) Deprecate Repository.get_ancestry(). (Jelmer Vernooij)

5988. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-20

(vila) Properly load utf8-encoded config files (Vincent Ladeuil)

5989. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-20

(vila) Clearer exceptions for bad-content config files (Vincent Ladeuil)

5990. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-21

(vila) Fix typo in release notes (Vincent Ladeuil)

5991. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-21

(jelmer) Fix the thunking of GraphThunkIdsToKeys.merge_sort. (Jelmer
 Vernooij)

5992. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-22

(vila) Slightly simplify whoami tests (Vincent Ladeuil)

5993. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-23

(jelmer) Fix copy-and-pasted test method name in test_chk_map that was
 masking a test. (Andrew Bennetts)

5994. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-28

(vila) Start implementing command help text localization (Inada Naoki)

5995. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-28

(vila) Do not generate path conflicts if a corresponding content conflict
 exists. (Vincent Ladeuil)

5996. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-28

(mbp) cleanup export code (Martin Pool)

5997. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-28

(jelmer) Re-introduce root when merge result is empty tree. (Jelmer Vernooij)

5998. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-28

(jelmer) Add WorkingTreeFormat.supports_versioned_directories,
 RepositoryFormat.supports_versioned_directories. (Jelmer Vernooij)

5999. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-28

(spiv) Make Branch.open more than 3x faster. (Andrew Bennetts)

6000. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-28

(mbp) fix truncated mini-tutorial text (Martin Pool)

6001. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-28

(mbp) remove __contains__ methods from inventory and dict (Martin Pool)

6002. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-29

(mbp) remove most __del__ methods (Martin Pool)

6003. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-30

(jr) A new command ``bzr verify-signatures`` has been added to check that
 commits
 are correctly signed with trusted keys by GPG. This requires python-gpgme to
 be installed. ``bzr log`` has gained a ``--signatures`` option to list the
 validity of signatures for each commit. New config options
 ``acceptable_keys``
 and ``validate_signatures_in_log`` can be set to control options to these
 commands. (Jonathan Riddell)

6004. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-30

(mbp) use explicit lazy regexps when appropriate (bug 608054) (Martin Pool)

6005. By Canonical.com Patch Queue Manager <email address hidden> on 2011-06-30

(mbp) don't use subprocesses for testing cat (Martin Pool)

6006. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-01

(jr) Various small improvements to GPG support
 - improve LoopbackGPGStrategy doc string - use unicode strings for UI
 - add doc string to verify_signatures_available()
 - add process_events_callback argument to do_verifications() to keep GUIs
 responsive (Jonathan Riddell)

6007. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-01

(mbp) Fixes bug 785404 by using known executables for win32 (cmd.exe) and
 other platforms (sh) in test_exe_on_path. (Gordon Tyler)

6008. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-04

(vila) Fix typo in bug number (Vincent Ladeuil)

6009. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-06

(jameinel) Make kind markers optional for bzr status. (Martin von Gagern)

6010. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-06

(jameinel) Give a better warning when the bzr script doesn't match its
 bzrlib. (Martin Pool)

6011. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-06

(benoit.pierre) Allow 'bzr version-info' to be run when the WT is at
 a dotted revno of the branch.

6012. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-07

(vila) Merging unrelated trees prefers THIS root (Aaron Bentley)

6013. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-07

(vila) Handle path conflicts involving different root-ids (merged in
 from 2.3 + tweaks) (Vincent Ladeuil)

6014. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-07

(vila) Release 2.4b5 (Vincent Ladeuil)

6015. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-07

(vila) Open trunk again as 2.4dev6 (Vincent Ladeuil)

6016. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-08

(mbp) improved tutorial text; mention codename for release (Martin Pool)

6017. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-09

(mbp) fix a todo about test_transport using addCleanup,
 and also some pep8 nits (Martin Pool)

6018. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-11

(spiv) Add a 'flush' action to BranchBuilder.build_snapshot. (Andrew
 Bennetts)

6019. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-11

(mbp) avoid unbound local error in export (Martin Pool)

6020. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-11

(spiv) Speed up TestCaseWithMemoryTransport._check_safety_net by reading the
 dirstate file directly rather than using WorkingTree.open(). (Andrew
 Bennetts)

6021. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-11

(vila) Open trunk as 2.5dev1 (Vincent Ladeuil)

6022. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-11

(vila) Move news entries from 2.4 to 2.5 for patches landed after 2.4
 fork (Vincent Ladeuil)

6023. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-12

(jr) Add a config option signature_key for setting which GPG key should be
 used to sign commits. Also default to using the gpg user identity which
 matches user_email() as set by whoami. Also don't use create_signatures on
 documentation config examples,
 since it doesn't do anything so makes for a bad example. (Jonathan Riddell)

6024. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-12

(jr) bzr log -m now matches message, author, committer and bugs instead
 of just matching the message. --message keeps its original meaning,
 while --match-message, --match-author, --match-committer and
 --match-bugs match each of those fields. (Jonathan Riddell)

6025. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-14

Small TreeTransform fixes (Aaron Bentley).

6026. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-15

(jelmer) Fix i18n installation when no language environment variables are
 set. (Jelmer Vernooij)

6027. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-15

(vila) Merge 2.4 into trunk (Vincent Ladeuil)

6028. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-15

(vila) Add more tests for bound_location variations in config files.
 (Vincent Ladeuil)

6029. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-15

(vila) Remove deprecated stuff in bzrlib.log (Vincent Ladeuil)

6030. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-16

(vila) Remove commands, diff and trace deprecated stuff (Vincent Ladeuil)

6031. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-18

(vila) Fix CHKInventory's filtering when mixing changes and moves in
 subfolders (Bastian Bowe)

6032. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-18

(jam) Merge lp:bzr/2.4 into lp:bzr after fixing up release-notes

6033. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-18

(jameinel) Bug #609187: warn the user if a package-import branch doesn't
 have the most recent source package. (John A Meinel)

6034. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-19

(jelmer) Split location to URL conversion out into a separate function from
 get_transport. (Jelmer Vernooij)

6035. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-21

(mbp) add ContentFilterTree decorator and use it for cat and export (Martin
 Pool)

6036. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-21

(jelmer) Document the behaviour with regards to special characters in URLs.
 (Jelmer Vernooij)

6037. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-22

(jelmer) Document behaviour with regards to comma's in location specifiers.
 (Jelmer Vernooij)

6038. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-22

(jameinel) Bug #812928,
 allow configuring how verbose the package freshness checks are. (John A
 Meinel)

6039. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-22

(jam) Fix hte release notes for verbosity knob.

6040. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-23

(jelmer) Add support for file relative URLs with a scheme. (Jelmer Vernooij)

6041. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-23

(jelmer) Move NEWS entry for file-relative-url branch from bzr-2.4.txt to
 bzr-2.5.txt. (Jelmer Vernooij)

6042. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-23

(jelmer) Fix some tests to cope with working trees that do not support
 versioned directories. (Jelmer Vernooij)

6043. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-25

(mbp) move test feature dependencies into test.features (Martin Pool)

6044. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-25

(jelmer) Move private Repository._eliminate_revisions_not_present to
 VersionedFileRepository. (Jelmer Vernooij)

6045. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-25

(jelmer) Add get_transport_from_url and get_transport_from_path functions.
 (Jelmer Vernooij)

6046. By Canonical.com Patch Queue Manager <email address hidden> on 2011-07-27

(mbp) log a message when we get a EINVAL on a transport operation (Martin
 Pool)

6047. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-02

(mbp) merge 2.3 and 2.4 to trunk (Martin Pool)

6048. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-02

(jr) fix config option in release note (Jonathan Riddell)

6049. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-03

(mbp) Log levels are no longer reset to what the log formatter supports (bug
 747958) (Thomi Richards)

6050. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-03

(jelmer) Fix support for testtools 0.9.12. (Jelmer Vernooij)

6051. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-04

(vila) Release instructions refresh. (Vincent Ladeuil)

6052. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-05

(jelmer) Allow other kinds of file "verifiers" than SHA1. (Jelmer Vernooij)

6053. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-05

(jelmer) Remove UIFactory.warn_cross_format_fetch and
 UIFactory.warn_experimental_format_fetch in favor of
 UIFactory.show_user_warning. (Jelmer Vernooij)

6054. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-06

(gz) Update knownFailure so the reason isn't lost on Python 2.7 (Martin [gz])

6055. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-06

(gz) Never raise KnownFailure in tests,
 use knownFailure method instead (Martin [gz])

6056. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-08

(mbp) update tc qdisc testing instructions (Martin Pool)

6057. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-08

(vila) os.fdatasync is not defined on BSD-based OSes (Vincent Ladeuil)

6058. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-09

(vila) Migrate some config options to the stack-based API. (Vincent Ladeuil)

6059. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-09

(vila) Introduce OptionRegistry (Vincent Ladeuil)

6060. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-09

(vila) Decode BZR_HOME with fs encoding to allow unicode homes. (Vincent
 Ladeuil)

6061. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-11

(vila) Small test suite fixes for Windows. (John A Meinel)

6062. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-12

(jelmer) Add a URL object for manipulating parsed URLs. (Jelmer Vernooij)

6063. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-12

(vila) Implement boolean options. (Vincent Ladeuil)

6064. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-12

(vila) Allow option to require a warning or error when an invalid value is
 found in a config file. (Vincent Ladeuil)

6065. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-12

(vila) Implement integer config options. (Vincent Ladeuil)

6066. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-12

(vila) Merge 2.4 into trunk (Vincent Ladeuil)

6067. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-12

(jelmer) Add URL.clone,
 URL.__str__ and use them in various places. (Jelmer Vernooij)

6068. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-13

(vila) Implements list config options. (Vincent Ladeuil)

6069. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-14

(jelmer) Mention ways of specifying a commit message or forcing an empty
 commit message when the user specifies an empty message. (Paul Stewart)

6070. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-15

(vila) Merge 2.4 into trunk (Vincent Ladeuil)

6071. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-15

(jelmer) Cope with the localhost having the name 'localhost' when running
 the test suite. (Jelmer Vernooij)

6072. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-16

(vila) Implement per-config option help (Vincent Ladeuil)

6073. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-16

(jelmer) Mention in contribution docs that people can ask for
 preimplementation advice. (Martin Pool)

6074. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-17

(jr) bzr push -q now does not print name of pushed location
 (Jonathan Riddell)

6075. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-17

(vila) More options migrated to the stack-based config. (Vincent Ladeuil)

6076. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-17

(vila) ModuleAvailableFeature don't try to imported already imported
 modules. (Vincent Ladeuil)

6077. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-17

(jelmer) Add stub for ControlDir.find_branch_format,
 fix some tests against foreign formats. (Jelmer Vernooij)

6078. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-17

(jelmer) Couple of minor fixes of tests for the foreign branch plugins.
 (Jelmer Vernooij)

6079. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-17

(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

6080. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-17

(jelmer) Add a HasLayout matcher. (Jelmer Vernooij)

6081. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-18

(jelmer) Support forcing empty commit messages with -m. (Jelmer Vernooij)

6082. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-18

(jelmer) Add a "bzr branches" command. (Jelmer Vernooij)

6083. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-19

(jelmer) Don't create branch references in control directories that do not
 support custom branch formats. (Jelmer Vernooij)

6084. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-19

(vila) Implement default values from environment for config options (Vincent
 Ladeuil)

6085. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-20

(jelmer) Format URLs for display when printing them inside 'bzr upgrade'.
 (Jelmer Vernooij)

6086. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-20

(jr) bzr add now skips large files in recursive mode. The default "large"
 size is 20MB, and is configurable via the add.maximum_file_size
 option. A value of 0 disables skipping. Named items passed to add are
 never skipped. (Shannon Weyrick, #54624) (Shannon Weyrick)

6087. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-20

(vila) Allow blackbox tests and test scripts interactive debugging. (Vincent
 Ladeuil)

6088. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-20

(vila) Fix typos (Vincent Ladeuil)

6089. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-20

(jelmer) Use get_transport_from_path and get_transport_from_url in more
 places. (Jelmer Vernooij)

6090. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-21

(vila) Merge 2.4 into trunk (including fix for #614713, #735417,
 #609187 and #812928) (Vincent Ladeuil)

6091. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-21

(vila) Merge 2.4 into trunk (including fix for bug #829237) (Vincent
 Ladeuil)

6092. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-22

(vila) Add missing config store and stacks for control.conf and remote
 branches. (Vincent Ladeuil)

6093. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-23

(jr) Document gpgme usage in comments. (Jonathan Riddell)

6094. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-24

(jelmer) Remove tags in `bzr uncommit`. (Jelmer Vernooij)

6095. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-24

(jelmer) Add a -Dhpss_client_no_vfs debug flag which prevents client-side
 VFS calls. (Jelmer Vernooij)

6096. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-24

(mbp) fix 'bzr serve' invocation in admin guide (Martin Pool)

6097. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-25

(mbp) clearer messages for 'bzr missing' (bug 250296) (Thomi Richards)

6098. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-25

(jr) Merge in 2.4 version
 Fix i18n use when no environment variables are set. (Jelmer Vernooij,
 #810701) (Jonathan Riddell)

6099. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-25

(jameinel) Bug #388269, when walking to find revisions to transmit,
 only send a local part of the search graph,
 not the whole graph walked for every step. (John A Meinel)

6100. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-25

(vila) Merge 2.4 into trunk resolving conflicts (Vincent Ladeuil)

6101. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-25

(jameinel) Handle bug #702914,
 avoid race conditions removing attributes of ImportReplacer. (Benji York)

6102. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-25

(jr) bzr now ships with translations for command help. (Jonathan Riddell)

6103. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-26

(jr) Install translation .mo files
 (Jonathan Riddell)

6104. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-26

(vila) Fix meliae test feature definitions. (Max Bowsher)

6105. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-26

(jam) Bug #388269,
 avoid searching for missing history in the stacked branch by exposing
 the cache available in the stacked-on branch.

6106. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-28

(jameinel) Bug #835545,
 lazy_import modules rather than objects to allow pydoc to work. (Jelmer
 Vernooij)

6107. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-28

(jameinel) Bug #827721, OS/IOError will have locale dependent encoding,
 so %r rather than %s. (IWATA Hidetaka)

6108. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-29

(mbp) top-level doc page should now point to whatsnew-2.5

6109. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-29

(vila) Better conversion for default values of config Options. (Vincent
 Ladeuil)

6110. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-29

(jelmer) Various improvements to the testsuite to allow running against
 foreign branches. (Jelmer Vernooij)

6111. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-30

(jameinel) Bug #483661,
 do not reuse transports for the two branches involved in a pull in
 order to avoid concurrent requests over a smart medium like
 ssh. (Martin von Gagern)

6112. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-30

(vila) Fix a few missed references to bzr-2.4 (and one to python-2.4)
 (Vincent Ladeuil)

6113. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-31

(jelmer) Properly translate IOErrors from open_file in
 LocalTransport.open_write_stream. (Jelmer Vernooij)

6114. By Canonical.com Patch Queue Manager <email address hidden> on 2011-08-31

(jr) Do not run i18n initialisation twice. (Jonathan Riddell)

6115. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-01

(jelmer) Move the use of hashcache to a new PreDirStateWorkingTree and case
 detection to InventoryWorkingTree. (Jelmer Vernooij)

6116. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-01

(jr) add digital signatures to log-format doc (Jonathan Riddell)

6117. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-01

(jelmer) Print a warning rather than an error when the current user does not
 have permission to read a configuration file. (Jelmer Vernooij)

6118. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-01

(jelmer) Some compatibility fixes for cython.dev. (Denys Duchier)

6119. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-01

(jelmer) Support repository formats without explicitly versioned directories
 in HasLayout. (Jelmer Vernooij)

6120. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-01

(vila) Output time stamps while running ``make check`` to get better timings
 from pqm (Vincent Ladeuil)

6121. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-01

(jelmer) bzr tag no longer errors if a tag exists but has the same target.
 (Jelmer Vernooij)

6122. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-01

(jelmer) Various fixes to allow tests to run against foreign branches.
 (Jelmer Vernooij)

6123. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-02

(vila) Start supporting option expansion in config stacks. (Vincent Ladeuil)

6124. By Patch Queue Manager <pqm@cupuasso> on 2011-09-08

(jelmer) Fix a typo (invalid format identifier) in an error message in
 bzrlib.gpg. (Jelmer Vernooij)

6125. By Patch Queue Manager <pqm@cupuasso> on 2011-09-08

(jelmer) Allow orthogonal reconfiguration requests to coexist. (Martin von
 Gagern)

6126. By Patch Queue Manager <pqm@cupuasso> on 2011-09-09

(vila) Document fix for #842993 in release notes. (Martin von Gagern)
 (Martin von Gagern)

6127. By Patch Queue Manager <pqm@cupuasso> on 2011-09-09

(jelmer) Fix some more tests when run against foreign bzr plugins. (Jelmer
 Vernooij)

6128. By Patch Queue Manager <email address hidden> on 2011-09-09

(vila) Properly decode command lines with embedded quotes for external merge
 tools. (Gordon Tyler)

6129. By Patch Queue Manager <email address hidden> on 2011-09-09

(jelmer) Misc fixes for running the regular bzr tests against foreign
 branches. (Jelmer Vernooij)

6130. By Patch Queue Manager <email address hidden> on 2011-09-12

(jelmer) More fixes for the interface tests when run against foreign tests.
 (Jelmer Vernooij)

6131. By Patch Queue Manager <email address hidden> on 2011-09-12

(jr) Use gettext.NullTranslations in i18n to allow use of i18n even when
 translations are not turned on. (Jonathan Riddell)

6132. By Patch Queue Manager <email address hidden> on 2011-09-12

(jr) Do not use i18n for tests (Jonathan Riddell)

6133. By Patch Queue Manager <email address hidden> on 2011-09-13

(jameinel) Estimate bytes-to-return more accurately for
 Repository.get_parent_map,
 allowing closer to 64kB to be returned per query. (John A Meinel)

6134. By Patch Queue Manager <email address hidden> on 2011-09-13

(vila) Merging 2.4 into trunk (Vincent Ladeuil)

6135. By Patch Queue Manager <email address hidden> on 2011-09-13

(jr) add translations to release process (Jonathan Riddell)

6136. By Patch Queue Manager <email address hidden> on 2011-09-13

(jr) enable translations globally (Jonathan Riddell)

6137. By Patch Queue Manager <email address hidden> on 2011-09-13

(jelmer) During commit, report missing files as "deleted",
 not as "modified". (Jelmer Vernooij)

6138. By Patch Queue Manager <email address hidden> on 2011-09-13

(jelmer) "bzr add" warns when skipping a control directory. (Jelmer Vernooij)

6139. By Patch Queue Manager <email address hidden> on 2011-09-14

(jr) re-enable i18n for tests which need it
 add i18n info to testing documentation
 add some API docs to functions which miss it (Jonathan Riddell)

6140. By Patch Queue Manager <email address hidden> on 2011-09-15

(jameinel) Clean up some imports vs variable name collisions in
 test_smart_transport.py (John A Meinel)

6141. By Patch Queue Manager <email address hidden> on 2011-09-15

(vila) Open 2.5b2 for bugfixes (Vincent Ladeuil)

6142. By Patch Queue Manager <email address hidden> on 2011-09-16

(jr) use gettext() to allow for translations of command output from
 builtins.py (Jonathan Riddell)

6143. By Patch Queue Manager <email address hidden> on 2011-09-16

(jr) Add gettext() to uses of note() (Jonathan Riddell)

6144. By Patch Queue Manager <email address hidden> on 2011-09-16

(jr) Add gettext() to user error messages
 (Jonathan Riddell)

6145. By Patch Queue Manager <email address hidden> on 2011-09-16

(jr) Add gettext() to progress bar text
 (Jonathan Riddell)

6146. By Patch Queue Manager <email address hidden> on 2011-09-19

(jr) Use ngettext instead of "words(s) with brackets" for plurals (Jonathan
 Riddell)

6147. By Patch Queue Manager <email address hidden> on 2011-09-19

(jelmer) Fix some issues with http redirects. (Jelmer Vernooij)

6148. By Patch Queue Manager <email address hidden> on 2011-09-19

(jr) Add options --omit-merges and --include-merged for bzr log and missing,
 deprecating --include-merges. (Martin von Gagern)

6149. By Patch Queue Manager <email address hidden> on 2011-09-19

(jelmer) Add RepositoryFormat.supports_nesting_repositories. (Jelmer
 Vernooij)

6150. By Patch Queue Manager <email address hidden> on 2011-09-19

(jr) use .format() instead of % for string formatting where there are
 multiple formats in one string to allow for translations (Jonathan Riddell)

6151. By Patch Queue Manager <email address hidden> on 2011-09-20

(jr) Update bzr.pot (Jonathan Riddell)

6152. By Patch Queue Manager <email address hidden> on 2011-09-20

(jelmer) Various fixes for running bzr.dev tests against the foreign
 plugins. (Jelmer Vernooij)

6153. By Patch Queue Manager <email address hidden> on 2011-09-20

(jr) adding gettext() to more strings
 (Jonathan Riddell)

6154. By Patch Queue Manager <email address hidden> on 2011-09-21

(jelmer) Raise NoSuchId from Tree.get_file_mtime if the file id was not
 found. (Jelmer Vernooij)

6155. By Patch Queue Manager <email address hidden> on 2011-09-21

(vila) Update release notes (Vincent Ladeuil)

6156. By Patch Queue Manager <email address hidden> on 2011-09-22

(jelmer) Various improvements to allow running bzr interface tests against
 foreign branch plugins. (Jelmer Vernooij)

6157. By Patch Queue Manager <email address hidden> on 2011-09-22

(vila) Migrate dpush_strict,
 push_strict and send_strict options to the stack based config design,
 introducing get_config_stack for branches (Vincent Ladeuil)

6158. By Patch Queue Manager <email address hidden> on 2011-09-22

(jameinel) Cleanup comments bzrlib/smart/__init__.py (John A Meinel)

6159. By Patch Queue Manager <email address hidden> on 2011-09-22

(vila) Sort cmdline options declarations (in option.py) by name to
 make it easier to add a new one. (Vincent Ladeuil)

6160. By Patch Queue Manager <email address hidden> on 2011-09-22

(jelmer) Fix reporting all tags as changed when using --overwrite. (Jelmer
 Vernooij)

6161. By Patch Queue Manager <email address hidden> on 2011-09-22

(jelmer) Tweak "bzr help add" to mention behaviour regarding nested trees.
 (Jelmer Vernooij)

6162. By Patch Queue Manager <email address hidden> on 2011-09-23

(vila) Get rid of randomness in
 blackbox.test_branch.TestBranch.test_branch_broken_pack (Vincent Ladeuil)

6163. By Patch Queue Manager <email address hidden> on 2011-09-24

(vila) Stop reloading all ancestry for each tag when searching tags in a
 revision range (Vincent Ladeuil)

6164. By Patch Queue Manager <email address hidden> on 2011-09-24

(vila) Remove dead code for which an exact copy exists in
 bzrlib/repofmt/pack_repo.py (Vincent Ladeuil)

6165. By Patch Queue Manager <email address hidden> on 2011-09-24

(jelmer) Fix typos in variable names in bzrlib.vf_repository. (Jelmer
 Vernooij)

6166. By Patch Queue Manager <email address hidden> on 2011-09-26

(jelmer) Various fixes to the bzr.dev interface tests to improve running
 against foreign branch plugins. (Jelmer Vernooij)

6167. By Patch Queue Manager <email address hidden> on 2011-09-26

(vila) Merge 2.4 into trunk (Vincent Ladeuil)

6168. By Patch Queue Manager <email address hidden> on 2011-09-26

(jelmer) Various improvements to allow working tree interface tests to run
 against foreign formats. (Jelmer Vernooij)

6169. By Patch Queue Manager <email address hidden> on 2011-09-26

(jelmer) Add --recursive option to 'bzr branches'. (Jelmer Vernooij)

6170. By Patch Queue Manager <email address hidden> on 2011-09-26

(jameinel) Allow 'bzr serve' to interpret SIGHUP as a graceful shutdown.
 (bug #795025) (John A Meinel)

6171. By Patch Queue Manager <email address hidden> on 2011-09-26

(jelmer) Remove several calls to Branch.revision_history(). (Jelmer Vernooij)

6172. By Patch Queue Manager <email address hidden> on 2011-09-27

(jelmer) Deprecate Branch.get_revision_delta(). (Jelmer Vernooij)

6173. By Patch Queue Manager <email address hidden> on 2011-09-27

(vila) Clarify how a global option can be hidden by a command ('log' hides
 'message') (Vincent Ladeuil)

6174. By Patch Queue Manager <email address hidden> on 2011-09-27

(jr) Changes to i18n.py to help support plugins with translations (Jonathan
 Riddell)

6175. By Patch Queue Manager <email address hidden> on 2011-09-28

(vila) Allows bzr shelve to be used in test scripts and under emacs shells
 (Vincent Ladeuil)

6176. By Patch Queue Manager <email address hidden> on 2011-09-29

(gz) Tidy up dirstate pack_stat code and expose pyrex implementation (Martin
 Packman)

6177. By Patch Queue Manager <email address hidden> on 2011-09-29

(gz) Truncate stat fields to 4 bytes in dirstate.pack_stat implementations
 (Martin Packman)

6178. By Patch Queue Manager <email address hidden> on 2011-09-29

(vila) Allow configuration options to be overridden from the command line.
 (Vincent Ladeuil)

6179. By Patch Queue Manager <email address hidden> on 2011-09-30

(mbp) 'bzr update PATH' makes it clear you can't update a single file
 (Martin Pool)

6180. By Patch Queue Manager <email address hidden> on 2011-09-30

(jr) only run test if plugins are loaded (Jonathan Riddell)

6181. By Patch Queue Manager <email address hidden> on 2011-09-30

(jelmer) Move fileids_altered_by_revision_ids to VersionedFileRepository.
 (Jelmer Vernooij)

6182. By Patch Queue Manager <email address hidden> on 2011-09-30

(jelmer) Resolve format early in make_branch_and_tree,
 in preparation of further refactoring. (Jelmer Vernooij)

6183. By Patch Queue Manager <email address hidden> on 2011-10-03

(jelmer) Make "bzr info -v" not display any branch statistics if the branch
 doesn't support last_revision_info,
 rather than crashing with a traceback. (Jelmer Vernooij)

6184. By Patch Queue Manager <email address hidden> on 2011-10-03

(jelmer) Support using "bzr tags" against branches that do not support
 looking up revision numbers. (Jelmer Vernooij)

6185. By Patch Queue Manager <email address hidden> on 2011-10-04

(vila) Don't crash while building a config stack if bzrlib.initialize() has
 not been called (workaround, not a license to generalise) (Vincent Ladeuil)

6186. By Patch Queue Manager <email address hidden> on 2011-10-04

(jameinel) Fix the hanging tests, help prevent future hanging,
 and make the tests handle idle connections properly. (John A Meinel)

6187. By Patch Queue Manager <email address hidden> on 2011-10-04

(gz) Fix test failures due to mising import from moving
 fileids_altered_by_revision_ids to VersionedFileRepository (Martin Packman)

6188. By Patch Queue Manager <email address hidden> on 2011-10-04

(jelmer) Another set of fixes to make it possible to run the bzr.dev tests
 against foreign plugins. (Jelmer Vernooij)

6189. By Patch Queue Manager <email address hidden> on 2011-10-04

(jelmer) Several more fixes to allow running bzr.dev against bzr-svn (Jelmer
 Vernooij)

6190. By Patch Queue Manager <email address hidden> on 2011-10-04

(jelmer) Add load_plugin_translations() function. (Jelmer Vernooij)

6191. By Patch Queue Manager <email address hidden> on 2011-10-05

(jelmer) Add 'development-colo' format which supports colocated branches.
 (Jelmer Vernooij)

6192. By Patch Queue Manager <email address hidden> on 2011-10-06

(vila) Merge 2.4 into trunk resolving conflicts (Vincent Ladeuil)

6193. By Patch Queue Manager <email address hidden> on 2011-10-06

(mbp) error message without traceback on invalid ubuntu/debian url (bug
 843900) (Martin Pool)

6194. By Patch Queue Manager <email address hidden> on 2011-10-06

(vila) Release 2.5b2 (Vincent Ladeuil)

6195. By Patch Queue Manager <email address hidden> on 2011-10-06

(vila) Open trunk again as 2.5dev3 (Vincent Ladeuil)

6196. By Patch Queue Manager <email address hidden> on 2011-10-06

(vila) Tag bzr-2.5b2 missed during freeze (Vincent Ladeuil)

6197. By Patch Queue Manager <email address hidden> on 2011-10-06

(jameinel) Allow for some tests to run slowly under load. (John A Meinel)

6198. By Patch Queue Manager <email address hidden> on 2011-10-06

(vila) Fix some minor issues in config tests. (Vincent Ladeuil)

6199. By Patch Queue Manager <email address hidden> on 2011-10-06

(vila) Document checking the news file and merges from older stable releases
 while freezing a release. (Vincent Ladeuil)

6200. By Patch Queue Manager <email address hidden> on 2011-10-06

(jelmer) Add a --revision option to 'bzr version-info'. (Jelmer Vernooij)

6201. By Patch Queue Manager <email address hidden> on 2011-10-06

(vila) Allows ``log_format`` to be used with ``-O``. (Vincent Ladeuil)

6202. By Patch Queue Manager <email address hidden> on 2011-10-06

(gz) Merge 2.4 into dev to resolve conflict in setup.py (Martin Packman)

6203. By Patch Queue Manager <email address hidden> on 2011-10-07

(gz) Make cmd_mkdir obey the quiet option (Martin von Gagern)

6204. By Patch Queue Manager <email address hidden> on 2011-10-09

(jelmer) Add a --revision argument to 'bzr revno'. (Jelmer Vernooij)

6205. By Patch Queue Manager <email address hidden> on 2011-10-10

(gz) Fix bt.per_repository tests for foreign formats that only support
 shared repos (Jelmer Vernooij)

6206. By Patch Queue Manager <email address hidden> on 2011-10-10

(jam) Merge bzr-2.4 into bzr.dev, resolving small conflicts.

6207. By Patch Queue Manager <email address hidden> on 2011-10-10

(jelmer) Move some signature-related tests from bzrlib.tests.per_branch to
 bzrlib.tests.per_repository. (Jelmer Vernooij)

6208. By Patch Queue Manager <email address hidden> on 2011-10-12

(jelmer) Support upgrading between the 2a and development-colo formats.
 (Jelmer Vernooij)

6209. By Patch Queue Manager <email address hidden> on 2011-10-12

(gz) Bug #613247, cleanup test cases when they are finished running,
 lowering peak memory during selftest. (Martin Packman)

6210. By Patch Queue Manager <email address hidden> on 2011-10-12

(jelmer) Don't require global_state to be initialized to use bzrlib's
 TestCase. (Jelmer Vernooij)

6211. By Patch Queue Manager <email address hidden> on 2011-10-13

(jelmer) Add ControlDirFormat.supports_transport(). (Jelmer Vernooij)

6212. By Patch Queue Manager <email address hidden> on 2011-10-13

(jelmer) Add support for cloning into a colocated branch. (Jelmer Vernooij)

6213. By Patch Queue Manager <email address hidden> on 2011-10-13

(jelmer) Create a checkout if the target control directory does not support
 working trees. (Jelmer Vernooij)

6214. By Patch Queue Manager <email address hidden> on 2011-10-14

(jelmer) Move static/class methods from BzrDir to ControlDir. (Jelmer
 Vernooij)

6215. By Patch Queue Manager <email address hidden> on 2011-10-14

(jelmer) improvements to the interactive text ui framework,
 and make shelf and break-lock use it (Benoit PIERRE)

6216. By Patch Queue Manager <email address hidden> on 2011-10-14

(jelmer) Deprecate Branch.revision_history(). (Jelmer Vernooij)

6217. By Patch Queue Manager <email address hidden> on 2011-10-14

(jelmer) Remove an accidentally committed .THIS file. (Jelmer Vernooij)

6218. By Patch Queue Manager <email address hidden> on 2011-10-17

(jelmer) Add release note entries for ui.choose (Benoit PIERRE)

6219. By Patch Queue Manager <email address hidden> on 2011-10-17

(jelmer) Allow tree implementations to not support kind changes.
 (Jelmer Vernooij)

6220. By Patch Queue Manager <email address hidden> on 2011-10-17

(jelmer) Several more fixes for running the tests against foreign format
 plugins. (Jelmer Vernooij)

6221. By Patch Queue Manager <email address hidden> on 2011-10-17

(jelmer) Add flag to indicate whether a repository supports unreferenced
 revisions. (Jelmer Vernooij)

6222. By Patch Queue Manager <email address hidden> on 2011-10-18

(mbp) Delete _log_memento after TestCase is done with it so as not to upset
 the funky weakref cleanup mechanism. (Martin Packman)

6223. By Patch Queue Manager <email address hidden> on 2011-10-18

(gz) Fix indent of release notes for the cleanup testcases branch (Martin
 Packman)

6224. By Patch Queue Manager <email address hidden> on 2011-10-18

(jr) If sending a crash through Apport fails report the Apport failure to
 bzr.log rather than stderr. (Jonathan Riddell, #766735) (Jonathan Riddell)

6225. By Patch Queue Manager <email address hidden> on 2011-10-18

(jr) ``bzr mv`` does not crash when attempting to move the root of a branch.
 (Jonathan Riddell, #809728) (Jonathan Riddell)

6226. By Patch Queue Manager <email address hidden> on 2011-10-19

(jelmer) Add parent_ids and allow_leftmost_as_ghost arguments to
 BranchBuilder.build_commit. (Jelmer Vernooij)

6227. By Patch Queue Manager <email address hidden> on 2011-10-19

(jelmer) Some cleanups for bzrlib.transform to avoid directly using
 inventories. (Jelmer Vernooij)

6228. By Patch Queue Manager <email address hidden> on 2011-10-20

(jelmer) Fix Repository.get_revision_delta(specific_file_ids=) test. (Jelmer
 Vernooij)

6229. By Patch Queue Manager <email address hidden> on 2011-10-21

(gz) Report child process exceptions from selftest --parallel=fork (Martin
 Packman)

6230. By Patch Queue Manager <email address hidden> on 2011-10-23

(jelmer) Use UIFactory.get_boolean for confirmation prompt in `bzr
 clean-tree`. (Benoit PIERRE)

6231. By Patch Queue Manager <email address hidden> on 2011-10-25

(gz) Stop treating UpToDateFormat as an upgrade failure (Benoit PIERRE)

6232. By Patch Queue Manager <email address hidden> on 2011-10-25

(jelmer) Add feature flag specification. (Jelmer Vernooij)

6233. By Patch Queue Manager <email address hidden> on 2011-10-26

(gz) Merge 2.4 into dev to get clean diff for next merge (Martin Packman)

6234. By Patch Queue Manager <email address hidden> on 2011-10-26

(gz) Merge from 2.4 branch alternative fix for testtools output failures
 (Martin Packman)

6235. By Patch Queue Manager <email address hidden> on 2011-10-27

(gz) Refactor and deprecate unused parts of lru_cache (Martin Packman)

6236. By Patch Queue Manager <email address hidden> on 2011-10-27

(vila) Merge 2.4 into trunk including fix for bug #880701 (Vincent
 Ladeuil)

6237. By Patch Queue Manager <email address hidden> on 2011-11-02

(jelmer) Support serving from URL in `bzr serve`. (Jelmer Vernooij)

6238. By Patch Queue Manager <email address hidden> on 2011-11-02

(jelmer) Fix import in the FTP GSSAPI support. (Jelmer Vernooij)

6239. By Patch Queue Manager <email address hidden> on 2011-11-04

(jelmer) Delay loading of the Kerberos module until it is actually used.
 (Jelmer Vernooij)

6240. By Patch Queue Manager <email address hidden> on 2011-11-04

(jelmer) Fix development-colo to put its lock directory in .bzr/,
 not in . (Jelmer Vernooij)

6241. By Patch Queue Manager <email address hidden> on 2011-11-07

(gz) Write traceback as one block from selftest forked children (Martin
 Packman)

6242. By Patch Queue Manager <email address hidden> on 2011-11-07

(jelmer) Fix osutils.local_concurrency() when run with newer versions on
 Python on Debian GNU/kFreeBSD. (Jelmer Vernooij)

6243. By Patch Queue Manager <email address hidden> on 2011-11-07

(jelmer) Support SmartSSHMedium.__repr__ support for missing usernames.
 (Jelmer Vernooij)

6244. By Patch Queue Manager <email address hidden> on 2011-11-08

(jelmer) Fix WorkingTree.pull(stop_revision='null:',
 overwrite=True). (Jelmer Vernooij)

6245. By Patch Queue Manager <email address hidden> on 2011-11-08

(gz) Only imply --check-clean for version-info if {clean} is in the template
 (Lawrence Mitchell)

6246. By Patch Queue Manager <email address hidden> on 2011-11-08

(jelmer) Print the number of colocated branches in 'bzr info'. (Jelmer
 Vernooij)

6247. By Patch Queue Manager <email address hidden> on 2011-11-08

(gz) Prevent random test failure by allowing intermingled tracebacks in
 test_error_in_child_during_fork (Martin Packman)

6248. By Patch Queue Manager <email address hidden> on 2011-11-08

(jelmer) Always show the bound branch, if there is any,
 in 'bzr info' output. (Jelmer Vernooij)

6249. By Patch Queue Manager <email address hidden> on 2011-11-08

(jelmer) Support 'null:' revision for WorkingTree.clone(). (Jelmer Vernooij)

6250. By Patch Queue Manager <email address hidden> on 2011-11-08

(jelmer) Allow commit builders to update the branch as part of a commit.
 (Jelmer Vernooij)

6251. By Patch Queue Manager <email address hidden> on 2011-11-09

(jelmer) Fix the help message for the changelog_merge plugin. (Jelmer
 Vernooij)

6252. By Patch Queue Manager <email address hidden> on 2011-11-10

(vila) Implement 'relpath' as a section local option. (Vincent Ladeuil)

6253. By Patch Queue Manager <email address hidden> on 2011-11-10

(vila) Release 2.5b3 (Vincent Ladeuil)

6254. By Patch Queue Manager <email address hidden> on 2011-11-10

(vila) Open 2.5b4 for bug fixes (Vincent Ladeuil)

6255. By Patch Queue Manager <email address hidden> on 2011-11-10

(vila) More tweaks to the release workflow. (Vincent Ladeuil)

6256. By Patch Queue Manager <email address hidden> on 2011-11-11

(mbp) raise BadIndexKey rather than crashing if the key is unreasonably long
 (Shannon Weyrick)

6257. By Patch Queue Manager <email address hidden> on 2011-11-11

(gz) Merge 2.4 into dev (Martin Packman)

6258. By Patch Queue Manager <email address hidden> on 2011-11-14

(mbp) Back-out BadIndexKey assertion in r6256 (Martin Pool)

6259. By Patch Queue Manager <email address hidden> on 2011-11-14

(jelmer) Handle repository formats that don't support revision signatures in
 the testsuite. (Jelmer Vernooij)

6260. By Patch Queue Manager <email address hidden> on 2011-11-14

(jelmer) Fix typo in Bazaar with Launchpad tutorial. (Jelmer Vernooij)

6261. By Patch Queue Manager <email address hidden> on 2011-11-15

(vila) Don't mention gold when announcing source freezes (Vincent
 Ladeuil)

6262. By Patch Queue Manager <email address hidden> on 2011-11-15

(jelmer) Support verifying signatures on remote repositories. (Jelmer
 Vernooij)

6263. By Patch Queue Manager <email address hidden> on 2011-11-16

(jelmer) Support 'bzr info' on empty control directories and control
 directories with dangling branch references. (Jelmer Vernooij)

6264. By Patch Queue Manager <email address hidden> on 2011-11-16

(jelmer) Fix Branch.revision_id_to_revno in empty branches. (Jelmer Vernooij)

6265. By Patch Queue Manager <email address hidden> on 2011-11-16

(gz) Unquote unreserved characters including tilde in urlutils.URL methods
 (Martin Packman)

6266. By Patch Queue Manager <email address hidden> on 2011-11-16

(gz) Remove declaration of unused global options for commands (Martin
 Packman)

6267. By Patch Queue Manager <email address hidden> on 2011-11-17

(jelmer) Support branching into a colocated branch that doesn't exist yet,
 without requiring --use-existing-dir. (Jelmer Vernooij)

6268. By Patch Queue Manager <email address hidden> on 2011-11-17

(jelmer) Raise BadIndexKey rather than crashing if the key is unreasonably
 long. (Shannon Weyrick)

6269. By Patch Queue Manager <email address hidden> on 2011-11-17

(jelmer) Add HPSS call ``Repository.make_working_trees``. (Jelmer Vernooij)

6270. By Patch Queue Manager <email address hidden> on 2011-11-17

(jelmer) Add HPSS call ``Repository.has_signature_for_revision_id``. (Jelmer
 Vernooij)

6271. By Patch Queue Manager <email address hidden> on 2011-11-17

(gz) Avoid stringifying FileExists in test_transform which need not care
 about message localisation (Martin Packman)

6272. By Patch Queue Manager <email address hidden> on 2011-11-17

(jelmer) Avoid _ensure_real in a few more places in bzrlib.remote. (Jelmer
 Vernooij)

6273. By Patch Queue Manager <email address hidden> on 2011-11-17

(vila) Switch ``bzr config`` to the stack-based config implementation
 (Vincent Ladeuil)

6274. By Patch Queue Manager <email address hidden> on 2011-11-17

(jelmer) Make sure that a branch user URL uniquely identifies that branch,
 and can be used to open it. (Jelmer Vernooij)

6275. By Patch Queue Manager <email address hidden> on 2011-11-17

(jelmer) Use colocated branch name when determining the name of a new
 branch. (Jelmer Vernooij)

6276. By Patch Queue Manager <email address hidden> on 2011-11-17

(jelmer) Support switching to colocated branches in "bzr switch". (Jelmer
 Vernooij)

6277. By Patch Queue Manager <email address hidden> on 2011-11-18

(mbp) remove dead code for lzma compression (Martin Pool)

6278. By Patch Queue Manager <email address hidden> on 2011-11-18

(vila) Add {basename} as a section local configuration option. (Vincent
 Ladeuil)

6279. By Patch Queue Manager <email address hidden> on 2011-11-18

(jelmer) Add HPSS call ``BzrDir.destroy_repository``. (Jelmer Vernooij)

6280. By Patch Queue Manager <email address hidden> on 2011-11-18

(jelmer) Add HPSS call for ``BzrDir.has_workingtree``. (Jelmer Vernooij)

6281. By Patch Queue Manager <email address hidden> on 2011-11-21

(mbp) restore old api name bzrlib.tests.Features to unbreak some plugins
 (Martin Pool)

6282. By Patch Queue Manager <email address hidden> on 2011-11-21

(jelmer) Improve parsing of commit times in --commit-time argument for ``bzr
 commit``. (Matt Giuca)

6283. By Patch Queue Manager <email address hidden> on 2011-11-22

(jelmer) Support HPSS calls for config stacks of remote branches and
 bzrdirs. (Jelmer Vernooij)

6284. By Patch Queue Manager <email address hidden> on 2011-11-23

(jelmer) Test the number of HPSS calls for some common opererations. (Jelmer
 Vernooij)

6285. By Patch Queue Manager <email address hidden> on 2011-11-23

(jelmer) Support pickling lazy_regex patterns. (Jelmer Vernooij)

6286. By Patch Queue Manager <email address hidden> on 2011-11-24

(gz) Avoid using URL specific join and split when seperating segment
 parameters (Martin Packman)

6287. By Patch Queue Manager <email address hidden> on 2011-11-24

(gz) Support removing colocated branches in 'bzr rmbranch' (Martin Packman)

6288. By Patch Queue Manager <email address hidden> on 2011-11-24

(gz) Add _PotExporter and other refactorings to export_pot module (Martin
 Packman)

6289. By Patch Queue Manager <email address hidden> on 2011-11-24

(vila) Fix windows test failures around locations.conf handling. (Vincent
 Ladeuil)

6290. By Patch Queue Manager <email address hidden> on 2011-11-24

(jelmer) Add Repository as base class for RemoteRepository. (Jelmer Vernooij)

6291. By Patch Queue Manager <email address hidden> on 2011-11-24

(jelmer) Move patches exceptions to bzrlib.errors. (Jelmer Vernooij)

6292. By Patch Queue Manager <email address hidden> on 2011-11-24

(jelmer) Allow registering custom error handlers for the HPSS remote client.
 (Jelmer Vernooij)

6293. By Patch Queue Manager <email address hidden> on 2011-11-25

(jelmer) Cope with NoSuchRevision errors during ``Repository.gather_stats``
 HPSS call. (Jelmer Vernooij)

6294. By Patch Queue Manager <email address hidden> on 2011-11-25

(jelmer) Deprecate Tree.get_file_by_path. (Jelmer Vernooij)

6295. By Patch Queue Manager <email address hidden> on 2011-11-25

(jelmer) Add ``Repository.all_revision_ids`` HPSS call. (Jelmer Vernooij)

6296. By Patch Queue Manager <email address hidden> on 2011-11-25

(jelmer) Add HPSS call for ``Repository.break_lock`` and
 ``Branch.break_lock``. (Jelmer Vernooij)

6297. By Patch Queue Manager <email address hidden> on 2011-11-25

(jelmer) Add HPSS call for ``Branch.revision_id_to_revno``. (Jelmer Vernooij)

6298. By Patch Queue Manager <email address hidden> on 2011-11-25

(jelmer) Add HPSS call for
 ``VersionedFileRepository.get_serializer_format``. (Jelmer Vernooij)

6299. By Patch Queue Manager <email address hidden> on 2011-11-25

(jelmer) Add HPSS call for ``Repository.destroy_branch``. (Jelmer Vernooij)

6300. By Patch Queue Manager <email address hidden> on 2011-11-25

(jelmer) Add HPSS call for ``Repository.get_physical_lock_status``. (Jelmer
 Vernooij)

6301. By Patch Queue Manager <email address hidden> on 2011-11-25

(jelmer) Add HPSS calls for the write group methods. (Jelmer Vernooij)

6302. By Patch Queue Manager <email address hidden> on 2011-11-25

(gz) Fix style checking testcase for option help (Martin Packman)

6303. By Patch Queue Manager <email address hidden> on 2011-11-25

(gz) Add _ModuleContext to track location in source and other refactorings
 in export_pot (Martin Packman)

6304. By Patch Queue Manager <email address hidden> on 2011-11-25

(gz) Include registry option value switches in help style checking test
 (Martin Packman)

6305. By Patch Queue Manager <email address hidden> on 2011-11-25

(gz) Include registry value switch help text in translation template (Martin
 Packman)

6306. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Add ``Repository.add_signature_text`` HPSS call. (Jelmer Vernooij)

6307. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Mark some more old formats as hidden,
 update format descriptions. (Jelmer Vernooij)

6308. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Support verifying remote signatures without VFS calls. (Jelmer
 Vernooij)

6309. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Fix fallback for RemoteBranch.revision_id_to_dotted_revno,
 and add a test. (Jelmer Vernooij)

6310. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Add HPSS call for ``Repository.pack``. (Jelmer Vernooij)

6311. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Reduce the number of connections made during "bzr branch
 --stacked". (Jelmer Vernooij)

6312. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Print a sensible error message rather than a KeyError with a
 backtrace when a format is unknown. (Jelmer Vernooij)

6313. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Cope with slight differences in number of HPSS call counts for 'bzr
 verify-signatures' test. (Jelmer Vernooij)

6314. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Add a ``Repository.iter_revisions`` HPSS call. (Jelmer Vernooij)

6315. By Patch Queue Manager <email address hidden> on 2011-11-28

(gz) Restore global_state correctly and clean up imports in
 bzrlib.library_state (Martin Packman)

6316. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Add HPSS call for ``Repository.get_signature_text``. (Jelmer
 Vernooij)

6317. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Move control-files-related code from WorkingTree to
 InventoryWorkingTree. (Jelmer Vernooij)

6318. By Patch Queue Manager <email address hidden> on 2011-11-28

(jelmer) Add HPSS call for ``Repository.iter_files_bytes``. (Jelmer Vernooij)

6319. By Patch Queue Manager <email address hidden> on 2011-11-28

(gz) Move merge_type_registry from bzrlib.options to bzrlib.merge (Martin
 Packman)

6320. By Patch Queue Manager <email address hidden> on 2011-11-29

(mbp) bzr selftest tests fail after a configurable timeout (Martin Pool)

6321. By Patch Queue Manager <email address hidden> on 2011-11-29

(mbp) clients reconnect if they get ConnectionReset while trying to send an
 RPC (bug 819604) (Bazaar Developers)

6322. By Patch Queue Manager <email address hidden> on 2011-11-29

(vila) Smarter .po file merging with merge hook as a plugin: po_merge.
 (Vincent Ladeuil)

6323. By Patch Queue Manager <email address hidden> on 2011-11-29

(vila) Smarter .po file merging with merge hook as a plugin: po_merge
 (lazy options). (Vincent Ladeuil)

6324. By Patch Queue Manager <email address hidden> on 2011-11-29

(vila) Fix news entries to avoid confusion. In particular,
 bug #819604 has not landed in older releases yet (Vincent Ladeuil)

6325. By Patch Queue Manager <email address hidden> on 2011-11-29

(jelmer) Allow registering new location aliases. (Jelmer Vernooij)

6326. By Patch Queue Manager <email address hidden> on 2011-11-29

(vila) Fix various typos (Vincent Ladeuil)

6327. By Patch Queue Manager <email address hidden> on 2011-11-29

(gz) Require dulwich when bundling bzr-git with setup.py py2exe (Martin
 Packman)

6328. By Patch Queue Manager <email address hidden> on 2011-11-29

(gz) Remove deprecated parts of bzrlib.errors and other cleanups (Martin
 Packman)

6329. By Patch Queue Manager <email address hidden> on 2011-11-29

(mbp) PackWriter: remove one possibly large string join (bug 890085 incr)
 (Martin Pool)

6330. By Patch Queue Manager <email address hidden> on 2011-11-30

(mbp) Pass specific_files to status hooks (Francis Devereux)

6331. By Patch Queue Manager <email address hidden> on 2011-11-30

(vila) Better deprecation warnings for _CompatabilityThunkFeature based test
 features (Vincent Ladeuil)

6332. By Patch Queue Manager <email address hidden> on 2011-12-01

allow lazily registered hooks to have their names appear in "bzr
 hooks" (bug 894609)

6333. By Patch Queue Manager <email address hidden> on 2011-12-01

(jelmer) Always pass in the tree path to Tree methods when exporting.
 (Jelmer Vernooij)

6334. By Patch Queue Manager <email address hidden> on 2011-12-01

(jelmer) Add HPSS call count tests for 'bzr co',
 'bzr co --lightweight' and 'bzr commit' in a lightweight checkout. (Jelmer
 Vernooij)

6335. By Patch Queue Manager <email address hidden> on 2011-12-01

(jelmer) Add --uncommitted option to 'bzr export'. (Jelmer Vernooij)

6336. By Patch Queue Manager <email address hidden> on 2011-12-01

(jelmer) Unhide the dpush command. (Martin Packman)

6337. By Patch Queue Manager <email address hidden> on 2011-12-02

(vila) Properly synchronize connection thread start with test server main
 thread. (Vincent Ladeuil)

6338. By Patch Queue Manager <email address hidden> on 2011-12-02

(jelmer) Deprecate and remove uses of
 ``RevisionSpec.wants_revision_history``. (Jelmer Vernooij)

6339. By Patch Queue Manager <email address hidden> on 2011-12-02

(vila) Don't show shelf info when status is asked about specific
 files (Francis Devereux)

6340. By Patch Queue Manager <email address hidden> on 2011-12-05

(gz) Propogate site.USER_BASE in selftest run_bzr_subprocess to keep the
 same sys.path (Martin Packman)

6341. By Patch Queue Manager <email address hidden> on 2011-12-05

(gz) Avoid using run_bzr_subprocess in a bt.test_sftp_transport test (Martin
 Packman)

6342. By Patch Queue Manager <email address hidden> on 2011-12-05

(gz) Add is_environment_error() to check if exceptions are due to the
 process environment (Martin Packman)

6343. By Patch Queue Manager <email address hidden> on 2011-12-05

(jelmer) Remove the HistoryMissing exception. (Jelmer Vernooij)

6344. By Patch Queue Manager <email address hidden> on 2011-12-05

(gz) Add get_message_encoding() for reading encoding name from LC_MESSAGE
 setting (Martin Packman)

6345. By Patch Queue Manager <email address hidden> on 2011-12-05

(gz) Merge 2.4 into bzr.dev (Martin Packman)

6346. By Patch Queue Manager <email address hidden> on 2011-12-06

(gz) Ensure PathsNotVersionedError is only ever given unicode paths (Martin
 Packman)

6347. By Patch Queue Manager <email address hidden> on 2011-12-06

(vila) Simple explanations about how to use the new config options. (Bazaar
 Developers)

6348. By Patch Queue Manager <email address hidden> on 2011-12-06

(jelmer) Move search result handling into a separate module. (Jelmer
 Vernooij)

6349. By Patch Queue Manager <email address hidden> on 2011-12-06

(jelmer) Fix HPSS call count for 'bzr co --lightweight' and add more HPSS
 call count tests. (Jelmer Vernooij)

6350. By Patch Queue Manager <email address hidden> on 2011-12-08

(vila) Release 2.5b4 (Vincent Ladeuil)

6351. By Patch Queue Manager <email address hidden> on 2011-12-08

(vila) Open 2.5b5 for bug fixes (Vincent Ladeuil)

6352. By Patch Queue Manager <email address hidden> on 2011-12-09

(vila) '\n' cannot be part of a valid config option reference. (Vincent
 Ladeuil)

6353. By Patch Queue Manager <email address hidden> on 2011-12-11

(jelmer) Add a common base class BzrDirMetaComponentFormat for all formats
 living in bzr meta directories. (Jelmer Vernooij)

6354. By Patch Queue Manager <email address hidden> on 2011-12-11

(jelmer) Add HPSS call for ``Repository.reconcile``. (Jelmer Vernooij)

6355. By Patch Queue Manager <email address hidden> on 2011-12-12

(vila) Allow callables to be used to specify config option default values
 (Vincent Ladeuil)

6356. By Patch Queue Manager <email address hidden> on 2011-12-12

(Neil Martinsen-Burrell) Add ControlDir.get_branches.

6357. By Patch Queue Manager <email address hidden> on 2011-12-12

(jelmer) Add -p option to 'bzr mkdir'. (Jelmer Vernooij)

6358. By Patch Queue Manager <email address hidden> on 2011-12-12

(gz) Add get_environ_unicode for accessing variables without mbcs mangling
 on windows (Martin Packman)

6359. By Patch Queue Manager <email address hidden> on 2011-12-12

(gz) Keep duplicates till later in the translation template generation for
 added context (Martin Packman)

6360. By Patch Queue Manager <email address hidden> on 2011-12-12

(jelmer) Don't complain about directory already existing in 'mkdir -p'.
 (Martin Packman)

6361. By Patch Queue Manager <email address hidden> on 2011-12-12

(jelmer) Avoid loading XML modules when importing CHKSerializer. (Jelmer
 Vernooij)

6362. By Patch Queue Manager <email address hidden> on 2011-12-12

(jelmer) Deal with the obsolete_packs directory being removed from under us.
 (Jelmer Vernooij)

6363. By Patch Queue Manager <email address hidden> on 2011-12-14

(jelmer) Remove support for the .bzr/branch/email file. (Jelmer Vernooij)

6364. By Patch Queue Manager <email address hidden> on 2011-12-14

(vila) Fix typo in release notes (Vincent Ladeuil)

6365. By Patch Queue Manager <email address hidden> on 2011-12-14

(jelmer) Add ContainsNoVfsCalls matcher. (Jelmer Vernooij)

6366. By Patch Queue Manager <email address hidden> on 2011-12-14

(gz) Fix bzr mv error report on bzr mv of a removed non-ascii file (Martin
 Packman)

6367. By Patch Queue Manager <email address hidden> on 2011-12-14

(gz) Override Py_FileSystemDefaultEncoding to utf-8 from ascii for the bzr
 script (Martin Packman)

6368. By Patch Queue Manager <email address hidden> on 2011-12-14

(jelmer) Only make a single connection to the submit branch in 'bzr send'.
 (Jelmer Vernooij)

6369. By Patch Queue Manager <email address hidden> on 2011-12-14

(gz) Add path_from_environ and clean ups to osutils and win32utils (Martin
 Packman)

6370. By Patch Queue Manager <email address hidden> on 2011-12-14

(jelmer) Switch the commit code over to use config stacks. (Bazaar
 Developers)

6371. By Patch Queue Manager <email address hidden> on 2011-12-14

(jelmer) Add HPSS call for ``BzrDir.checkout_metadir``. (Jelmer Vernooij)

6372. By Patch Queue Manager <email address hidden> on 2011-12-14

(jelmer) Add HPSS call for retrieving inventories. (Jelmer Vernooij)

6373. By Patch Queue Manager <email address hidden> on 2011-12-15

(vila) Remove spurious spaces (Vincent Ladeuil)

6374. By Patch Queue Manager <email address hidden> on 2011-12-15

(jelmer) Fix GPG signing key to default to user identity again. (Vincent
 Ladeuil)

6375. By Patch Queue Manager <email address hidden> on 2011-12-15

(jelmer) BZR_EMAIL should be respected for the 'email' config option default
 value. (Jelmer Vernooij)

6376. By Patch Queue Manager <email address hidden> on 2011-12-15

(gz) Add missing release notes for previously landed branches (Martin
 Packman)

6377. By Patch Queue Manager <email address hidden> on 2011-12-15

(vila) Relax constraints on bzr log -rX..Y by falling back to the slower
 implementation when needed (Vincent Ladeuil)

6378. By Patch Queue Manager <email address hidden> on 2011-12-15

(vila) More documentation about the new config implementation. (Vincent
 Ladeuil)

6379. By Patch Queue Manager <email address hidden> on 2011-12-16

(jelmer) Convert 'Branch.append_revisions_only' over to using config stacks.
 (Jelmer Vernooij)

6380. By Patch Queue Manager <email address hidden> on 2011-12-18

(jelmer) Avoid always importing termios and tty in bzrlib.osutils. (Jelmer
 Vernooij)

6381. By Patch Queue Manager <email address hidden> on 2011-12-19

(jelmer) Lazily load bzrlib.filters.eol. (Jelmer Vernooij)

6382. By Patch Queue Manager <email address hidden> on 2011-12-19

(jelmer) In RevisionSpec.__nonzero__, only check the revision id,
 not the revision number. (Jelmer Vernooij)

6383. By Patch Queue Manager <email address hidden> on 2011-12-19

(jelmer) Include quote() and unquote() directly in bzrlib.urlutils. (Jelmer
 Vernooij)

6384. By Patch Queue Manager <email address hidden> on 2011-12-19

(jelmer) Always import bzrlib.bzrdir in bzrlib.workingtree. (Jelmer Vernooij)

6385. By Patch Queue Manager <email address hidden> on 2011-12-19

(jelmer) Only allow absolute imports using lazy_import. (Jelmer Vernooij)

6386. By Patch Queue Manager <email address hidden> on 2011-12-19

(jelmer) Use the absolute_import feature everywhere in bzrlib,
 and add a source test to make sure it's used everywhere. (Jelmer Vernooij)

6387. By Patch Queue Manager <email address hidden> on 2011-12-19

(vila) Migrate add.maximum_file_size configuration option. (Vincent Ladeuil)

6388. By Patch Queue Manager <email address hidden> on 2011-12-19

(jelmer) Make the check to see whether executable bits are supported
 per-workingtree, rather than global. (Jelmer Vernooij)

6389. By Patch Queue Manager <email address hidden> on 2011-12-20

(jelmer) Remove some merge methods deprecated in bzr 2.1. (Jelmer Vernooij)

6390. By Patch Queue Manager <email address hidden> on 2011-12-20

(jelmer) Fix the "bzr bash-completion" command after migration to absolute
 paths. (Jelmer Vernooij)

6391. By Patch Queue Manager <email address hidden> on 2011-12-20

(jelmer) Convert bzrlib.smtp_connection to use config stacks. (Jelmer
 Vernooij)

6392. By Patch Queue Manager <email address hidden> on 2011-12-20

(gz) Small fix to plugin docstring and formatting (Benjamin Peterson)

6393. By Patch Queue Manager <email address hidden> on 2011-12-21

(gz) Fix mix up of path encodings in dirstate when updating children of a
 moved directory (Rory Yorke)

6394. By Patch Queue Manager <email address hidden> on 2011-12-21

(gz) Fix deprecations of win32utils path function unicode wrappers (Martin
 Packman)

6395. By Patch Queue Manager <email address hidden> on 2011-12-21

(jelmer) Add pre_merge and post_merge hooks in Merger.hooks. (Jelmer
 Vernooij)

6396. By Patch Queue Manager <email address hidden> on 2011-12-21

(jelmer) Indicate current branch in 'bzr branches'. (Jelmer Vernooij)

6397. By Patch Queue Manager <email address hidden> on 2011-12-21

(vila) Provides config.MemoryStack to simplify configuration setup in tests
 (Vincent Ladeuil)

6398. By Patch Queue Manager <email address hidden> on 2011-12-21

(jelmer) If no location is specified to "bzr push" or remembered,
 mention the parent alias to the user. (Jelmer Vernooij)

6399. By Patch Queue Manager <email address hidden> on 2011-12-21

(vila) Migrate branch location options to config stacks. (Vincent Ladeuil)

6400. By Patch Queue Manager <email address hidden> on 2011-12-21

(vila) Migrate branch location options to config stacks. (Vincent Ladeuil)

6401. By Patch Queue Manager <email address hidden> on 2011-12-21

(vila) Stores allow Stacks to control when values are quoted/unquoted
 (Vincent Ladeuil)

6402. By Patch Queue Manager <email address hidden> on 2011-12-21

(vila) bzr config displays [DEFAULT] for bazaar.conf (Vincent Ladeuil)

6403. By Patch Queue Manager <email address hidden> on 2011-12-22

(jelmer) Use real commit object in RemoteRepository.get_commit_builder.
 (Jelmer Vernooij)

6404. By Patch Queue Manager <email address hidden> on 2011-12-22

(jelmer) Add support for feature flags in bzr formats. (Jelmer Vernooij)

6405. By Patch Queue Manager <email address hidden> on 2011-12-24

(jelmer) Add a post_connect hook for transports. (Bazaar Developers)

6406. By Patch Queue Manager <email address hidden> on 2011-12-29

(jelmer) Fix the shell-complete command. (Jelmer Vernooij)

6407. By Patch Queue Manager <email address hidden> on 2011-12-30

(jelmer) Check number of connections opened during various blackbox tests.
 (Jelmer Vernooij)

6408. By Patch Queue Manager <email address hidden> on 2011-12-30

(jelmer) Add {Repository, Branch, WorkingTree,
 BzrDir}.update_feature_flags methods. (Jelmer Vernooij)

6409. By Patch Queue Manager <email address hidden> on 2012-01-02

(vila) Migrate the 'branch.fetch_tags' option to config stacks. (Vincent
 Ladeuil)

6410. By Patch Queue Manager <email address hidden> on 2012-01-02

(vila) TestWSGI should use TestCaseInTempDir (Vincent Ladeuil)

6411. By Patch Queue Manager <email address hidden> on 2012-01-03

(vila) Configuration option value can be overridden by os environ variables
 (Vincent Ladeuil)

6412. By Patch Queue Manager <email address hidden> on 2012-01-03

(gz) No longer try reinvoking with a newer python version from the bzr
 script (Martin Packman)

6413. By Patch Queue Manager <email address hidden> on 2012-01-03

(vila) Robustly unquote configuration values (Vincent Ladeuil)

6414. By Patch Queue Manager <email address hidden> on 2012-01-03

(gz) Remove needless and breakage causing relative import of win32utils in
 osutils.get_host_name (Bazaar Developers)

6415. By Patch Queue Manager <email address hidden> on 2012-01-03

(vila) Cleanup the configCommandLineStore implementation. (Vincent Ladeuil)

6416. By Patch Queue Manager <email address hidden> on 2012-01-03

(jelmer) Add an "other_branch" argument to Merge3Merger.
 (Jelmer Vernooij)

6417. By Patch Queue Manager <email address hidden> on 2012-01-03

(jelmer) Simplify handling of server probing. (Jelmer Vernooij)

6418. By Patch Queue Manager <email address hidden> on 2012-01-03

(jelmer) Fix -r argument for 'bzr version-info' to actually use specified
 tree everywhere. (Jelmer Vernooij)

6419. By Patch Queue Manager <email address hidden> on 2012-01-03

(jelmer) Distinguish between working tree and this tree in merge. (Jelmer
 Vernooij)

6420. By Patch Queue Manager <email address hidden> on 2012-01-03

(jelmer) Add some more entries to the whatsnew for bzr 2.5. (Jelmer Vernooij)

6421. By Patch Queue Manager <email address hidden> on 2012-01-03

(jelmer) Add RemoteRepository.add_revision. (Jelmer Vernooij)

6422. By Patch Queue Manager <email address hidden> on 2012-01-04

(gz) Fix bt.test_osutils and bt.test_config windows fallout from recent
 changes (Martin Packman)

6423. By Patch Queue Manager <email address hidden> on 2012-01-04

(gz) Simplify wrapping of os.urandom done by osutils (Martin Packman)

6424. By Patch Queue Manager <email address hidden> on 2012-01-04

(jelmer) Remove config argument from VersionedFileRepository.add_revision()
 (Jelmer Vernooij)

6425. By Patch Queue Manager <email address hidden> on 2012-01-05

(vila) Provide Store.save_changes() to allow configuration store to be saved
 incrementally. (Vincent Ladeuil)

6426. By Patch Queue Manager <email address hidden> on 2012-01-05

(gz) Make lazy imports proxy by default so that concurrent resolution is
 robust (Martin Packman)

6427. By Patch Queue Manager <email address hidden> on 2012-01-05

(gz) Simplify osutils.get_user_encoding and remove implicit setlocale calls
 from the function (Martin Packman)

6428. By Patch Queue Manager <email address hidden> on 2012-01-05

(vila) Migrate more branch config options to config stacks. (Vincent Ladeuil)

6429. By Patch Queue Manager <email address hidden> on 2012-01-05

(gz) Update dirstate now that osutils._fs_enc will be a python codec name
 (Martin Packman)

6430. By Patch Queue Manager <email address hidden> on 2012-01-05

(gz) Remove tools/http_client.py (Martin Packman)

6431. By Patch Queue Manager <email address hidden> on 2012-01-05

(gz) Remove bzrlib/util/effbot/ package (Martin Packman)

6432. By Patch Queue Manager <email address hidden> on 2012-01-05

(gz) Remove bzrlib/util/elementtree/ package (Martin Packman)

6433. By Patch Queue Manager <email address hidden> on 2012-01-05

(jelmer) Keep tags for pending merges while uncommitting (Jelmer Vernooij)

6434. By Patch Queue Manager <email address hidden> on 2012-01-05

(vila) Cleanup some blackbox tests from obsolete idioms. (Vincent Ladeuil)

6435. By Patch Queue Manager <email address hidden> on 2012-01-06

(gz) Avoid failure in bb.test_commit from unrelated bug with NFD filenames
 on OSX (Martin Packman)

6436. By Patch Queue Manager <email address hidden> on 2012-01-06

(jelmer) Add post_build_tree hook to MutableTree. (Jelmer Vernooij)

6437. By Patch Queue Manager <email address hidden> on 2012-01-09

(vila) Provide a config section matcher respecting the file order. (Vincent
 Ladeuil)

6438. By Patch Queue Manager <email address hidden> on 2012-01-16

(vila) Open trunk as 2.6dev1 (Vincent Ladeuil)

6439. By Patch Queue Manager <email address hidden> on 2012-01-16

(vila) Merge 2.5 into trunk (Vincent Ladeuil)

6440. By Patch Queue Manager <email address hidden> on 2012-01-18

(vila) Ensure people get an easy access to the release details from
 announcements. (Vincent Ladeuil)

6441. By Patch Queue Manager <email address hidden> on 2012-01-18

(jelmer) Add pre_command and post_command hooks. (Jelmer Vernooij)

6442. By Patch Queue Manager <email address hidden> on 2012-01-19

(jelmer) Actually fetch revisions when branching into existing bzrdir.
 (Jelmer Vernooij)

6443. By Patch Queue Manager <email address hidden> on 2012-01-20

(jelmer) Factor out finding of sibling branches from 'bzr switch'. (Jelmer
 Vernooij)

6444. By Patch Queue Manager <email address hidden> on 2012-01-23

(jelmer) Merge the 2.5 series branch. (Jelmer Vernooij)

6445. By Patch Queue Manager <email address hidden> on 2012-01-23

(jelmer) Change the default HTTPS implementation from pycurl to urllib.
 (Jelmer Vernooij)

6446. By Patch Queue Manager <email address hidden> on 2012-01-26

(vila) Merge 2.5 into trunk (Vincent Ladeuil)

6447. By Patch Queue Manager <email address hidden> on 2012-01-27

(jelmer) Avoid the use of inventories in a few more places. (Jelmer Vernooij)

6448. By Patch Queue Manager <email address hidden> on 2012-01-27

(jelmer) Support passing in file ids as tuples to the Tree API. (Jelmer
 Vernooij)

6449. By Patch Queue Manager <email address hidden> on 2012-01-27

(jelmer) Use 'development-subtree' format rather than
 'dirstate-with-subtree' in tests. (Jelmer Vernooij)

6450. By Patch Queue Manager <email address hidden> on 2012-01-28

(jelmer) Avoid caching complete files in memory when accessing over HTTP.
 (Jelmer Vernooij)

6451. By Patch Queue Manager <email address hidden> on 2012-01-28

(jelmer) Merge the 2.5 branch. (Jelmer Vernooij)

6452. By Patch Queue Manager <email address hidden> on 2012-01-28

(jelmer) Use config stacks for 'suppress_warnings' configuration option.
 (Jelmer Vernooij)

6453. By Patch Queue Manager <email address hidden> on 2012-01-28

(jelmer) Add bzrlib.config.RegistryOption. (Jelmer Vernooij)

6454. By Patch Queue Manager <email address hidden> on 2012-01-28

(jelmer) Add WorkingTree.get_config_stack(). (Jelmer Vernooij)

6455. By Patch Queue Manager <email address hidden> on 2012-01-28

(jelmer) Use config stacks for ``bzr.transform.orphan_policy``. (Jelmer
 Vernooij)

6456. By Patch Queue Manager <email address hidden> on 2012-01-30

(jelmer) Migrate 'validate_signatures_in_log' to config stacks. (Jelmer
 Vernooij)

6457. By Patch Queue Manager <email address hidden> on 2012-01-31

(vila) Fix release notes so we can release 2.5b6 before 2.5.0 (Vincent
 Ladeuil)

6458. By Patch Queue Manager <email address hidden> on 2012-02-01

(vila) Merge 2.5 branch (Vincent Ladeuil)

6459. By Patch Queue Manager <email address hidden> on 2012-02-01

(gz) Add osutils._get_home_dir function (Martin Packman)

6460. By Patch Queue Manager <email address hidden> on 2012-02-02

(jelmer) Use config stacks for 'mail_client' configuration option. (Jelmer
 Vernooij)

6461. By Patch Queue Manager <email address hidden> on 2012-02-02

(jelmer) Fix a typo in tests docstring. (Samuel Bronson)

6462. By Patch Queue Manager <email address hidden> on 2012-02-03

(vila) Merge 2.5 branch (Vincent Ladeuil)

6463. By Patch Queue Manager <email address hidden> on 2012-02-06

(jelmer) Use config stacks in a few more places. (Jelmer Vernooij)

6464. By Patch Queue Manager <email address hidden> on 2012-02-07

(jelmer) Rename Tree.inventory to Tree.root_inventory. (Jelmer Vernooij)

6465. By Patch Queue Manager <email address hidden> on 2012-02-07

(jelmer) Migrate the 'bugtracker' configuration setting to config stacks.
 (Jelmer Vernooij)

6466. By Patch Queue Manager <email address hidden> on 2012-02-07

(jelmer) Migrate launchpad plugin configuration to config stacks API.
 (Jelmer Vernooij)

6467. By Patch Queue Manager <email address hidden> on 2012-02-14

(vila) Avoid invalid range access errors on whole files when using http
 transport (Vincent Ladeuil)

6468. By Patch Queue Manager <email address hidden> on 2012-02-14

(vila) Cache the branch config store to avoid useless IOs. (Vincent Ladeuil)

6469. By Patch Queue Manager <email address hidden> on 2012-02-18

(jelmer) Merge the 2.5 branch. (Jelmer Vernooij)

6470. By Patch Queue Manager <email address hidden> on 2012-02-20

(jelmer) Avoid direct access of tree inventories in a couple more places.
 (Jelmer Vernooij)

6471. By Patch Queue Manager <email address hidden> on 2012-02-20

(vila) Fix RegistryOption display in bzr config output (Vincent Ladeuil)

6472. By Patch Queue Manager <email address hidden> on 2012-02-22

(jelmer) Use inventories directly in fewer places. (Jelmer Vernooij)

6473. By Patch Queue Manager <email address hidden> on 2012-02-23

(jelmer) Merge bzr/2.5. (Jelmer Vernooij)

6474. By Patch Queue Manager <email address hidden> on 2012-02-23

(jelmer) Use Tree.iter_children() in a couple more places. (Jelmer Vernooij)

6475. By Patch Queue Manager <email address hidden> on 2012-02-24

(vila) Merge 2.5 branch after 2.5.0 freeze and 2.5.1 opening (Vincent
 Ladeuil)

6476. By Patch Queue Manager <email address hidden> on 2012-02-25

(jelmer) Update documentation to mention command hooks landed in bzr 2.6
 rather than 2.5. (Brian de Alwis)

6477. By Patch Queue Manager <email address hidden> on 2012-02-27

(gz) Merge 2.5 for fixes to texinfo doc script and btree tests (Martin
 Packman)

6478. By Patch Queue Manager <email address hidden> on 2012-02-27

(gz) Merge 2.5 for one more test fix with newer zlib (Martin Packman)

6479. By Patch Queue Manager <email address hidden> on 2012-03-04

(jelmer) Add --link-bug option to 'bzr lp-propose'. (Ross Lagerwall)

6480. By Patch Queue Manager <email address hidden> on 2012-03-04

(jelmer) Split the --port option into --listen and --port. (Ross Lagerwall)

6481. By Patch Queue Manager <email address hidden> on 2012-03-06

(jelmer) Support removing colocated branches in 'bzr rmbranch'. (Jelmer
 Vernooij)

6482. By Patch Queue Manager <email address hidden> on 2012-03-06

(jelmer) Require --force to remove active branches in 'bzr rmbranch'.
 (Jelmer Vernooij)

6483. By Patch Queue Manager <email address hidden> on 2012-03-06

(jelmer) Make "bzr branches" support our shared-repo style of "sibling
 branches" too. (Jelmer Vernooij)

6484. By Patch Queue Manager <email address hidden> on 2012-03-06

(jelmer) Add -N alias for 'bzr add --no-recurse'. (Jelmer Vernooij)

6485. By Patch Queue Manager <email address hidden> on 2012-03-06

(jelmer) Implement bzrlib.config.Option.get_help_topic(). (Jelmer Vernooij)

6486. By Patch Queue Manager <email address hidden> on 2012-03-06

(jelmer) Use bzrlib.controldir for generic access to control directories,
 rather than bzrlib.bzrdir. (Jelmer Vernooij)

6487. By Patch Queue Manager <email address hidden> on 2012-03-08

(abentley) Add tests for config/config stack bugs. (Aaron Bentley)

6488. By Patch Queue Manager <email address hidden> on 2012-03-08

(vila) This turns config option expansion on by default. (Vincent Ladeuil)

6489. By Patch Queue Manager <email address hidden> on 2012-03-09

(vila) Fix the forgotten reference to what's new as part of the 2.6
 series initialization. (Vincent Ladeuil)

6490. By Patch Queue Manager <email address hidden> on 2012-03-09

(vila) Fix one more reference to what's new as part of the 2.6 series
 initialization. (Vincent Ladeuil)

6491. By Patch Queue Manager <email address hidden> on 2012-03-09

(jelmer) Remove some deprecation code in 'bzr serve'. (Jelmer Vernooij)

6492. By Patch Queue Manager <email address hidden> on 2012-03-12

(vila) More releasing instructions updates from 2.5.0 release. (Vincent
 Ladeuil)

6493. By Patch Queue Manager <email address hidden> on 2012-03-12

(vila) Merge 2.5 branch (Vincent Ladeuil)

6494. By Patch Queue Manager <email address hidden> on 2012-03-12

(jelmer) Various fixes for 'bzr verify-signatures'. (Jelmer Vernooij)

6495. By Patch Queue Manager <email address hidden> on 2012-03-12

(jelmer) Reintroduce support for passing lists to Tree.path2id(). (Jelmer
 Vernooij)

6496. By Patch Queue Manager <email address hidden> on 2012-03-12

(jelmer) Lazily load launchpad plugin commands. (Jelmer Vernooij)

6497. By Patch Queue Manager <email address hidden> on 2012-03-12

(jelmer) Allow control directories to not support branch names containing
 slashes. (Jelmer Vernooij)

6498. By Patch Queue Manager <email address hidden> on 2012-03-12

(gz) Implement osutils._rename_wrap_exception for recording both filenames
 in the error (Ross Lagerwall)

6499. By Patch Queue Manager <email address hidden> on 2012-03-13

(vila) Merge 2.5 branch including bugfix for #940164 and #944696
 (Vincent Ladeuil)

6500. By Patch Queue Manager <email address hidden> on 2012-03-14

(jelmer) Properly format apostrophes in manual page. (Jelmer Vernooij)

6501. By Patch Queue Manager <email address hidden> on 2012-03-14

(vila) Remove some code deprecated in series older than 2.4 (inclusive)
 (Vincent Ladeuil)

6502. By Patch Queue Manager <email address hidden> on 2012-03-14

(gz) Remove long-skipped bt.per_branch.test_bound_sftp tests (Martin Packman)

6503. By Patch Queue Manager <email address hidden> on 2012-03-14

(jelmer) Remove Branch.revision_history() and Branch.set_revision_history().
 (Jelmer Vernooij)

6504. By Patch Queue Manager <email address hidden> on 2012-03-14

(jelmer) Prevent command description lines from being interpreted as a roff
 macro when they start with a dot. (Jelmer Vernooij)

6505. By Patch Queue Manager <email address hidden> on 2012-03-15

(vila) Release 2.6b1 (Vincent Ladeuil)

6506. By Patch Queue Manager <email address hidden> on 2012-03-15

(vila) Open 2.6b2 (Vincent Ladeuil)

6507. By Patch Queue Manager <email address hidden> on 2012-03-15

(jelmer) Document launchpad commands in bzr(1) manpage. (Jelmer Vernooij)

6508. By Patch Queue Manager <email address hidden> on 2012-03-15

(vila) Merge 2.5 branch including fix for bug #956027 (Vincent
 Ladeuil)

6509. By Patch Queue Manager <email address hidden> on 2012-03-16

(jelmer) Generate environment variables section in bzr(1) from standard list
 of environment variables. (Jelmer Vernooij)

6510. By Patch Queue Manager <email address hidden> on 2012-03-16

(jelmer) Fix a typo: extention -> extension. (Jelmer Vernooij)

6511. By Patch Queue Manager <email address hidden> on 2012-03-16

(vila) Ensures the format registry is not empty when generating docs for
 sphinx (Vincent Ladeuil)

6512. By Patch Queue Manager <email address hidden> on 2012-03-28

(vila) Properly share mutable config sections and save the branch config
 only during the final unlock (Vincent Ladeuil)

6513. By Patch Queue Manager <email address hidden> on 2012-03-29

(gz) Merge 2.4 for feature flag conflict resolution and _Win32Stat fix
 (Martin Packman)

6514. By Patch Queue Manager <email address hidden> on 2012-03-30

(jelmer) Tweak the help string for 'bzr revert'. (Jelmer Vernooij)

6515. By Patch Queue Manager <email address hidden> on 2012-03-30

(jelmer) Consistently use 127.0.0.1 for setting up a blackbox server and
 connecting to it. (Jelmer Vernooij)

6516. By Patch Queue Manager <email address hidden> on 2012-03-30

(jelmer) Add co: directory service. (Jelmer Vernooij)

6517. By Patch Queue Manager <email address hidden> on 2012-03-30

(jelmer) Deprecate {lazy_,}register_filter_stack_map. (Jelmer Vernooij)

6518. By Patch Queue Manager <email address hidden> on 2012-04-02

(jelmer) Add a specification for nested trees. (Jelmer Vernooij)

6519. By Patch Queue Manager <email address hidden> on 2012-04-02

(jelmer) Add Tree.iter_child_entries(). (Jelmer Vernooij)

6520. By Patch Queue Manager <email address hidden> on 2012-04-10

(jelmer) Implement ResponseFile.readline. (Jelmer Vernooij)

6521. By Patch Queue Manager <email address hidden> on 2012-04-16

(jelmer) Add tag information to the output of bzr missing. (Neil
 Martinsen-Burrell)

6522. By Patch Queue Manager <email address hidden> on 2012-04-16

(jelmer) Add --overwrite-tags option to push and pull. (Jelmer Vernooij)

6523. By Patch Queue Manager <email address hidden> on 2012-04-19

(vila) Avoid test sphinx-related failures now that we don't have direct
 sphinx anymore. (Vincent Ladeuil)

6524. By Patch Queue Manager <email address hidden> on 2012-05-16

(vila) Fix some test isolation issues when random env vars are used.
 (Vincent Ladeuil)

6525. By Patch Queue Manager <email address hidden> on 2012-06-18

(jelmer) Merge 2.5. (Jelmer Vernooij)

6526. By Patch Queue Manager <email address hidden> on 2012-06-20

(abentley) Add branchname config variable (Aaron Bentley)

6527. By Patch Queue Manager <email address hidden> on 2012-06-26

(jelmer) Remove deprecated annotate_file function. (Jelmer Vernooij)

6528. By Patch Queue Manager <email address hidden> on 2012-06-26

(jelmer) Remove deprecated register_format. (Jelmer Vernooij)

6529. By Patch Queue Manager <email address hidden> on 2012-06-26

(jelmer) Remove deprecated Repository.iter_reverse_revision_history. (Jelmer
 Vernooij)

6530. By Patch Queue Manager <email address hidden> on 2012-06-26

(jelmer) Remove deprecated register_format. (Jelmer Vernooij)

6531. By Patch Queue Manager <email address hidden> on 2012-06-26

(jelmer) Remove deprecated Branch.import_last_revision. (Jelmer Vernooij)

6532. By Patch Queue Manager <email address hidden> on 2012-07-05

(jameinel) Merge the 2.5 branch. (Jelmer Vernooij)

6533. By Patch Queue Manager <email address hidden> on 2012-07-05

(jameinel) Remove deprecated Repository.get_ancestry(). (Jelmer Vernooij)

6534. By Patch Queue Manager <email address hidden> on 2012-07-05

(jameinel) Properly save ``branch.conf`` changes when unlocking a
 BzrBranch4. (Vincent Ladeuil)

6535. By Patch Queue Manager <email address hidden> on 2012-07-09

(jelmer) Move the old branch format 5 into a separate module. (Jelmer
 Vernooij)

6536. By Patch Queue Manager <email address hidden> on 2012-07-10

(vila) Release 2.6b2 (Vincent Ladeuil)

6537. By Patch Queue Manager <email address hidden> on 2012-07-10

(vila) Open 2.6b3 (Vincent Ladeuil)

6538. By Patch Queue Manager <email address hidden> on 2012-07-11

(vila) Tweak release manager notes. (Vincent Ladeuil)

6539. By Patch Queue Manager <email address hidden> on 2012-07-20

(jelmer) Add two more topics to the ``See also`` part of 'bzr help
 checkout'. (Wouter van Heyst)

6540. By Patch Queue Manager <email address hidden> on 2012-07-23

(abentley) switch --store stores uncommitted changes in branch (Aaron
 Bentley)

6541. By Patch Queue Manager <email address hidden> on 2012-07-23

(abentley) lp-find-proposal now ignores branch. (Aaron Bentley)

6542. By Patch Queue Manager <email address hidden> on 2012-07-24

(jelmer) Only read the first line from /etc/mailname. (Haw Loeung)

6543. By Patch Queue Manager <email address hidden> on 2012-07-25

(jelmer) Suggest running 'bzr reconcile --canonicalize-chks' when hitting
 missing chk root reference errors. (Jelmer Vernooij)

6544. By Patch Queue Manager <email address hidden> on 2012-07-28

(gz) Stop complaining about https certificates more than once (Marius Kruger)

6545. By Patch Queue Manager <email address hidden> on 2012-07-28

(gz) Create working tree at specified revision when doing a local push
 (Martin Packman)

6546. By Patch Queue Manager <email address hidden> on 2012-07-28

(gz) Add Base64CredentialStore for authentication.conf password obfuscation
 (Martin Packman)

6547. By Patch Queue Manager <email address hidden> on 2012-07-28

(gz) Add option to specify how much context bzr should use in diffs (Paul
 Nixon)

6548. By Patch Queue Manager <email address hidden> on 2012-07-31

(gz) Remove deprecated --force option from remove (Martin Packman)

6549. By Patch Queue Manager <email address hidden> on 2012-08-01

(vila) Merge 2.5 including fix for bug #957049 (Vincent Ladeuil)

6550. By Patch Queue Manager <email address hidden> on 2012-08-02

(vila) Remove dead code bzrlib.filters.ContentFilterContext.config(): wasn't
 tested nor used. (Vincent Ladeuil)

6551. By Patch Queue Manager <email address hidden> on 2012-08-02

(vila) Fix bug in filter_tree.ContentFilterTree.get_file_text (Vincent
 Ladeuil)

6552. By Patch Queue Manager <email address hidden> on 2012-08-03

(vila) Restores the HOME check around creating the test safety net (Vincent
 Ladeuil)

6553. By Patch Queue Manager <email address hidden> on 2012-08-09

(vila) Calling super() instead of mentioning the base class in setUp avoid
 mistakes. (Vincent Ladeuil)

6554. By Patch Queue Manager <email address hidden> on 2012-08-23

(vila) Share and cache local config files (Vincent Ladeuil)

6555. By Patch Queue Manager <email address hidden> on 2012-08-23

(jelmer) Merge the grep plugin into the core. (Jelmer Vernooij)

6556. By Patch Queue Manager <email address hidden> on 2012-08-28

(jelmer) Remove compatibility code for python 2.4 for post mortem. (Jelmer
 Vernooij)

6557. By Patch Queue Manager <email address hidden> on 2012-09-05

(gz) Warn rather than erroring if pull --show-base is used without a tree
 (Vincent Ladeuil)

6558. By Patch Queue Manager <email address hidden> on 2012-09-05

(gz) Merge 2.5 (Martin Packman)

6559. By Patch Queue Manager <email address hidden> on 2012-09-14

(jelmer) Merge the ping plugin. (Jelmer Vernooij)

6560. By Patch Queue Manager <email address hidden> on 2012-09-17

(vila) Remove obsolete (and not used anymore) code and its associated tests
 (covered by other tests in test_http.py). (Vincent Ladeuil)

6561. By Patch Queue Manager <email address hidden> on 2012-09-17

(vila) Fix obscure and misleading warning when trying to delete an unknown
 config option. (Vincent Ladeuil)

6562. By Patch Queue Manager <email address hidden> on 2012-09-19

(vila) Clarify option references expansion for `bzr config`. (Vincent
 Ladeuil)

6563. By Patch Queue Manager <email address hidden> on 2012-09-19

(jam) Merge bzr-2.5.2-dev into bzr trunk to get the ConnectionReset
 fixes.

6564. By Patch Queue Manager <email address hidden> on 2012-09-19

(vila) Add a config option for the progress bar type. (Vincent Ladeuil)

6565. By Patch Queue Manager <email address hidden> on 2012-09-20

(vila) Fix bug number (388275) for progress bar config option
 (Vincent Ladeuil)

6566. By Patch Queue Manager <email address hidden> on 2012-09-27

(vila) Add reference to configuration in 'bzr help env-variables' (Robert
 Collins)

6567. By Patch Queue Manager <email address hidden> on 2012-09-28

(vila) Fix typo in an error message from the 'revno' command. (Matthew
 Fuller)

6568. By Patch Queue Manager <email address hidden> on 2012-10-10

(vila) AuthConfig alwaus return user/password as unicode. (Vincent Ladeuil)

6569. By Patch Queue Manager <email address hidden> on 2012-10-11

(vila) Clarify how `mergetool` templates should be used with `bzr config`.
 (Vincent Ladeuil)

6570. By Patch Queue Manager <email address hidden> on 2012-10-14

(jelmer) Fix trivial syntax error in the Japanese docs that breaks with
 docutils 0.9.1. (Jelmer Vernooij)

6571. By Patch Queue Manager <email address hidden> on 2012-10-25

(gz) Set approved revision and vote "Approve" when using lp-propose
 --approve (Jonathan Lange)

6572. By Patch Queue Manager <email address hidden> on 2012-12-10

(vila) Fix LC_ALL=C test failures related to utf8 stderr encoding (Vincent
 Ladeuil)

6573. By Patch Queue Manager <email address hidden> on 2013-02-07

(jameinel) Fix bug #1107464,
 to allow the test suite to pass when python-apport is installed. (Dylan
 McCall)

6574. By Patch Queue Manager <email address hidden> on 2013-05-20

(jameinel) Fix CVE 2013-2009. Avoid allowing multiple wildcards in a single
 SSL cert hostname segment. (Andrew Starr-Bochicchio)

6575. By Patch Queue Manager <email address hidden> on 2013-05-23

(jameinel) Merge bzr/2.5 into trunk. (John A Meinel)

6576. By Patch Queue Manager <email address hidden> on 2013-05-25

(vila) Add __iter__ to http ResponseFile (Vincent Ladeuil)

6577. By Patch Queue Manager <email address hidden> on 2013-05-27

(vila) Empty arguments in EDITOR are now properly preserved. (Vincent
 Ladeuil)

6578. By Patch Queue Manager <email address hidden> on 2013-05-27

(vila) Handle empty quoted strings in command lines and various
 cleanups (Vincent Ladeuil)

6579. By Patch Queue Manager <email address hidden> on 2013-06-24

(jameinel) Merge bzr/2.5 into trunk,
 including the fix for bug #855155 (John A Meinel)

6580. By Patch Queue Manager <email address hidden> on 2013-07-13

(vila) Fix test failure for tuned_gzip. (Vincent Ladeuil)

6581. By Patch Queue Manager <email address hidden> on 2013-07-14

(vila) Make 'bzr version' support utf8 platform names. (Vincent Ladeuil)

6582. By Patch Queue Manager <email address hidden> on 2013-07-27

(vila) Release 2.6.0 (Vincent Ladeuil)

6583. By Patch Queue Manager <email address hidden> on 2013-07-27

(vila) Open trunk again as 2.7b1 (Vincent Ladeuil)

6584. By Patch Queue Manager <email address hidden> on 2013-08-04

(vila) Fix trivial error in tutorial

6585. By Patch Queue Manager <email address hidden> on 2013-08-04

(vila) Merge 2.6 into trunk (Vincent Ladeuil)

6586. By Patch Queue Manager <email address hidden> on 2013-08-05

(vila) Release notes update after 2.6.0 (Vincent Ladeuil)

6587. By Vincent Ladeuil on 2013-08-09

Fix various typos in docstrings. Rename 'buffer' to 'buf' since it's now a python builtin function.

Unmerged revisions

=== modified file 'bzrlib/_annotator_py.py'
--- bzrlib/_annotator_py.py	2010-06-04 03:09:35 +0000
+++ bzrlib/_annotator_py.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/add.py'
--- bzrlib/add.py	2010-06-21 21:50:57 +0000
+++ bzrlib/add.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/annotate.py'
--- bzrlib/annotate.py	2010-06-04 03:09:35 +0000
+++ bzrlib/annotate.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/benchmarks/bench_commit.py'
--- bzrlib/benchmarks/bench_commit.py	2009-03-23 14:59:43 +0000
+++ bzrlib/benchmarks/bench_commit.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@
 
 from bzrlib.benchmarks import Benchmark
 from bzrlib.transport.memory import MemoryServer
-from bzrlib.transport import get_transport
 
 
 class CommitBenchmark(Benchmark):

=== modified file 'bzrlib/breakin.py'
--- bzrlib/breakin.py	2010-06-02 04:50:35 +0000
+++ bzrlib/breakin.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2009 Canonical Ltd
+# Copyright (C) 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/btree_index.py'
--- bzrlib/btree_index.py	2010-03-25 12:32:24 +0000
+++ bzrlib/btree_index.py	2010-06-23 18:34:40 +0000
@@ -33,9 +33,9 @@
     osutils,
     static_tuple,
     trace,
+    transport,
     )
 from bzrlib.index import _OPTION_NODE_REFS, _OPTION_KEY_ELEMENTS, _OPTION_LEN
-from bzrlib.transport import get_transport
 
 
 _BTSIGNATURE = "B+Tree Graph Index 2\n"
@@ -193,7 +193,8 @@
             new_backing_file, size = self._spill_mem_keys_without_combining()
         # Note: The transport here isn't strictly needed, because we will use
         #       direct access to the new_backing._file object
-        new_backing = BTreeGraphIndex(get_transport('.'), '<temp>', size)
+        new_backing = BTreeGraphIndex(transport.get_transport('.'),
+                                      '<temp>', size)
         # GC will clean up the file
         new_backing._file = new_backing_file
         if self._combine_backing_indices:

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2010-06-17 08:53:15 +0000
+++ bzrlib/builtins.py	2010-06-23 18:34:40 +0000
@@ -4920,17 +4920,17 @@
 
     def run(self, port=None, inet=False, directory=None, allow_writes=False,
             protocol=None):
-        from bzrlib.transport import get_transport, transport_server_registry
+        from bzrlib import transport
         if directory is None:
             directory = os.getcwd()
         if protocol is None:
-            protocol = transport_server_registry.get()
+            protocol = transport.transport_server_registry.get()
         host, port = self.get_host_and_port(port)
         url = urlutils.local_path_to_url(directory)
         if not allow_writes:
             url = 'readonly+' + url
-        transport = get_transport(url)
-        protocol(transport, host, port, inet)
+        t = transport.get_transport(url)
+        protocol(t, host, port, inet)
 
 
 class cmd_join(Command):

=== modified file 'bzrlib/filters/eol.py'
--- bzrlib/filters/eol.py	2010-06-02 04:56:07 +0000
+++ bzrlib/filters/eol.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/osutils.py'
--- bzrlib/osutils.py	2010-06-18 10:57:20 +0000
+++ bzrlib/osutils.py	2010-06-23 18:34:40 +0000
@@ -18,7 +18,6 @@
 import os
 import re
 import stat
-from stat import S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE
 import sys
 import time
 import codecs
@@ -27,23 +26,12 @@
 lazy_import(globals(), """
 from datetime import datetime
 import getpass
-from ntpath import (abspath as _nt_abspath,
-                    join as _nt_join,
-                    normpath as _nt_normpath,
-                    realpath as _nt_realpath,
-                    splitdrive as _nt_splitdrive,
-                    )
+import ntpath
 import posixpath
 import shutil
-from shutil import (
-    rmtree,
-    )
 import socket
 import subprocess
 import tempfile
-from tempfile import (
-    mkdtemp,
-    )
 import unicodedata
 
 from bzrlib import (
@@ -304,13 +292,13 @@
     running python.exe under cmd.exe return capital C:\\
     running win32 python inside a cygwin shell returns lowercase c:\\
     """
-    drive, path = _nt_splitdrive(path)
+    drive, path = ntpath.splitdrive(path)
     return drive.upper() + path
 
 
 def _win32_abspath(path):
-    # Real _nt_abspath doesn't have a problem with a unicode cwd
-    return _win32_fixdrive(_nt_abspath(unicode(path)).replace('\\', '/'))
+    # Real ntpath.abspath doesn't have a problem with a unicode cwd
+    return _win32_fixdrive(ntpath.abspath(unicode(path)).replace('\\', '/'))
 
 
 def _win98_abspath(path):
@@ -327,30 +315,30 @@
     #   /path       => C:/path
     path = unicode(path)
     # check for absolute path
-    drive = _nt_splitdrive(path)[0]
+    drive = ntpath.splitdrive(path)[0]
     if drive == '' and path[:2] not in('//','\\\\'):
         cwd = os.getcwdu()
         # we cannot simply os.path.join cwd and path
         # because os.path.join('C:','/path') produce '/path'
         # and this is incorrect
         if path[:1] in ('/','\\'):
-            cwd = _nt_splitdrive(cwd)[0]
+            cwd = ntpath.splitdrive(cwd)[0]
             path = path[1:]
         path = cwd + '\\' + path
-    return _win32_fixdrive(_nt_normpath(path).replace('\\', '/'))
+    return _win32_fixdrive(ntpath.normpath(path).replace('\\', '/'))
 
 
 def _win32_realpath(path):
-    # Real _nt_realpath doesn't have a problem with a unicode cwd
-    return _win32_fixdrive(_nt_realpath(unicode(path)).replace('\\', '/'))
+    # Real ntpath.realpath doesn't have a problem with a unicode cwd
+    return _win32_fixdrive(ntpath.realpath(unicode(path)).replace('\\', '/'))
 
 
 def _win32_pathjoin(*args):
-    return _nt_join(*args).replace('\\', '/')
+    return ntpath.join(*args).replace('\\', '/')
 
 
 def _win32_normpath(path):
-    return _win32_fixdrive(_nt_normpath(unicode(path)).replace('\\', '/'))
+    return _win32_fixdrive(ntpath.normpath(unicode(path)).replace('\\', '/'))
 
 
 def _win32_getcwd():
@@ -395,9 +383,8 @@
 basename = os.path.basename
 split = os.path.split
 splitext = os.path.splitext
-# These were already imported into local scope
-# mkdtemp = tempfile.mkdtemp
-# rmtree = shutil.rmtree
+mkdtemp = tempfile.mkdtemp
+rmtree = shutil.rmtree
 
 MIN_ABS_PATHLENGTH = 1
 
@@ -502,7 +489,7 @@
 def isdir(f):
     """True if f is an accessible directory."""
     try:
-        return S_ISDIR(os.lstat(f)[ST_MODE])
+        return stat.S_ISDIR(os.lstat(f)[stat.ST_MODE])
     except OSError:
         return False
 
@@ -510,14 +497,14 @@
 def isfile(f):
     """True if f is a regular file."""
     try:
-        return S_ISREG(os.lstat(f)[ST_MODE])
+        return stat.S_ISREG(os.lstat(f)[stat.ST_MODE])
     except OSError:
         return False
 
 def islink(f):
     """True if f is a symlink."""
     try:
-        return S_ISLNK(os.lstat(f)[ST_MODE])
+        return stat.S_ISLNK(os.lstat(f)[stat.ST_MODE])
     except OSError:
         return False
 
@@ -863,7 +850,7 @@
 
 def filesize(f):
     """Return size of given open file."""
-    return os.fstat(f.fileno())[ST_SIZE]
+    return os.fstat(f.fileno())[stat.ST_SIZE]
 
 
 # Define rand_bytes based on platform.

=== modified file 'bzrlib/plugins/launchpad/account.py'
--- bzrlib/plugins/launchpad/account.py	2009-04-27 16:10:10 +0000
+++ bzrlib/plugins/launchpad/account.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,9 +20,12 @@
 than once for each place that needs to take it into account.
 """
 
-from bzrlib import errors, trace
+from bzrlib import (
+    errors,
+    trace,
+    transport,
+    )
 from bzrlib.config import AuthenticationConfig, GlobalConfig
-from bzrlib.transport import get_transport
 
 
 LAUNCHPAD_BASE = 'https://launchpad.net/'
@@ -97,7 +100,7 @@
     uploaded SSH keys.
     """
     if _transport is None:
-        _transport = get_transport(LAUNCHPAD_BASE)
+        _transport = transport.get_transport(LAUNCHPAD_BASE)
 
     try:
         data = _transport.get_bytes('~%s/+sshkeys' % username)

=== modified file 'bzrlib/plugins/launchpad/test_lp_directory.py'
--- bzrlib/plugins/launchpad/test_lp_directory.py	2010-05-20 18:23:10 +0000
+++ bzrlib/plugins/launchpad/test_lp_directory.py	2010-06-23 18:34:40 +0000
@@ -22,6 +22,7 @@
 from bzrlib import (
     errors,
     tests,
+    transport,
     )
 from bzrlib.branch import Branch
 from bzrlib.directory_service import directories
@@ -29,7 +30,6 @@
     TestCaseInTempDir,
     TestCaseWithMemoryTransport
 )
-from bzrlib.transport import get_transport
 from bzrlib.plugins.launchpad import (
     _register_directory,
     lp_registration,
@@ -217,8 +217,8 @@
         directories.register('lp:', FooService, 'Map lp URLs to local urls')
         self.addCleanup(_register_directory)
         self.addCleanup(directories.remove, 'lp:')
-        transport = get_transport('lp:///apt')
-        branch = Branch.open_from_transport(transport)
+        t = transport.get_transport('lp:///apt')
+        branch = Branch.open_from_transport(t)
         self.assertEqual(target_branch.base, branch.base)
 
 

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2010-06-21 22:29:38 +0000
+++ bzrlib/tests/__init__.py	2010-06-23 18:34:40 +0000
@@ -29,7 +29,7 @@
 
 import atexit
 import codecs
-from copy import copy
+import copy
 from cStringIO import StringIO
 import difflib
 import doctest
@@ -37,12 +37,12 @@
 import logging
 import math
 import os
-from pprint import pformat
+import pprint
 import random
 import re
 import shlex
 import stat
-from subprocess import Popen, PIPE, STDOUT
+import subprocess
 import sys
 import tempfile
 import threading
@@ -74,6 +74,7 @@
     ui,
     urlutils,
     registry,
+    transport as _mod_transport,
     workingtree,
     )
 import bzrlib.branch
@@ -103,11 +104,9 @@
     )
 import bzrlib.trace
 from bzrlib.transport import (
-    get_transport,
     memory,
     pathfilter,
     )
-import bzrlib.transport
 from bzrlib.trace import mutter, note
 from bzrlib.tests import (
     test_server,
@@ -943,7 +942,7 @@
 
     def permit_dir(self, name):
         """Permit a directory to be used by this test. See permit_url."""
-        name_transport = get_transport(name)
+        name_transport = _mod_transport.get_transport(name)
         self.permit_url(name)
         self.permit_url(name_transport.base)
 
@@ -1028,7 +1027,7 @@
         self.addCleanup(transport_server.stop_server)
         # Obtain a real transport because if the server supplies a password, it
         # will be hidden from the base on the client side.
-        t = get_transport(transport_server.get_url())
+        t = _mod_transport.get_transport(transport_server.get_url())
         # Some transport servers effectively chroot the backing transport;
         # others like SFTPServer don't - users of the transport can walk up the
         # transport to read the entire backing transport. This wouldn't matter
@@ -1095,7 +1094,7 @@
             message += '\n'
         raise AssertionError("%snot equal:\na = %s\nb = %s\n"
             % (message,
-               pformat(a), pformat(b)))
+               pprint.pformat(a), pprint.pformat(b)))
 
     assertEquals = assertEqual
 
@@ -1986,7 +1985,9 @@
             if not allow_plugins:
                 command.append('--no-plugins')
             command.extend(process_args)
-            process = self._popen(command, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+            process = self._popen(command, stdin=subprocess.PIPE,
+                                  stdout=subprocess.PIPE,
+                                  stderr=subprocess.PIPE)
         finally:
             restore_environment()
             if cwd is not None:
@@ -2000,7 +2001,7 @@
         Allows tests to override this method to intercept the calls made to
         Popen for introspection.
         """
-        return Popen(*args, **kwargs)
+        return subprocess.Popen(*args, **kwargs)
 
     def get_source_path(self):
         """Return the path of the directory containing bzrlib."""
@@ -2186,7 +2187,7 @@
 
         :param relpath: a path relative to the base url.
         """
-        t = get_transport(self.get_url(relpath))
+        t = _mod_transport.get_transport(self.get_url(relpath))
         self.assertFalse(t.is_readonly())
         return t
 
@@ -2198,7 +2199,7 @@
 
         :param relpath: a path relative to the base url.
         """
-        t = get_transport(self.get_readonly_url(relpath))
+        t = _mod_transport.get_transport(self.get_readonly_url(relpath))
         self.assertTrue(t.is_readonly())
         return t
 
@@ -2334,7 +2335,7 @@
         propagating. This method ensures than a test did not leaked.
         """
         root = TestCaseWithMemoryTransport.TEST_ROOT
-        self.permit_url(get_transport(root).base)
+        self.permit_url(_mod_transport.get_transport(root).base)
         wt = workingtree.WorkingTree.open(root)
         last_rev = wt.last_revision()
         if last_rev != 'null:':
@@ -2385,7 +2386,7 @@
             # might be a relative or absolute path
             maybe_a_url = self.get_url(relpath)
             segments = maybe_a_url.rsplit('/', 1)
-            t = get_transport(maybe_a_url)
+            t = _mod_transport.get_transport(maybe_a_url)
             if len(segments) > 1 and segments[-1] not in ('', '.'):
                 t.ensure_base()
             if format is None:
@@ -2411,7 +2412,8 @@
     def make_smart_server(self, path):
         smart_server = test_server.SmartTCPServer_for_testing()
         self.start_server(smart_server, self.get_server())
-        remote_transport = get_transport(smart_server.get_url()).clone(path)
+        remote_transport = _mod_transport.get_transport(smart_server.get_url()
+                                                   ).clone(path)
         return remote_transport
 
     def make_branch_and_memory_tree(self, relpath, format=None):
@@ -2566,7 +2568,7 @@
                 "a list or a tuple. Got %r instead" % (shape,))
         # It's OK to just create them using forward slashes on windows.
         if transport is None or transport.is_readonly():
-            transport = get_transport(".")
+            transport = _mod_transport.get_transport(".")
         for name in shape:
             self.assertIsInstance(name, basestring)
             if name[-1] == '/':
@@ -3313,10 +3315,12 @@
                 '--subunit']
             if '--no-plugins' in sys.argv:
                 argv.append('--no-plugins')
-            # stderr=STDOUT would be ideal, but until we prevent noise on
-            # stderr it can interrupt the subunit protocol.
-            process = Popen(argv, stdin=PIPE, stdout=PIPE, stderr=PIPE,
-                bufsize=1)
+            # stderr=subprocess.STDOUT would be ideal, but until we prevent
+            # noise on stderr it can interrupt the subunit protocol.
+            process = subprocess.Popen(argv, stdin=subprocess.PIPE,
+                                      stdout=subprocess.PIPE,
+                                      stderr=subprocess.PIPE,
+                                      bufsize=1)
             test = TestInSubprocess(process, test_list_file_name)
             result.append(test)
         except:
@@ -4040,7 +4044,7 @@
     :param new_id: The id to assign to it.
     :return: The new test.
     """
-    new_test = copy(test)
+    new_test = copy.copy(test)
     new_test.id = lambda: new_id
     return new_test
 

=== modified file 'bzrlib/tests/blackbox/__init__.py'
--- bzrlib/tests/blackbox/__init__.py	2010-06-20 22:38:35 +0000
+++ bzrlib/tests/blackbox/__init__.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2007, 2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_alias.py'
--- bzrlib/tests/blackbox/test_alias.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_alias.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_aliases.py'
--- bzrlib/tests/blackbox/test_aliases.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_aliases.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_cat_revision.py'
--- bzrlib/tests/blackbox/test_cat_revision.py	2010-06-11 06:52:28 +0000
+++ bzrlib/tests/blackbox/test_cat_revision.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2010 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_check.py'
--- bzrlib/tests/blackbox/test_check.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_check.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2009 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_dpush.py'
--- bzrlib/tests/blackbox/test_dpush.py	2010-06-20 22:38:35 +0000
+++ bzrlib/tests/blackbox/test_dpush.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2007-2010 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_filesystem_cicp.py'
--- bzrlib/tests/blackbox/test_filesystem_cicp.py	2010-06-11 07:23:10 +0000
+++ bzrlib/tests/blackbox/test_filesystem_cicp.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2010 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_find_merge_base.py'
--- bzrlib/tests/blackbox/test_find_merge_base.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_find_merge_base.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 # -*- coding: utf-8 -*-
 #
 # This program is free software; you can redistribute it and/or modify

=== modified file 'bzrlib/tests/blackbox/test_ignored.py'
--- bzrlib/tests/blackbox/test_ignored.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_ignored.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2010 Canonical Ltd
+# Copyright (C) 2006, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_merge_directive.py'
--- bzrlib/tests/blackbox/test_merge_directive.py	2010-05-28 14:15:28 +0000
+++ bzrlib/tests/blackbox/test_merge_directive.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_missing.py'
--- bzrlib/tests/blackbox/test_missing.py	2010-05-28 14:15:28 +0000
+++ bzrlib/tests/blackbox/test_missing.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2008 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_modified.py'
--- bzrlib/tests/blackbox/test_modified.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_modified.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2010 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 # -*- coding: utf-8 -*-
 #
 # This program is free software; you can redistribute it and/or modify

=== modified file 'bzrlib/tests/blackbox/test_nick.py'
--- bzrlib/tests/blackbox/test_nick.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_nick.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010  Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_remove.py'
--- bzrlib/tests/blackbox/test_remove.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_remove.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_remove_tree.py'
--- bzrlib/tests/blackbox/test_remove_tree.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_remove_tree.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_revert.py'
--- bzrlib/tests/blackbox/test_revert.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_revert.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2007 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_revision_info.py'
--- bzrlib/tests/blackbox/test_revision_info.py	2010-06-20 22:38:35 +0000
+++ bzrlib/tests/blackbox/test_revision_info.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2005, 2009-2010 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- bzrlib/tests/blackbox/test_serve.py	2010-02-17 17:11:16 +0000
+++ bzrlib/tests/blackbox/test_serve.py	2010-06-23 18:34:40 +0000
@@ -31,6 +31,7 @@
     errors,
     osutils,
     revision as _mod_revision,
+    transport,
     urlutils,
     )
 from bzrlib.branch import Branch
@@ -43,7 +44,7 @@
     TestSkipped,
     )
 from bzrlib.trace import mutter
-from bzrlib.transport import get_transport, remote
+from bzrlib.transport import remote
 
 
 class TestBzrServeBase(TestCaseWithTransport):
@@ -192,8 +193,8 @@
     def test_bzr_serve_port_readonly(self):
         """bzr server should provide a read only filesystem by default."""
         process, url = self.start_server_port()
-        transport = get_transport(url)
-        self.assertRaises(errors.TransportNotPossible, transport.mkdir, 'adir')
+        t = transport.get_transport(url)
+        self.assertRaises(errors.TransportNotPossible, t.mkdir, 'adir')
         self.assertServerFinishesCleanly(process)
 
     def test_bzr_serve_port_readwrite(self):

=== modified file 'bzrlib/tests/blackbox/test_upgrade.py'
--- bzrlib/tests/blackbox/test_upgrade.py	2010-04-16 07:56:51 +0000
+++ bzrlib/tests/blackbox/test_upgrade.py	2010-06-23 18:34:40 +0000
@@ -21,6 +21,7 @@
 from bzrlib import (
     bzrdir,
     repository,
+    transport,
     )
 from bzrlib.tests import (
     features,
@@ -28,7 +29,6 @@
     TestCaseWithTransport,
     )
 from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
-from bzrlib.transport import get_transport
 from bzrlib.repofmt.knitrepo import (
     RepositoryFormatKnit1,
     )
@@ -79,7 +79,8 @@
         (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3)
         self.assertEqual("This is a checkout. The branch (%s) needs to be "
                          "upgraded separately.\n"
-                         % get_transport(self.get_url('current_format_branch')).base,
+                         % transport.get_transport(
+                self.get_url('current_format_branch')).base,
                          out)
         self.assertEqualDiff("bzr: ERROR: The branch format Meta "
                              "directory format 1 is already at the most "
@@ -101,7 +102,7 @@
     def test_upgrade_explicit_metaformat(self):
         # users can force an upgrade to metadir format.
         self.make_format_5_branch()
-        url = get_transport(self.get_url('format_5_branch')).base
+        url = transport.get_transport(self.get_url('format_5_branch')).base
         # check --format takes effect
         bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
         backup_dir = 'backup.bzr.~1~'
@@ -125,7 +126,7 @@
         # users can force an upgrade to knit format from a metadir weave
         # branch
         self.make_metadir_weave_branch()
-        url = get_transport(self.get_url('metadir_weave_branch')).base
+        url = transport.get_transport(self.get_url('metadir_weave_branch')).base
         # check --format takes effect
         bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
         backup_dir = 'backup.bzr.~1~'
@@ -163,14 +164,14 @@
 
     def test_upgrade_with_existing_backup_dir(self):
         self.make_format_5_branch()
-        transport = get_transport(self.get_url('format_5_branch'))
-        url = transport.base
+        t = transport.get_transport(self.get_url('format_5_branch'))
+        url = t.base
         bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
         backup_dir1 = 'backup.bzr.~1~'
         backup_dir2 = 'backup.bzr.~2~'
         # explicitly create backup_dir1. bzr should create the .~2~ directory
         # as backup
-        transport.mkdir(backup_dir1)
+        t.mkdir(backup_dir1)
         (out, err) = self.run_bzr(
             ['upgrade', '--format=metaweave', url])
         self.assertEqualDiff("""starting upgrade of %s
@@ -186,14 +187,14 @@
         self.assertTrue(isinstance(
             bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
             bzrdir.BzrDirMetaFormat1))
-        self.assertTrue(transport.has(backup_dir2))
+        self.assertTrue(t.has(backup_dir2))
 
 class SFTPTests(TestCaseWithSFTPServer):
     """Tests for upgrade over sftp."""
 
     def test_upgrade_url(self):
         self.run_bzr('init --format=weave')
-        t = get_transport(self.get_url())
+        t = transport.get_transport(self.get_url())
         url = t.base
         out, err = self.run_bzr(['upgrade', '--format=knit', url])
         backup_dir = 'backup.bzr.~1~'

=== modified file 'bzrlib/tests/blackbox/test_whoami.py'
--- bzrlib/tests/blackbox/test_whoami.py	2010-06-20 22:54:30 +0000
+++ bzrlib/tests/blackbox/test_whoami.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/http_utils.py'
--- bzrlib/tests/http_utils.py	2010-02-17 17:11:16 +0000
+++ bzrlib/tests/http_utils.py	2010-06-23 18:34:40 +0000
@@ -106,10 +106,20 @@
     one. This will currently fail if the primary transport is not
     backed by regular disk files.
     """
+
+    # This can be overriden or parametrized by daughter clasess if needed, but
+    # it must exist so that the create_transport_readonly_server() method can
+    # propagate it.
+    _protocol_version = None
+
     def setUp(self):
         super(TestCaseWithWebserver, self).setUp()
         self.transport_readonly_server = http_server.HttpServer
 
+    def create_transport_readonly_server(self):
+        return self.transport_readonly_server(
+            protocol_version=self._protocol_version)
+
 
 class TestCaseWithTwoWebservers(TestCaseWithWebserver):
     """A support class providing readonly urls on two servers that are http://.
@@ -127,7 +137,8 @@
 
         This is mostly a hook for daughter classes.
         """
-        return self.transport_secondary_server()
+        return self.transport_secondary_server(
+            protocol_version=self._protocol_version)
 
     def get_secondary_server(self):
         """Get the server instance for the secondary transport."""
@@ -218,7 +229,8 @@
    def create_transport_secondary_server(self):
        """Create the secondary server redirecting to the primary server"""
        new = self.get_readonly_server()
-       redirecting = HTTPServerRedirecting()
+       redirecting = HTTPServerRedirecting(
+           protocol_version=self._protocol_version)
        redirecting.redirect_to(new.host, new.port)
        return redirecting
 

=== modified file 'bzrlib/tests/per_branch/test_bound_sftp.py'
--- bzrlib/tests/per_branch/test_bound_sftp.py	2010-02-11 09:27:55 +0000
+++ bzrlib/tests/per_branch/test_bound_sftp.py	2010-06-23 18:34:40 +0000
@@ -144,13 +144,13 @@
                 wt_child2.commit, 'child2', rev_id='r@d-2')
 
     def test_unbinding(self):
-        from bzrlib.transport import get_transport
+        from bzrlib import transport
         b_base, wt_child = self.create_branches()
 
         # TestCaseWithSFTPServer only allows you to connect one time
         # to the SFTP server. So we have to create a connection and
         # keep it around, so that it can be reused
-        __unused_t = get_transport(self.get_url('.'))
+        __unused_t = transport.get_transport(self.get_url('.'))
 
         wt_base = b_base.bzrdir.open_workingtree()
         open('base/a', 'wb').write('new base contents\n')

=== modified file 'bzrlib/tests/per_branch/test_permissions.py'
--- bzrlib/tests/per_branch/test_permissions.py	2009-09-07 08:46:00 +0000
+++ bzrlib/tests/per_branch/test_permissions.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2008 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,7 +38,6 @@
 from bzrlib.remote import RemoteBranchFormat
 from bzrlib.tests.test_permissions import chmod_r, check_mode_r
 from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
-from bzrlib.transport import get_transport
 from bzrlib.workingtree import WorkingTree
 
 

=== modified file 'bzrlib/tests/per_branch/test_stacking.py'
--- bzrlib/tests/per_branch/test_stacking.py	2009-08-20 04:09:58 +0000
+++ bzrlib/tests/per_branch/test_stacking.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
 from bzrlib.smart import server
 from bzrlib.tests import TestNotApplicable, KnownFailure, transport_util
 from bzrlib.tests.per_branch import TestCaseWithBranch
-from bzrlib.transport import get_transport
 
 
 unstackable_format_errors = (

=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- bzrlib/tests/per_bzrdir/test_bzrdir.py	2010-05-20 18:23:17 +0000
+++ bzrlib/tests/per_bzrdir/test_bzrdir.py	2010-06-23 18:34:40 +0000
@@ -55,7 +55,6 @@
                           )
 from bzrlib.tests.per_bzrdir import TestCaseWithBzrDir
 from bzrlib.trace import mutter
-from bzrlib.transport import get_transport
 from bzrlib.transport.local import LocalTransport
 from bzrlib.ui import (
     CannedInputUIFactory,
@@ -202,7 +201,7 @@
         A simple wrapper for from_bzrdir.sprout that translates NotLocalUrl into
         TestSkipped.  Returns the newly sprouted bzrdir.
         """
-        to_transport = get_transport(to_url)
+        to_transport = transport.get_transport(to_url)
         if not isinstance(to_transport, LocalTransport):
             raise TestSkipped('Cannot sprout to remote bzrdirs.')
         target = from_bzrdir.sprout(to_url, revision_id=revision_id,
@@ -1183,8 +1182,8 @@
             '_network_name', None),
             None)
         # supported formats must be able to init and open
-        t = get_transport(self.get_url())
-        readonly_t = get_transport(self.get_readonly_url())
+        t = transport.get_transport(self.get_url())
+        readonly_t = transport.get_transport(self.get_readonly_url())
         made_control = self.bzrdir_format.initialize(t.base)
         self.failUnless(isinstance(made_control, bzrdir.BzrDir))
         self.assertEqual(self.bzrdir_format,
@@ -1394,7 +1393,7 @@
         # test the formats specific behaviour for no-content or similar dirs.
         self.assertRaises(NotBranchError,
                           self.bzrdir_format.open,
-                          get_transport(self.get_readonly_url()))
+                          transport.get_transport(self.get_readonly_url()))
 
     def test_create_branch(self):
         # a bzrdir can construct a branch and repository for itself.
@@ -1403,7 +1402,7 @@
             # because the default open will not open them and
             # they may not be initializable.
             return
-        t = get_transport(self.get_url())
+        t = transport.get_transport(self.get_url())
         made_control = self.bzrdir_format.initialize(t.base)
         made_repo = made_control.create_repository()
         made_branch = made_control.create_branch()
@@ -1416,7 +1415,7 @@
             # because the default open will not open them and
             # they may not be initializable.
             return
-        t = get_transport(self.get_url())
+        t = transport.get_transport(self.get_url())
         made_control = self.bzrdir_format.initialize(t.base)
         made_repo = made_control.create_repository()
         made_branch = made_control.create_branch()
@@ -1431,7 +1430,7 @@
             # because the default open will not open them and
             # they may not be initializable.
             return
-        t = get_transport(self.get_url())
+        t = transport.get_transport(self.get_url())
         made_control = self.bzrdir_format.initialize(t.base)
         made_repo = made_control.create_repository()
         made_branch = made_control.create_branch()
@@ -1452,7 +1451,7 @@
             # because the default open will not open them and
             # they may not be initializable.
             return
-        t = get_transport(self.get_url())
+        t = transport.get_transport(self.get_url())
         made_control = self.bzrdir_format.initialize(t.base)
         made_repo = made_control.create_repository()
         # Check that we have a repository object.
@@ -1467,7 +1466,7 @@
             # because the default open will not open them and
             # they may not be initializable.
             return
-        t = get_transport(self.get_url())
+        t = transport.get_transport(self.get_url())
         made_control = self.bzrdir_format.initialize(t.base)
         try:
             made_repo = made_control.create_repository(shared=True)
@@ -1484,7 +1483,7 @@
             # because the default open will not open them and
             # they may not be initializable.
             return
-        t = get_transport(self.get_url())
+        t = transport.get_transport(self.get_url())
         made_control = self.bzrdir_format.initialize(t.base)
         made_repo = made_control.create_repository(shared=False)
         self.assertFalse(made_repo.is_shared())
@@ -1495,7 +1494,7 @@
             # because the default open will not open them and
             # they may not be initializable.
             return
-        t = get_transport(self.get_url())
+        t = transport.get_transport(self.get_url())
         made_control = self.bzrdir_format.initialize(t.base)
         made_repo = made_control.create_repository()
         opened_repo = made_control.open_repository()
@@ -1623,7 +1622,7 @@
     def test_root_transport(self):
         dir = self.make_bzrdir('.')
         self.assertEqual(dir.root_transport.base,
-                         get_transport(self.get_url('.')).base)
+                         transport.get_transport(self.get_url('.')).base)
 
     def test_find_repository_no_repo_under_standalone_branch(self):
         # finding a repo stops at standalone branches even if there is a
@@ -1634,8 +1633,8 @@
             # need a shared repository to test this.
             return
         url = self.get_url('intermediate')
-        get_transport(self.get_url()).mkdir('intermediate')
-        get_transport(self.get_url()).mkdir('intermediate/child')
+        transport.get_transport(self.get_url()).mkdir('intermediate')
+        transport.get_transport(self.get_url()).mkdir('intermediate/child')
         made_control = self.bzrdir_format.initialize(url)
         made_control.create_repository()
         innermost_control = self.bzrdir_format.initialize(
@@ -1659,7 +1658,7 @@
             # need a shared repository to test this.
             return
         url = self.get_url('childbzrdir')
-        get_transport(self.get_url()).mkdir('childbzrdir')
+        transport.get_transport(self.get_url()).mkdir('childbzrdir')
         made_control = self.bzrdir_format.initialize(url)
         try:
             child_repo = made_control.open_repository()
@@ -1693,7 +1692,7 @@
             # need a shared repository to test this.
             return
         url = self.get_url('childrepo')
-        get_transport(self.get_url()).mkdir('childrepo')
+        transport.get_transport(self.get_url()).mkdir('childrepo')
         child_control = self.bzrdir_format.initialize(url)
         child_repo = child_control.create_repository(shared=True)
         opened_control = bzrdir.BzrDir.open(self.get_url('childrepo'))
@@ -1712,8 +1711,8 @@
             # need a shared repository to test this.
             return
         url = self.get_url('intermediate')
-        get_transport(self.get_url()).mkdir('intermediate')
-        get_transport(self.get_url()).mkdir('intermediate/child')
+        transport.get_transport(self.get_url()).mkdir('intermediate')
+        transport.get_transport(self.get_url()).mkdir('intermediate/child')
         made_control = self.bzrdir_format.initialize(url)
         try:
             child_repo = made_control.open_repository()
@@ -1958,7 +1957,7 @@
         # - do the vfs initialisation over the basic vfs transport
         # XXX: TODO this should become a 'bzrdirlocation' api call.
         url = self.get_vfs_only_url('subdir')
-        get_transport(self.get_vfs_only_url()).mkdir('subdir')
+        transport.get_transport(self.get_vfs_only_url()).mkdir('subdir')
         made_control = self.bzrdir_format.initialize(self.get_url('subdir'))
         try:
             repo = made_control.open_repository()
@@ -1974,7 +1973,7 @@
 
 class TestBzrDirControlComponent(TestCaseWithBzrDir):
     """BzrDir implementations adequately implement ControlComponent."""
-    
+
     def test_urls(self):
         bd = self.make_bzrdir('bd')
         self.assertIsInstance(bd.user_url, str)

=== modified file 'bzrlib/tests/per_interbranch/__init__.py'
--- bzrlib/tests/per_interbranch/__init__.py	2010-06-16 08:17:50 +0000
+++ bzrlib/tests/per_interbranch/__init__.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 # -*- coding: utf-8 -*-
 #
 # This program is free software; you can redistribute it and/or modify
@@ -46,7 +46,6 @@
     TestCaseWithTransport,
     multiply_tests,
     )
-from bzrlib.transport import get_transport
 
 
 def make_scenarios(test_list):

=== modified file 'bzrlib/tests/per_interbranch/test_pull.py'
--- bzrlib/tests/per_interbranch/test_pull.py	2010-06-14 06:37:11 +0000
+++ bzrlib/tests/per_interbranch/test_pull.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007, 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_interbranch/test_push.py'
--- bzrlib/tests/per_interbranch/test_push.py	2010-06-17 06:30:22 +0000
+++ bzrlib/tests/per_interbranch/test_push.py	2010-06-23 18:34:40 +0000
@@ -39,7 +39,6 @@
 from bzrlib.tests.per_interbranch import (
     TestCaseWithInterBranch,
     )
-from bzrlib.transport import get_transport
 from bzrlib.tests import test_server
 
 

=== modified file 'bzrlib/tests/per_interbranch/test_update_revisions.py'
--- bzrlib/tests/per_interbranch/test_update_revisions.py	2010-06-17 06:30:22 +0000
+++ bzrlib/tests/per_interbranch/test_update_revisions.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_interrepository/__init__.py'
--- bzrlib/tests/per_interrepository/__init__.py	2009-08-14 01:07:44 +0000
+++ bzrlib/tests/per_interrepository/__init__.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 # Authors: Robert Collins <[e-mail]>
 # -*- coding: utf-8 -*-
 #
@@ -26,6 +26,7 @@
 """
 
 
+from bzrlib import transport
 from bzrlib.errors import (
     FileExists,
     UninitializableFormat,
@@ -39,7 +40,6 @@
                           multiply_tests,
                           )
 from bzrlib.tests.per_bzrdir.test_bzrdir import TestCaseWithBzrDir
-from bzrlib.transport import get_transport
 
 
 def make_scenarios(transport_server, transport_readonly_server, formats):
@@ -143,7 +143,7 @@
             segments = url.split('/')
             if segments and segments[-1] not in ('', '.'):
                 parent = '/'.join(segments[:-1])
-                t = get_transport(parent)
+                t = transport.get_transport(parent)
                 try:
                     t.mkdir(segments[-1])
                 except FileExists:

=== modified file 'bzrlib/tests/per_intertree/__init__.py'
--- bzrlib/tests/per_intertree/__init__.py	2010-02-17 17:11:16 +0000
+++ bzrlib/tests/per_intertree/__init__.py	2010-06-23 18:34:40 +0000
@@ -28,7 +28,6 @@
     revisiontree,
     tests,
     )
-from bzrlib.transport import get_transport
 from bzrlib.transform import TransformPreview
 from bzrlib.tests import (
     default_transport,

=== modified file 'bzrlib/tests/per_repository/test_fetch.py'
--- bzrlib/tests/per_repository/test_fetch.py	2009-08-05 02:12:22 +0000
+++ bzrlib/tests/per_repository/test_fetch.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,6 @@
 from bzrlib.inventory import ROOT_ID
 from bzrlib.tests import TestSkipped
 from bzrlib.tests.per_repository import TestCaseWithRepository
-from bzrlib.transport import get_transport
 
 
 class TestFetchSameRepository(TestCaseWithRepository):

=== modified file 'bzrlib/tests/per_repository/test_has_same_location.py'
--- bzrlib/tests/per_repository/test_has_same_location.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/per_repository/test_has_same_location.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,12 +16,14 @@
 
 """Tests for implementations of Repository.has_same_location."""
 
-from bzrlib import bzrdir
+from bzrlib import (
+    bzrdir,
+    transport,
+    )
 from bzrlib.tests import (
     TestNotApplicable,
     )
 from bzrlib.tests.per_repository import TestCaseWithRepository
-from bzrlib.transport import get_transport
 
 
 class TestHasSameLocation(TestCaseWithRepository):
@@ -112,7 +114,8 @@
         if repo._format == other_repo._format:
             # We're testing the default format!  So we have to use a non-default
             # format for other_repo.
-            get_transport(self.get_vfs_only_url()).delete_tree('other')
+            transport.get_transport(self.get_vfs_only_url()
+                                    ).delete_tree('other')
             other_repo = self.make_repository('other', format='metaweave')
         # Make sure the other_repo is not a RemoteRepository.
         other_bzrdir = bzrdir.BzrDir.open(self.get_vfs_only_url('other'))

=== modified file 'bzrlib/tests/per_repository/test_reconcile.py'
--- bzrlib/tests/per_repository/test_reconcile.py	2009-09-08 11:32:53 +0000
+++ bzrlib/tests/per_repository/test_reconcile.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,10 @@
 
 
 import bzrlib
-import bzrlib.errors as errors
+from bzrlib import (
+    errors,
+    transport,
+    )
 from bzrlib.inventory import Inventory
 from bzrlib.reconcile import reconcile, Reconciler
 from bzrlib.repofmt.knitrepo import RepositoryFormatKnit
@@ -30,7 +33,6 @@
 from bzrlib.tests.per_repository import (
     TestCaseWithRepository,
     )
-from bzrlib.transport import get_transport
 from bzrlib.uncommit import uncommit
 
 
@@ -59,7 +61,7 @@
     def setUp(self):
         super(TestsNeedingReweave, self).setUp()
 
-        t = get_transport(self.get_url())
+        t = transport.get_transport(self.get_url())
         # an empty inventory with no revision for testing with.
         repo = self.make_repository('inventory_without_revision')
         repo.lock_write()
@@ -310,7 +312,7 @@
         self.reduceLockdirTimeout()
         super(TestReconcileWithIncorrectRevisionCache, self).setUp()
 
-        t = get_transport(self.get_url())
+        t = transport.get_transport(self.get_url())
         # we need a revision with two parents in the wrong order
         # which should trigger reinsertion.
         # and another with the first one correct but the other two not
@@ -379,7 +381,7 @@
 
     def test_reconcile_wrong_order(self):
         # a wrong order in primary parents is optionally correctable
-        t = get_transport(self.get_url()).clone('wrong-first-parent')
+        t = transport.get_transport(self.get_url()).clone('wrong-first-parent')
         d = bzrlib.bzrdir.BzrDir.open_from_transport(t)
         repo = d.open_repository()
         repo.lock_read()
@@ -408,7 +410,8 @@
 
     def test_reconcile_wrong_order_secondary_inventory(self):
         # a wrong order in the parents for inventories is ignored.
-        t = get_transport(self.get_url()).clone('reversed-secondary-parents')
+        t = transport.get_transport(self.get_url()
+                                    ).clone('reversed-secondary-parents')
         d = bzrlib.bzrdir.BzrDir.open_from_transport(t)
         repo = d.open_repository()
         self.checkUnreconciled(d, repo.reconcile())

=== modified file 'bzrlib/tests/per_versionedfile.py'
--- bzrlib/tests/per_versionedfile.py	2010-05-14 14:29:28 +0000
+++ bzrlib/tests/per_versionedfile.py	2010-06-23 18:34:40 +0000
@@ -31,6 +31,7 @@
     knit as _mod_knit,
     osutils,
     progress,
+    transport,
     ui,
     )
 from bzrlib.errors import (
@@ -56,7 +57,6 @@
     )
 from bzrlib.tests.http_utils import TestCaseWithWebserver
 from bzrlib.trace import mutter
-from bzrlib.transport import get_transport
 from bzrlib.transport.memory import MemoryTransport
 from bzrlib.tsort import topo_sort
 from bzrlib.tuned_gzip import GzipFile
@@ -849,10 +849,10 @@
         self.assertEquals(('references_ghost', 'line_c\n'), origins[2])
 
     def test_readonly_mode(self):
-        transport = get_transport(self.get_url('.'))
+        t = transport.get_transport(self.get_url('.'))
         factory = self.get_factory()
-        vf = factory('id', transport, 0777, create=True, access_mode='w')
-        vf = factory('id', transport, access_mode='r')
+        vf = factory('id', t, 0777, create=True, access_mode='w')
+        vf = factory('id', t, access_mode='r')
         self.assertRaises(errors.ReadOnlyError, vf.add_lines, 'base', [], [])
         self.assertRaises(errors.ReadOnlyError,
                           vf.add_lines_with_ghosts,
@@ -880,12 +880,14 @@
 class TestWeave(TestCaseWithMemoryTransport, VersionedFileTestMixIn):
 
     def get_file(self, name='foo'):
-        return WeaveFile(name, get_transport(self.get_url('.')), create=True,
-            get_scope=self.get_transaction)
+        return WeaveFile(name, transport.get_transport(self.get_url('.')),
+                         create=True,
+                         get_scope=self.get_transaction)
 
     def get_file_corrupted_text(self):
-        w = WeaveFile('foo', get_transport(self.get_url('.')), create=True,
-            get_scope=self.get_transaction)
+        w = WeaveFile('foo', transport.get_transport(self.get_url('.')),
+                      create=True,
+                      get_scope=self.get_transaction)
         w.add_lines('v1', [], ['hello\n'])
         w.add_lines('v2', ['v1'], ['hello\n', 'there\n'])
 
@@ -919,14 +921,15 @@
         return w
 
     def reopen_file(self, name='foo', create=False):
-        return WeaveFile(name, get_transport(self.get_url('.')), create=create,
-            get_scope=self.get_transaction)
+        return WeaveFile(name, transport.get_transport(self.get_url('.')),
+                         create=create,
+                         get_scope=self.get_transaction)
 
     def test_no_implicit_create(self):
         self.assertRaises(errors.NoSuchFile,
                           WeaveFile,
                           'foo',
-                          get_transport(self.get_url('.')),
+                          transport.get_transport(self.get_url('.')),
                           get_scope=self.get_transaction)
 
     def get_factory(self):
@@ -999,7 +1002,7 @@
         # we should be able to read from http with a versioned file.
         vf = self.get_file()
         # try an empty file access
-        readonly_vf = self.get_factory()('foo', get_transport(
+        readonly_vf = self.get_factory()('foo', transport.get_transport(
                 self.get_readonly_url('.')))
         self.assertEqual([], readonly_vf.versions())
 
@@ -1009,7 +1012,7 @@
         # now with feeling.
         vf.add_lines('1', [], ['a\n'])
         vf.add_lines('2', ['1'], ['b\n', 'a\n'])
-        readonly_vf = self.get_factory()('foo', get_transport(
+        readonly_vf = self.get_factory()('foo', transport.get_transport(
                 self.get_readonly_url('.')))
         self.assertEqual(['1', '2'], vf.versions())
         self.assertEqual(['1', '2'], readonly_vf.versions())
@@ -1020,8 +1023,9 @@
 class TestWeaveHTTP(TestCaseWithWebserver, TestReadonlyHttpMixin):
 
     def get_file(self):
-        return WeaveFile('foo', get_transport(self.get_url('.')), create=True,
-            get_scope=self.get_transaction)
+        return WeaveFile('foo', transport.get_transport(self.get_url('.')),
+                         create=True,
+                         get_scope=self.get_transaction)
 
     def get_factory(self):
         return WeaveFile
@@ -1271,7 +1275,8 @@
 class TestWeaveMerge(TestCaseWithMemoryTransport, MergeCasesMixin):
 
     def get_file(self, name='foo'):
-        return WeaveFile(name, get_transport(self.get_url('.')), create=True)
+        return WeaveFile(name, transport.get_transport(self.get_url('.')),
+                         create=True)
 
     def log_contents(self, w):
         self.log('weave is:')

=== modified file 'bzrlib/tests/per_workingtree/test_pull.py'
--- bzrlib/tests/per_workingtree/test_pull.py	2010-01-11 23:02:32 +0000
+++ bzrlib/tests/per_workingtree/test_pull.py	2010-06-23 18:34:40 +0000
@@ -23,7 +23,6 @@
 from bzrlib.osutils import basename
 from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
 from bzrlib.trace import mutter
-from bzrlib.transport import get_transport
 
 
 class TestPull(TestCaseWithWorkingTree):

=== modified file 'bzrlib/tests/test_btree_index.py'
--- bzrlib/tests/test_btree_index.py	2010-03-25 17:09:53 +0000
+++ bzrlib/tests/test_btree_index.py	2010-06-23 18:34:40 +0000
@@ -27,6 +27,7 @@
     lru_cache,
     osutils,
     tests,
+    transport,
     )
 from bzrlib.tests import (
     TestCaseWithTransport,
@@ -34,7 +35,6 @@
     multiply_tests,
     split_suite_by_condition,
     )
-from bzrlib.transport import get_transport
 
 
 def load_tests(standard_tests, module, loader):
@@ -280,10 +280,10 @@
 
         for node in nodes:
             builder.add_node(*node)
-        transport = get_transport('trace+' + self.get_url(''))
-        size = transport.put_file('index', self.time(builder.finish))
+        t = transport.get_transport('trace+' + self.get_url(''))
+        size = t.put_file('index', self.time(builder.finish))
         del builder
-        index = btree_index.BTreeGraphIndex(transport, 'index', size)
+        index = btree_index.BTreeGraphIndex(t, 'index', size)
         # Seed the metadata, we're using internal calls now.
         index.key_count()
         self.assertEqual(3, len(index._row_lengths),
@@ -409,9 +409,9 @@
         self.assertEqual(None, builder._backing_indices[2])
         self.assertEqual(16, builder._backing_indices[3].key_count())
         # Now finish, and check we got a correctly ordered tree
-        transport = self.get_transport('')
-        size = transport.put_file('index', builder.finish())
-        index = btree_index.BTreeGraphIndex(transport, 'index', size)
+        t = self.get_transport('')
+        size = t.put_file('index', builder.finish())
+        index = btree_index.BTreeGraphIndex(t, 'index', size)
         nodes = list(index.iter_all_entries())
         self.assertEqual(sorted(nodes), nodes)
         self.assertEqual(16, len(nodes))
@@ -607,7 +607,7 @@
         for key, value, references in nodes:
             builder.add_node(key, value, references)
         stream = builder.finish()
-        trans = get_transport('trace+' + self.get_url())
+        trans = transport.get_transport('trace+' + self.get_url())
         size = trans.put_file('index', stream)
         return btree_index.BTreeGraphIndex(trans, 'index', size)
 
@@ -648,57 +648,57 @@
         self.assertEqual(0, len(index._leaf_node_cache))
 
     def test_trivial_constructor(self):
-        transport = get_transport('trace+' + self.get_url(''))
-        index = btree_index.BTreeGraphIndex(transport, 'index', None)
+        t = transport.get_transport('trace+' + self.get_url(''))
+        index = btree_index.BTreeGraphIndex(t, 'index', None)
         # Checks the page size at load, but that isn't logged yet.
-        self.assertEqual([], transport._activity)
+        self.assertEqual([], t._activity)
 
     def test_with_size_constructor(self):
-        transport = get_transport('trace+' + self.get_url(''))
-        index = btree_index.BTreeGraphIndex(transport, 'index', 1)
+        t = transport.get_transport('trace+' + self.get_url(''))
+        index = btree_index.BTreeGraphIndex(t, 'index', 1)
         # Checks the page size at load, but that isn't logged yet.
-        self.assertEqual([], transport._activity)
+        self.assertEqual([], t._activity)
 
     def test_empty_key_count_no_size(self):
         builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
-        transport = get_transport('trace+' + self.get_url(''))
-        transport.put_file('index', builder.finish())
-        index = btree_index.BTreeGraphIndex(transport, 'index', None)
-        del transport._activity[:]
-        self.assertEqual([], transport._activity)
+        t = transport.get_transport('trace+' + self.get_url(''))
+        t.put_file('index', builder.finish())
+        index = btree_index.BTreeGraphIndex(t, 'index', None)
+        del t._activity[:]
+        self.assertEqual([], t._activity)
         self.assertEqual(0, index.key_count())
         # The entire index should have been requested (as we generally have the
         # size available, and doing many small readvs is inappropriate).
         # We can't tell how much was actually read here, but - check the code.
-        self.assertEqual([('get', 'index')], transport._activity)
+        self.assertEqual([('get', 'index')], t._activity)
 
     def test_empty_key_count(self):
         builder = btree_index.BTreeBuilder(key_elements=1, reference_lists=0)
-        transport = get_transport('trace+' + self.get_url(''))
-        size = transport.put_file('index', builder.finish())
+        t = transport.get_transport('trace+' + self.get_url(''))
+        size = t.put_file('index', builder.finish())
         self.assertEqual(72, size)
-        index = btree_index.BTreeGraphIndex(transport, 'index', size)
-        del transport._activity[:]
-        self.assertEqual([], transport._activity)
+        index = btree_index.BTreeGraphIndex(t, 'index', size)
+        del t._activity[:]
+        self.assertEqual([], t._activity)
         self.assertEqual(0, index.key_count())
         # The entire index should have been read, as 4K > size
         self.assertEqual([('readv', 'index', [(0, 72)], False, None)],
-            transport._activity)
+                         t._activity)
 
     def test_non_empty_key_count_2_2(self):
         builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
         nodes = self.make_nodes(35, 2, 2)
         for node in nodes:
             builder.add_node(*node)
-        transport = get_transport('trace+' + self.get_url(''))
-        size = transport.put_file('index', builder.finish())
-        index = btree_index.BTreeGraphIndex(transport, 'index', size)
-        del transport._activity[:]
-        self.assertEqual([], transport._activity)
+        t = transport.get_transport('trace+' + self.get_url(''))
+        size = t.put_file('index', builder.finish())
+        index = btree_index.BTreeGraphIndex(t, 'index', size)
+        del t._activity[:]
+        self.assertEqual([], t._activity)
         self.assertEqual(70, index.key_count())
         # The entire index should have been read, as it is one page long.
         self.assertEqual([('readv', 'index', [(0, size)], False, None)],
-            transport._activity)
+            t._activity)
         self.assertEqual(1173, size)
 
     def test_with_offset_no_size(self):
@@ -722,7 +722,7 @@
 
     def test__read_nodes_no_size_one_page_reads_once(self):
         self.make_index(nodes=[(('key',), 'value', ())])
-        trans = get_transport('trace+' + self.get_url())
+        trans = transport.get_transport('trace+' + self.get_url())
         index = btree_index.BTreeGraphIndex(trans, 'index', None)
         del trans._activity[:]
         nodes = dict(index._read_nodes([0]))
@@ -736,7 +736,7 @@
         index.key_count()
         num_pages = index._row_offsets[-1]
         # Reopen with a traced transport and no size
-        trans = get_transport('trace+' + self.get_url())
+        trans = transport.get_transport('trace+' + self.get_url())
         index = btree_index.BTreeGraphIndex(trans, 'index', None)
         del trans._activity[:]
         nodes = dict(index._read_nodes([0]))
@@ -747,31 +747,31 @@
         nodes = self.make_nodes(160, 2, 2)
         for node in nodes:
             builder.add_node(*node)
-        transport = get_transport('trace+' + self.get_url(''))
-        size = transport.put_file('index', builder.finish())
+        t = transport.get_transport('trace+' + self.get_url(''))
+        size = t.put_file('index', builder.finish())
         self.assertEqual(17692, size)
-        index = btree_index.BTreeGraphIndex(transport, 'index', size)
-        del transport._activity[:]
-        self.assertEqual([], transport._activity)
+        index = btree_index.BTreeGraphIndex(t, 'index', size)
+        del t._activity[:]
+        self.assertEqual([], t._activity)
         self.assertEqual(320, index.key_count())
         # The entire index should not have been read.
         self.assertEqual([('readv', 'index', [(0, 4096)], False, None)],
-            transport._activity)
+                         t._activity)
 
     def test_validate_one_page(self):
         builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
         nodes = self.make_nodes(45, 2, 2)
         for node in nodes:
             builder.add_node(*node)
-        transport = get_transport('trace+' + self.get_url(''))
-        size = transport.put_file('index', builder.finish())
-        index = btree_index.BTreeGraphIndex(transport, 'index', size)
-        del transport._activity[:]
-        self.assertEqual([], transport._activity)
+        t = transport.get_transport('trace+' + self.get_url(''))
+        size = t.put_file('index', builder.finish())
+        index = btree_index.BTreeGraphIndex(t, 'index', size)
+        del t._activity[:]
+        self.assertEqual([], t._activity)
         index.validate()
         # The entire index should have been read linearly.
         self.assertEqual([('readv', 'index', [(0, size)], False, None)],
-            transport._activity)
+                         t._activity)
         self.assertEqual(1488, size)
 
     def test_validate_two_pages(self):
@@ -779,64 +779,65 @@
         nodes = self.make_nodes(80, 2, 2)
         for node in nodes:
             builder.add_node(*node)
-        transport = get_transport('trace+' + self.get_url(''))
-        size = transport.put_file('index', builder.finish())
+        t = transport.get_transport('trace+' + self.get_url(''))
+        size = t.put_file('index', builder.finish())
         # Root page, 2 leaf pages
         self.assertEqual(9339, size)
-        index = btree_index.BTreeGraphIndex(transport, 'index', size)
-        del transport._activity[:]
-        self.assertEqual([], transport._activity)
+        index = btree_index.BTreeGraphIndex(t, 'index', size)
+        del t._activity[:]
+        self.assertEqual([], t._activity)
         index.validate()
         # The entire index should have been read linearly.
-        self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
-            ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
-            transport._activity)
+        self.assertEqual(
+            [('readv', 'index', [(0, 4096)], False, None),
+             ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
+            t._activity)
         # XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong
         # node and make validate find them.
 
     def test_eq_ne(self):
         # two indices are equal when constructed with the same parameters:
-        transport1 = get_transport('trace+' + self.get_url(''))
-        transport2 = get_transport(self.get_url(''))
-        self.assertTrue(
-            btree_index.BTreeGraphIndex(transport1, 'index', None) ==
-            btree_index.BTreeGraphIndex(transport1, 'index', None))
-        self.assertTrue(
-            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
-            btree_index.BTreeGraphIndex(transport1, 'index', 20))
-        self.assertFalse(
-            btree_index.BTreeGraphIndex(transport1, 'index', 20) ==
-            btree_index.BTreeGraphIndex(transport2, 'index', 20))
-        self.assertFalse(
-            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) ==
-            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
-        self.assertFalse(
-            btree_index.BTreeGraphIndex(transport1, 'index', 10) ==
-            btree_index.BTreeGraphIndex(transport1, 'index', 20))
-        self.assertFalse(
-            btree_index.BTreeGraphIndex(transport1, 'index', None) !=
-            btree_index.BTreeGraphIndex(transport1, 'index', None))
-        self.assertFalse(
-            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
-            btree_index.BTreeGraphIndex(transport1, 'index', 20))
-        self.assertTrue(
-            btree_index.BTreeGraphIndex(transport1, 'index', 20) !=
-            btree_index.BTreeGraphIndex(transport2, 'index', 20))
-        self.assertTrue(
-            btree_index.BTreeGraphIndex(transport1, 'inde1', 20) !=
-            btree_index.BTreeGraphIndex(transport1, 'inde2', 20))
-        self.assertTrue(
-            btree_index.BTreeGraphIndex(transport1, 'index', 10) !=
-            btree_index.BTreeGraphIndex(transport1, 'index', 20))
+        t1 = transport.get_transport('trace+' + self.get_url(''))
+        t2 = transport.get_transport(self.get_url(''))
+        self.assertTrue(
+            btree_index.BTreeGraphIndex(t1, 'index', None) ==
+            btree_index.BTreeGraphIndex(t1, 'index', None))
+        self.assertTrue(
+            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
+            btree_index.BTreeGraphIndex(t1, 'index', 20))
+        self.assertFalse(
+            btree_index.BTreeGraphIndex(t1, 'index', 20) ==
+            btree_index.BTreeGraphIndex(t2, 'index', 20))
+        self.assertFalse(
+            btree_index.BTreeGraphIndex(t1, 'inde1', 20) ==
+            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
+        self.assertFalse(
+            btree_index.BTreeGraphIndex(t1, 'index', 10) ==
+            btree_index.BTreeGraphIndex(t1, 'index', 20))
+        self.assertFalse(
+            btree_index.BTreeGraphIndex(t1, 'index', None) !=
+            btree_index.BTreeGraphIndex(t1, 'index', None))
+        self.assertFalse(
+            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
+            btree_index.BTreeGraphIndex(t1, 'index', 20))
+        self.assertTrue(
+            btree_index.BTreeGraphIndex(t1, 'index', 20) !=
+            btree_index.BTreeGraphIndex(t2, 'index', 20))
+        self.assertTrue(
+            btree_index.BTreeGraphIndex(t1, 'inde1', 20) !=
+            btree_index.BTreeGraphIndex(t1, 'inde2', 20))
+        self.assertTrue(
+            btree_index.BTreeGraphIndex(t1, 'index', 10) !=
+            btree_index.BTreeGraphIndex(t1, 'index', 20))
 
     def test_iter_all_only_root_no_size(self):
         self.make_index(nodes=[(('key',), 'value', ())])
-        trans = get_transport('trace+' + self.get_url(''))
-        index = btree_index.BTreeGraphIndex(trans, 'index', None)
-        del trans._activity[:]
+        t = transport.get_transport('trace+' + self.get_url(''))
+        index = btree_index.BTreeGraphIndex(t, 'index', None)
+        del t._activity[:]
         self.assertEqual([(('key',), 'value')],
                          [x[1:] for x in index.iter_all_entries()])
-        self.assertEqual([('get', 'index')], trans._activity)
+        self.assertEqual([('get', 'index')], t._activity)
 
     def test_iter_all_entries_reads(self):
         # iterating all entries reads the header, then does a linear
@@ -848,15 +849,15 @@
         nodes = self.make_nodes(10000, 2, 2)
         for node in nodes:
             builder.add_node(*node)
-        transport = get_transport('trace+' + self.get_url(''))
-        size = transport.put_file('index', builder.finish())
+        t = transport.get_transport('trace+' + self.get_url(''))
+        size = t.put_file('index', builder.finish())
         self.assertEqual(1303220, size, 'number of expected bytes in the'
                                         ' output changed')
         page_size = btree_index._PAGE_SIZE
         del builder
-        index = btree_index.BTreeGraphIndex(transport, 'index', size)
-        del transport._activity[:]
-        self.assertEqual([], transport._activity)
+        index = btree_index.BTreeGraphIndex(t, 'index', size)
+        del t._activity[:]
+        self.assertEqual([], t._activity)
         found_nodes = self.time(list, index.iter_all_entries())
         bare_nodes = []
         for node in found_nodes:
@@ -883,7 +884,7 @@
         readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
         expected = [('readv', 'index', [(0, page_size)], False, None),
              ('readv',  'index', readv_request, False, None)]
-        if expected != transport._activity:
+        if expected != t._activity:
             self.assertEqualDiff(pprint.pformat(expected),
                                  pprint.pformat(transport._activity))
 
@@ -903,12 +904,12 @@
         nodes = self.make_nodes(160, 2, 2)
         for node in nodes:
             builder.add_node(*node)
-        transport = get_transport('trace+' + self.get_url(''))
-        size = transport.put_file('index', builder.finish())
+        t = transport.get_transport('trace+' + self.get_url(''))
+        size = t.put_file('index', builder.finish())
         del builder
-        index = btree_index.BTreeGraphIndex(transport, 'index', size)
-        del transport._activity[:]
-        self.assertEqual([], transport._activity)
+        index = btree_index.BTreeGraphIndex(t, 'index', size)
+        del t._activity[:]
+        self.assertEqual([], t._activity)
         # search for one key
         found_nodes = list(index.iter_entries([nodes[30][0]]))
         bare_nodes = []
@@ -922,7 +923,7 @@
         # Should have read the root node, then one leaf page:
         self.assertEqual([('readv', 'index', [(0, 4096)], False, None),
              ('readv',  'index', [(8192, 4096), ], False, None)],
-            transport._activity)
+            t._activity)
 
     def test_iter_key_prefix_1_element_key_None(self):
         index = self.make_index()
@@ -1152,7 +1153,7 @@
         for node in nodes:
             builder.add_node(*node)
         stream = builder.finish()
-        trans = get_transport(self.get_url())
+        trans = transport.get_transport(self.get_url())
         size = trans.put_file('index', stream)
         index = btree_index.BTreeGraphIndex(trans, 'index', size)
         self.assertEqual(500, index.key_count())
@@ -1349,8 +1350,8 @@
         This doesn't actually create anything on disk, it just primes a
         BTreeGraphIndex with the recommended information.
         """
-        index = btree_index.BTreeGraphIndex(get_transport('memory:///'),
-                                            'test-index', size=size)
+        index = btree_index.BTreeGraphIndex(
+            transport.get_transport('memory:///'), 'test-index', size=size)
         if recommended_pages is not None:
             index._recommended_pages = recommended_pages
         return index

=== modified file 'bzrlib/tests/test_bzrdir.py'
--- bzrlib/tests/test_bzrdir.py	2010-03-25 14:22:41 +0000
+++ bzrlib/tests/test_bzrdir.py	2010-06-23 18:34:40 +0000
@@ -1111,9 +1111,11 @@
     """
 
     def create_transport_readonly_server(self):
+        # We don't set the http protocol version, relying on the default
         return http_utils.HTTPServerRedirecting()
 
     def create_transport_secondary_server(self):
+        # We don't set the http protocol version, relying on the default
         return http_utils.HTTPServerRedirecting()
 
     def setUp(self):

=== modified file 'bzrlib/tests/test_debug.py'
--- bzrlib/tests/test_debug.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/test_debug.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,13 +20,14 @@
 import os
 
 
-from bzrlib import debug
+from bzrlib import (
+    debug,
+    tests,
+    )
 from bzrlib.config import config_filename, ensure_config_dir_exists
-from bzrlib.transport import get_transport
-from bzrlib.tests import TestCaseInTempDir
-
-
-class TestDebugFlags(TestCaseInTempDir):
+
+
+class TestDebugFlags(tests.TestCaseInTempDir):
 
     def test_set_debug_flags_from_config(self):
         # test both combinations because configobject automatically splits up

=== modified file 'bzrlib/tests/test_directory_service.py'
--- bzrlib/tests/test_directory_service.py	2010-06-02 04:50:35 +0000
+++ bzrlib/tests/test_directory_service.py	2010-06-23 18:34:40 +0000
@@ -18,11 +18,11 @@
 
 from bzrlib import (
     errors,
+    transport,
     urlutils,
     )
 from bzrlib.directory_service import DirectoryServiceRegistry, directories
 from bzrlib.tests import TestCase, TestCaseWithTransport
-from bzrlib.transport import get_transport
 
 
 class FooService(object):
@@ -56,7 +56,7 @@
         directories.register('foo:', FooService, 'Map foo URLs to http urls')
         self.addCleanup(directories.remove, 'foo:')
         self.assertEqual(FooService.base + 'bar/',
-                         get_transport('foo:bar').base)
+                         transport.get_transport('foo:bar').base)
 
 
 class TestAliasDirectory(TestCaseWithTransport):

=== modified file 'bzrlib/tests/test_http.py'
--- bzrlib/tests/test_http.py	2010-03-18 23:11:15 +0000
+++ bzrlib/tests/test_http.py	2010-06-23 18:34:40 +0000
@@ -89,6 +89,18 @@
                             _qualified_prefix='http+pycurl',)))
     tests.multiply_tests(t_tests, transport_scenarios, result)
 
+    protocol_scenarios = [
+            ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
+            ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
+            ]
+
+    # some tests are parametrized by the protocol version only
+    p_tests, remaining_tests = tests.split_suite_by_condition(
+        remaining_tests, tests.condition_isinstance((
+                TestAuthOnRedirected,
+                )))
+    tests.multiply_tests(p_tests, protocol_scenarios, result)
+
     # each implementation tested with each HTTP version
     tp_tests, remaining_tests = tests.split_suite_by_condition(
         remaining_tests, tests.condition_isinstance((
@@ -103,10 +115,6 @@
                 TestRanges,
                 TestSpecificRequestHandler,
                 )))
-    protocol_scenarios = [
-            ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
-            ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
-            ]
     tp_scenarios = tests.multiply_scenarios(transport_scenarios,
                                             protocol_scenarios)
     tests.multiply_tests(tp_tests, tp_scenarios, result)
@@ -2156,13 +2164,14 @@
     _transport = _urllib.HttpTransport_urllib
 
     def create_transport_readonly_server(self):
-        return self._auth_server()
+        return self._auth_server(protocol_version=self._protocol_version)
 
     def create_transport_secondary_server(self):
         """Create the secondary server redirecting to the primary server"""
         new = self.get_readonly_server()
 
-        redirecting = http_utils.HTTPServerRedirecting()
+        redirecting = http_utils.HTTPServerRedirecting(
+            protocol_version=self._protocol_version)
         redirecting.redirect_to(new.host, new.port)
         return redirecting
 

=== modified file 'bzrlib/tests/test_index.py'
--- bzrlib/tests/test_index.py	2010-04-08 07:01:10 +0000
+++ bzrlib/tests/test_index.py	2010-06-23 18:34:40 +0000
@@ -16,16 +16,18 @@
 
 """Tests for indices."""
 
-from bzrlib import errors
-from bzrlib.index import *
-from bzrlib.tests import TestCaseWithMemoryTransport
-from bzrlib.transport import get_transport
-
-
-class TestGraphIndexBuilder(TestCaseWithMemoryTransport):
+from bzrlib import (
+    errors,
+    index,
+    tests,
+    transport,
+    )
+
+
+class TestGraphIndexBuilder(tests.TestCaseWithMemoryTransport):
 
     def test_build_index_empty(self):
-        builder = GraphIndexBuilder()
+        builder = index.GraphIndexBuilder()
         stream = builder.finish()
         contents = stream.read()
         self.assertEqual(
@@ -33,7 +35,7 @@
             contents)
 
     def test_build_index_empty_two_element_keys(self):
-        builder = GraphIndexBuilder(key_elements=2)
+        builder = index.GraphIndexBuilder(key_elements=2)
         stream = builder.finish()
         contents = stream.read()
         self.assertEqual(
@@ -41,7 +43,7 @@
             contents)
 
     def test_build_index_one_reference_list_empty(self):
-        builder = GraphIndexBuilder(reference_lists=1)
+        builder = index.GraphIndexBuilder(reference_lists=1)
         stream = builder.finish()
         contents = stream.read()
         self.assertEqual(
@@ -49,7 +51,7 @@
             contents)
 
     def test_build_index_two_reference_list_empty(self):
-        builder = GraphIndexBuilder(reference_lists=2)
+        builder = index.GraphIndexBuilder(reference_lists=2)
         stream = builder.finish()
         contents = stream.read()
         self.assertEqual(
@@ -57,7 +59,7 @@
             contents)
 
     def test_build_index_one_node_no_refs(self):
-        builder = GraphIndexBuilder()
+        builder = index.GraphIndexBuilder()
         builder.add_node(('akey', ), 'data')
         stream = builder.finish()
         contents = stream.read()
@@ -66,7 +68,7 @@
             "akey\x00\x00\x00data\n\n", contents)
 
     def test_build_index_one_node_no_refs_accepts_empty_reflist(self):
-        builder = GraphIndexBuilder()
+        builder = index.GraphIndexBuilder()
         builder.add_node(('akey', ), 'data', ())
         stream = builder.finish()
         contents = stream.read()
@@ -78,7 +80,7 @@
         # multipart keys are separated by \x00 - because they are fixed length,
         # not variable this does not cause any issues, and seems clearer to the
         # author.
-        builder = GraphIndexBuilder(key_elements=2)
+        builder = index.GraphIndexBuilder(key_elements=2)
         builder.add_node(('akey', 'secondpart'), 'data')
         stream = builder.finish()
         contents = stream.read()
@@ -87,7 +89,7 @@
             "akey\x00secondpart\x00\x00\x00data\n\n", contents)
 
     def test_add_node_empty_value(self):
-        builder = GraphIndexBuilder()
+        builder = index.GraphIndexBuilder()
         builder.add_node(('akey', ), '')
         stream = builder.finish()
         contents = stream.read()
@@ -97,7 +99,7 @@
 
     def test_build_index_nodes_sorted(self):
         # the highest sorted node comes first.
-        builder = GraphIndexBuilder()
+        builder = index.GraphIndexBuilder()
         # use three to have a good chance of glitching dictionary hash
         # lookups etc. Insert in randomish order that is not correct
         # and not the reverse of the correct order.
@@ -115,7 +117,7 @@
 
     def test_build_index_2_element_key_nodes_sorted(self):
         # multiple element keys are sorted first-key, second-key.
-        builder = GraphIndexBuilder(key_elements=2)
+        builder = index.GraphIndexBuilder(key_elements=2)
         # use three values of each key element, to have a good chance of
         # glitching dictionary hash lookups etc. Insert in randomish order that
         # is not correct and not the reverse of the correct order.
@@ -144,7 +146,7 @@
             "\n", contents)
 
     def test_build_index_reference_lists_are_included_one(self):
-        builder = GraphIndexBuilder(reference_lists=1)
+        builder = index.GraphIndexBuilder(reference_lists=1)
         builder.add_node(('key', ), 'data', ([], ))
         stream = builder.finish()
         contents = stream.read()
@@ -154,7 +156,7 @@
             "\n", contents)
 
     def test_build_index_reference_lists_with_2_element_keys(self):
-        builder = GraphIndexBuilder(reference_lists=1, key_elements=2)
+        builder = index.GraphIndexBuilder(reference_lists=1, key_elements=2)
         builder.add_node(('key', 'key2'), 'data', ([], ))
         stream = builder.finish()
         contents = stream.read()
@@ -164,7 +166,7 @@
             "\n", contents)
 
     def test_build_index_reference_lists_are_included_two(self):
-        builder = GraphIndexBuilder(reference_lists=2)
+        builder = index.GraphIndexBuilder(reference_lists=2)
         builder.add_node(('key', ), 'data', ([], []))
         stream = builder.finish()
         contents = stream.read()
@@ -174,12 +176,12 @@
             "\n", contents)
 
     def test_clear_cache(self):
-        builder = GraphIndexBuilder(reference_lists=2)
+        builder = index.GraphIndexBuilder(reference_lists=2)
         # This is a no-op, but the api should exist
         builder.clear_cache()
 
     def test_node_references_are_byte_offsets(self):
-        builder = GraphIndexBuilder(reference_lists=1)
+        builder = index.GraphIndexBuilder(reference_lists=1)
         builder.add_node(('reference', ), 'data', ([], ))
         builder.add_node(('key', ), 'data', ([('reference', )], ))
         stream = builder.finish()
@@ -191,10 +193,11 @@
             "\n", contents)
 
     def test_node_references_are_cr_delimited(self):
-        builder = GraphIndexBuilder(reference_lists=1)
+        builder = index.GraphIndexBuilder(reference_lists=1)
         builder.add_node(('reference', ), 'data', ([], ))
         builder.add_node(('reference2', ), 'data', ([], ))
-        builder.add_node(('key', ), 'data', ([('reference', ), ('reference2', )], ))
+        builder.add_node(('key', ), 'data',
+                         ([('reference', ), ('reference2', )], ))
         stream = builder.finish()
         contents = stream.read()
         self.assertEqual(
@@ -205,9 +208,10 @@
             "\n", contents)
 
     def test_multiple_reference_lists_are_tab_delimited(self):
-        builder = GraphIndexBuilder(reference_lists=2)
+        builder = index.GraphIndexBuilder(reference_lists=2)
         builder.add_node(('keference', ), 'data', ([], []))
-        builder.add_node(('rey', ), 'data', ([('keference', )], [('keference', )]))
+        builder.add_node(('rey', ), 'data',
+                         ([('keference', )], [('keference', )]))
         stream = builder.finish()
         contents = stream.read()
         self.assertEqual(
@@ -217,8 +221,9 @@
             "\n", contents)
 
     def test_add_node_referencing_missing_key_makes_absent(self):
-        builder = GraphIndexBuilder(reference_lists=1)
-        builder.add_node(('rey', ), 'data', ([('beference', ), ('aeference2', )], ))
+        builder = index.GraphIndexBuilder(reference_lists=1)
+        builder.add_node(('rey', ), 'data',
+                         ([('beference', ), ('aeference2', )], ))
         stream = builder.finish()
         contents = stream.read()
         self.assertEqual(
@@ -230,7 +235,7 @@
 
     def test_node_references_three_digits(self):
         # test the node digit expands as needed.
-        builder = GraphIndexBuilder(reference_lists=1)
+        builder = index.GraphIndexBuilder(reference_lists=1)
         references = [(str(val), ) for val in reversed(range(9))]
         builder.add_node(('2-key', ), '', (references, ))
         stream = builder.finish()
@@ -252,7 +257,7 @@
     def test_absent_has_no_reference_overhead(self):
         # the offsets after an absent record should be correct when there are
         # >1 reference lists.
-        builder = GraphIndexBuilder(reference_lists=2)
+        builder = index.GraphIndexBuilder(reference_lists=2)
         builder.add_node(('parent', ), '', ([('aail', ), ('zther', )], []))
         stream = builder.finish()
         contents = stream.read()
@@ -264,7 +269,7 @@
             "\n", contents)
 
     def test_add_node_bad_key(self):
-        builder = GraphIndexBuilder()
+        builder = index.GraphIndexBuilder()
         for bad_char in '\t\n\x0b\x0c\r\x00 ':
             self.assertRaises(errors.BadIndexKey, builder.add_node,
                 ('a%skey' % bad_char, ), 'data')
@@ -279,30 +284,30 @@
         self.assertRaises(errors.BadIndexKey, builder.add_node,
                 ('primary', 'secondary'), 'data')
         # secondary key elements get checked too:
-        builder = GraphIndexBuilder(key_elements=2)
+        builder = index.GraphIndexBuilder(key_elements=2)
         for bad_char in '\t\n\x0b\x0c\r\x00 ':
             self.assertRaises(errors.BadIndexKey, builder.add_node,
                 ('prefix', 'a%skey' % bad_char), 'data')
 
     def test_add_node_bad_data(self):
-        builder = GraphIndexBuilder()
+        builder = index.GraphIndexBuilder()
         self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ),
             'data\naa')
         self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ),
             'data\x00aa')
 
     def test_add_node_bad_mismatched_ref_lists_length(self):
-        builder = GraphIndexBuilder()
+        builder = index.GraphIndexBuilder()
         self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ),
             'data aa', ([], ))
-        builder = GraphIndexBuilder(reference_lists=1)
+        builder = index.GraphIndexBuilder(reference_lists=1)
         self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ),
             'data aa')
         self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ),
             'data aa', (), )
         self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ),
             'data aa', ([], []))
-        builder = GraphIndexBuilder(reference_lists=2)
+        builder = index.GraphIndexBuilder(reference_lists=2)
         self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ),
             'data aa')
         self.assertRaises(errors.BadIndexValue, builder.add_node, ('akey', ),
@@ -312,7 +317,7 @@
 
     def test_add_node_bad_key_in_reference_lists(self):
         # first list, first key - trivial
-        builder = GraphIndexBuilder(reference_lists=1)
+        builder = index.GraphIndexBuilder(reference_lists=1)
         self.assertRaises(errors.BadIndexKey, builder.add_node, ('akey', ),
             'data aa', ([('a key', )], ))
         # references keys must be tuples too
@@ -329,41 +334,41 @@
             'data aa', ([('agoodkey', ), ('that is a bad key', )], ))
         # and if there is more than one list it should be getting checked
         # too
-        builder = GraphIndexBuilder(reference_lists=2)
+        builder = index.GraphIndexBuilder(reference_lists=2)
         self.assertRaises(errors.BadIndexKey, builder.add_node, ('akey', ),
             'data aa', ([], ['a bad key']))
 
     def test_add_duplicate_key(self):
-        builder = GraphIndexBuilder()
+        builder = index.GraphIndexBuilder()
         builder.add_node(('key', ), 'data')
-        self.assertRaises(errors.BadIndexDuplicateKey, builder.add_node, ('key', ),
-            'data')
+        self.assertRaises(errors.BadIndexDuplicateKey,
+                          builder.add_node, ('key', ), 'data')
 
     def test_add_duplicate_key_2_elements(self):
-        builder = GraphIndexBuilder(key_elements=2)
+        builder = index.GraphIndexBuilder(key_elements=2)
         builder.add_node(('key', 'key'), 'data')
         self.assertRaises(errors.BadIndexDuplicateKey, builder.add_node,
             ('key', 'key'), 'data')
 
     def test_add_key_after_referencing_key(self):
-        builder = GraphIndexBuilder(reference_lists=1)
+        builder = index.GraphIndexBuilder(reference_lists=1)
         builder.add_node(('key', ), 'data', ([('reference', )], ))
         builder.add_node(('reference', ), 'data', ([],))
 
     def test_add_key_after_referencing_key_2_elements(self):
-        builder = GraphIndexBuilder(reference_lists=1, key_elements=2)
+        builder = index.GraphIndexBuilder(reference_lists=1, key_elements=2)
         builder.add_node(('k', 'ey'), 'data', ([('reference', 'tokey')], ))
         builder.add_node(('reference', 'tokey'), 'data', ([],))
 
     def test_set_optimize(self):
-        builder = GraphIndexBuilder(reference_lists=1, key_elements=2)
+        builder = index.GraphIndexBuilder(reference_lists=1, key_elements=2)
         builder.set_optimize(for_size=True)
         self.assertTrue(builder._optimize_for_size)
         builder.set_optimize(for_size=False)
         self.assertFalse(builder._optimize_for_size)
 
 
-class TestGraphIndex(TestCaseWithMemoryTransport):
+class TestGraphIndex(tests.TestCaseWithMemoryTransport):
 
     def make_key(self, number):
         return (str(number) + 'X'*100,)
@@ -380,24 +385,24 @@
         return nodes
 
     def make_index(self, ref_lists=0, key_elements=1, nodes=[]):
-        builder = GraphIndexBuilder(ref_lists, key_elements=key_elements)
+        builder = index.GraphIndexBuilder(ref_lists, key_elements=key_elements)
         for key, value, references in nodes:
             builder.add_node(key, value, references)
         stream = builder.finish()
-        trans = get_transport('trace+' + self.get_url())
+        trans = transport.get_transport('trace+' + self.get_url())
         size = trans.put_file('index', stream)
-        return GraphIndex(trans, 'index', size)
+        return index.GraphIndex(trans, 'index', size)
 
     def make_index_with_offset(self, ref_lists=0, key_elements=1, nodes=[],
                                offset=0):
-        builder = GraphIndexBuilder(ref_lists, key_elements=key_elements)
+        builder = index.GraphIndexBuilder(ref_lists, key_elements=key_elements)
         for key, value, references in nodes:
             builder.add_node(key, value, references)
         content = builder.finish().read()
         size = len(content)
         trans = self.get_transport()
         trans.put_bytes('index', (' '*offset) + content)
-        return GraphIndex(trans, 'index', size, offset=offset)
+        return index.GraphIndex(trans, 'index', size, offset=offset)
 
     def test_clear_cache(self):
         index = self.make_index()
@@ -408,18 +413,18 @@
     def test_open_bad_index_no_error(self):
         trans = self.get_transport()
         trans.put_bytes('name', "not an index\n")
-        index = GraphIndex(trans, 'name', 13)
+        idx = index.GraphIndex(trans, 'name', 13)
 
     def test_with_offset(self):
         nodes = self.make_nodes(200)
-        index = self.make_index_with_offset(offset=1234567, nodes=nodes)
-        self.assertEqual(200, index.key_count())
+        idx = self.make_index_with_offset(offset=1234567, nodes=nodes)
+        self.assertEqual(200, idx.key_count())
 
     def test_buffer_all_with_offset(self):
         nodes = self.make_nodes(200)
-        index = self.make_index_with_offset(offset=1234567, nodes=nodes)
-        index._buffer_all()
-        self.assertEqual(200, index.key_count())
+        idx = self.make_index_with_offset(offset=1234567, nodes=nodes)
+        idx._buffer_all()
+        self.assertEqual(200, idx.key_count())
 
     def test_side_effect_buffering_with_offset(self):
         nodes = self.make_nodes(20)
@@ -830,9 +835,9 @@
         self.assertEqual([], list(index.iter_entries([('a', )])))
 
     def test_iter_missing_entry_empty_no_size(self):
-        index = self.make_index()
-        index = GraphIndex(index._transport, 'index', None)
-        self.assertEqual([], list(index.iter_entries([('a', )])))
+        idx = self.make_index()
+        idx = index.GraphIndex(idx._transport, 'index', None)
+        self.assertEqual([], list(idx.iter_entries([('a', )])))
 
     def test_iter_key_prefix_1_element_key_None(self):
         index = self.make_index()
@@ -928,17 +933,17 @@
     def test_validate_bad_index_errors(self):
         trans = self.get_transport()
         trans.put_bytes('name', "not an index\n")
-        index = GraphIndex(trans, 'name', 13)
-        self.assertRaises(errors.BadIndexFormatSignature, index.validate)
+        idx = index.GraphIndex(trans, 'name', 13)
+        self.assertRaises(errors.BadIndexFormatSignature, idx.validate)
 
     def test_validate_bad_node_refs(self):
-        index = self.make_index(2)
+        idx = self.make_index(2)
         trans = self.get_transport()
         content = trans.get_bytes('index')
         # change the options line to end with a rather than a parseable number
         new_content = content[:-2] + 'a\n\n'
         trans.put_bytes('index', new_content)
-        self.assertRaises(errors.BadIndexOptions, index.validate)
+        self.assertRaises(errors.BadIndexOptions, idx.validate)
 
     def test_validate_missing_end_line_empty(self):
         index = self.make_index(2)
@@ -1049,25 +1054,25 @@
         self.assertEqual(set(), search_keys)
 
     def test_supports_unlimited_cache(self):
-        builder = GraphIndexBuilder(0, key_elements=1)
+        builder = index.GraphIndexBuilder(0, key_elements=1)
         stream = builder.finish()
-        trans = get_transport(self.get_url())
+        trans = transport.get_transport(self.get_url())
         size = trans.put_file('index', stream)
         # It doesn't matter what unlimited_cache does here, just that it can be
         # passed
-        index = GraphIndex(trans, 'index', size, unlimited_cache=True)
-
-
-class TestCombinedGraphIndex(TestCaseWithMemoryTransport):
+        idx = index.GraphIndex(trans, 'index', size, unlimited_cache=True)
+
+
+class TestCombinedGraphIndex(tests.TestCaseWithMemoryTransport):
 
     def make_index(self, name, ref_lists=0, key_elements=1, nodes=[]):
-        builder = GraphIndexBuilder(ref_lists, key_elements=key_elements)
+        builder = index.GraphIndexBuilder(ref_lists, key_elements=key_elements)
         for key, value, references in nodes:
             builder.add_node(key, value, references)
         stream = builder.finish()
         trans = self.get_transport()
         size = trans.put_file(name, stream)
-        return GraphIndex(trans, name, size)
+        return index.GraphIndex(trans, name, size)
 
     def make_combined_index_with_missing(self, missing=['1', '2']):
         """Create a CombinedGraphIndex which will have missing indexes.
@@ -1079,9 +1084,9 @@
         :param missing: The underlying indexes to delete
         :return: (CombinedGraphIndex, reload_counter)
         """
-        index1 = self.make_index('1', nodes=[(('1',), '', ())])
-        index2 = self.make_index('2', nodes=[(('2',), '', ())])
-        index3 = self.make_index('3', nodes=[
+        idx1 = self.make_index('1', nodes=[(('1',), '', ())])
+        idx2 = self.make_index('2', nodes=[(('2',), '', ())])
+        idx3 = self.make_index('3', nodes=[
             (('1',), '', ()),
             (('2',), '', ())])
 
@@ -1089,29 +1094,30 @@
         reload_counter = [0, 0, 0]
         def reload():
             reload_counter[0] += 1
-            new_indices = [index3]
-            if index._indices == new_indices:
+            new_indices = [idx3]
+            if idx._indices == new_indices:
                 reload_counter[2] += 1
                 return False
             reload_counter[1] += 1
-            index._indices[:] = new_indices
+            idx._indices[:] = new_indices
             return True
-        index = CombinedGraphIndex([index1, index2], reload_func=reload)
+        idx = index.CombinedGraphIndex([idx1, idx2], reload_func=reload)
         trans = self.get_transport()
         for fname in missing:
             trans.delete(fname)
-        return index, reload_counter
+        return idx, reload_counter
 
     def test_open_missing_index_no_error(self):
         trans = self.get_transport()
-        index1 = GraphIndex(trans, 'missing', 100)
-        index = CombinedGraphIndex([index1])
+        idx1 = index.GraphIndex(trans, 'missing', 100)
+        idx = index.CombinedGraphIndex([idx1])
 
     def test_add_index(self):
-        index = CombinedGraphIndex([])
-        index1 = self.make_index('name', 0, nodes=[(('key', ), '', ())])
-        index.insert_index(0, index1)
-        self.assertEqual([(index1, ('key', ), '')], list(index.iter_all_entries()))
+        idx = index.CombinedGraphIndex([])
+        idx1 = self.make_index('name', 0, nodes=[(('key', ), '', ())])
+        idx.insert_index(0, idx1)
+        self.assertEqual([(idx1, ('key', ), '')],
+                         list(idx.iter_all_entries()))
 
     def test_clear_cache(self):
         log = []
@@ -1128,165 +1134,166 @@
                 log.append(self._index)
                 return self._index.clear_cache()
 
-        index = CombinedGraphIndex([])
-        index1 = self.make_index('name', 0, nodes=[(('key', ), '', ())])
-        index.insert_index(0, ClearCacheProxy(index1))
-        index2 = self.make_index('name', 0, nodes=[(('key', ), '', ())])
-        index.insert_index(1, ClearCacheProxy(index2))
+        idx = index.CombinedGraphIndex([])
+        idx1 = self.make_index('name', 0, nodes=[(('key', ), '', ())])
+        idx.insert_index(0, ClearCacheProxy(idx1))
+        idx2 = self.make_index('name', 0, nodes=[(('key', ), '', ())])
+        idx.insert_index(1, ClearCacheProxy(idx2))
         # CombinedGraphIndex should call 'clear_cache()' on all children
-        index.clear_cache()
-        self.assertEqual(sorted([index1, index2]), sorted(log))
+        idx.clear_cache()
+        self.assertEqual(sorted([idx1, idx2]), sorted(log))
 
     def test_iter_all_entries_empty(self):
-        index = CombinedGraphIndex([])
-        self.assertEqual([], list(index.iter_all_entries()))
+        idx = index.CombinedGraphIndex([])
+        self.assertEqual([], list(idx.iter_all_entries()))
 
     def test_iter_all_entries_children_empty(self):
-        index1 = self.make_index('name')
-        index = CombinedGraphIndex([index1])
-        self.assertEqual([], list(index.iter_all_entries()))
+        idx1 = self.make_index('name')
+        idx = index.CombinedGraphIndex([idx1])
+        self.assertEqual([], list(idx.iter_all_entries()))
 
     def test_iter_all_entries_simple(self):
-        index1 = self.make_index('name', nodes=[(('name', ), 'data', ())])
-        index = CombinedGraphIndex([index1])
-        self.assertEqual([(index1, ('name', ), 'data')],
-            list(index.iter_all_entries()))
+        idx1 = self.make_index('name', nodes=[(('name', ), 'data', ())])
+        idx = index.CombinedGraphIndex([idx1])
+        self.assertEqual([(idx1, ('name', ), 'data')],
+            list(idx.iter_all_entries()))
 
     def test_iter_all_entries_two_indices(self):
-        index1 = self.make_index('name1', nodes=[(('name', ), 'data', ())])
-        index2 = self.make_index('name2', nodes=[(('2', ), '', ())])
-        index = CombinedGraphIndex([index1, index2])
-        self.assertEqual([(index1, ('name', ), 'data'),
-            (index2, ('2', ), '')],
-            list(index.iter_all_entries()))
+        idx1 = self.make_index('name1', nodes=[(('name', ), 'data', ())])
+        idx2 = self.make_index('name2', nodes=[(('2', ), '', ())])
+        idx = index.CombinedGraphIndex([idx1, idx2])
+        self.assertEqual([(idx1, ('name', ), 'data'),
+                          (idx2, ('2', ), '')],
+                         list(idx.iter_all_entries()))
 
     def test_iter_entries_two_indices_dup_key(self):
-        index1 = self.make_index('name1', nodes=[(('name', ), 'data', ())])
-        index2 = self.make_index('name2', nodes=[(('name', ), 'data', ())])
-        index = CombinedGraphIndex([index1, index2])
-        self.assertEqual([(index1, ('name', ), 'data')],
-            list(index.iter_entries([('name', )])))
+        idx1 = self.make_index('name1', nodes=[(('name', ), 'data', ())])
+        idx2 = self.make_index('name2', nodes=[(('name', ), 'data', ())])
+        idx = index.CombinedGraphIndex([idx1, idx2])
+        self.assertEqual([(idx1, ('name', ), 'data')],
+                         list(idx.iter_entries([('name', )])))
 
     def test_iter_all_entries_two_indices_dup_key(self):
-        index1 = self.make_index('name1', nodes=[(('name', ), 'data', ())])
-        index2 = self.make_index('name2', nodes=[(('name', ), 'data', ())])
-        index = CombinedGraphIndex([index1, index2])
-        self.assertEqual([(index1, ('name', ), 'data')],
-            list(index.iter_all_entries()))
+        idx1 = self.make_index('name1', nodes=[(('name', ), 'data', ())])
+        idx2 = self.make_index('name2', nodes=[(('name', ), 'data', ())])
+        idx = index.CombinedGraphIndex([idx1, idx2])
+        self.assertEqual([(idx1, ('name', ), 'data')],
+                         list(idx.iter_all_entries()))
 
     def test_iter_key_prefix_2_key_element_refs(self):
-        index1 = self.make_index('1', 1, key_elements=2, nodes=[
-            (('name', 'fin1'), 'data', ([('ref', 'erence')], ))])
-        index2 = self.make_index('2', 1, key_elements=2, nodes=[
-            (('name', 'fin2'), 'beta', ([], )),
-            (('ref', 'erence'), 'refdata', ([], ))])
-        index = CombinedGraphIndex([index1, index2])
-        self.assertEqual(set([(index1, ('name', 'fin1'), 'data', ((('ref', 'erence'),),)),
-            (index2, ('ref', 'erence'), 'refdata', ((), ))]),
-            set(index.iter_entries_prefix([('name', 'fin1'), ('ref', 'erence')])))
-        self.assertEqual(set([(index1, ('name', 'fin1'), 'data', ((('ref', 'erence'),),)),
-            (index2, ('name', 'fin2'), 'beta', ((), ))]),
-            set(index.iter_entries_prefix([('name', None)])))
+        idx1 = self.make_index('1', 1, key_elements=2, nodes=[
+                (('name', 'fin1'), 'data', ([('ref', 'erence')], ))])
+        idx2 = self.make_index('2', 1, key_elements=2, nodes=[
+                (('name', 'fin2'), 'beta', ([], )),
+                (('ref', 'erence'), 'refdata', ([], ))])
+        idx = index.CombinedGraphIndex([idx1, idx2])
+        self.assertEqual(set([(idx1, ('name', 'fin1'), 'data',
+                               ((('ref', 'erence'),),)),
+                              (idx2, ('ref', 'erence'), 'refdata', ((), ))]),
+                         set(idx.iter_entries_prefix([('name', 'fin1'),
+                                                        ('ref', 'erence')])))
+        self.assertEqual(set([(idx1, ('name', 'fin1'), 'data',
+                               ((('ref', 'erence'),),)),
+                              (idx2, ('name', 'fin2'), 'beta', ((), ))]),
+                         set(idx.iter_entries_prefix([('name', None)])))
 
     def test_iter_nothing_empty(self):
-        index = CombinedGraphIndex([])
-        self.assertEqual([], list(index.iter_entries([])))
+        idx = index.CombinedGraphIndex([])
+        self.assertEqual([], list(idx.iter_entries([])))
 
     def test_iter_nothing_children_empty(self):
-        index1 = self.make_index('name')
-        index = CombinedGraphIndex([index1])
-        self.assertEqual([], list(index.iter_entries([])))
+        idx1 = self.make_index('name')
+        idx = index.CombinedGraphIndex([idx1])
+        self.assertEqual([], list(idx.iter_entries([])))
 
     def test_iter_all_keys(self):
-        index1 = self.make_index('1', 1, nodes=[
-            (('name', ), 'data', ([('ref', )], ))])
-        index2 = self.make_index('2', 1, nodes=[
-            (('ref', ), 'refdata', ((), ))])
-        index = CombinedGraphIndex([index1, index2])
-        self.assertEqual(set([(index1, ('name', ), 'data', ((('ref', ), ), )),
-            (index2, ('ref', ), 'refdata', ((), ))]),
-            set(index.iter_entries([('name', ), ('ref', )])))
+        idx1 = self.make_index('1', 1, nodes=[(('name', ), 'data',
+                                               ([('ref', )], ))])
+        idx2 = self.make_index('2', 1, nodes=[(('ref', ), 'refdata', ((), ))])
+        idx = index.CombinedGraphIndex([idx1, idx2])
+        self.assertEqual(set([(idx1, ('name', ), 'data', ((('ref', ), ), )),
+                              (idx2, ('ref', ), 'refdata', ((), ))]),
+                         set(idx.iter_entries([('name', ), ('ref', )])))
 
     def test_iter_all_keys_dup_entry(self):
-        index1 = self.make_index('1', 1, nodes=[
-            (('name', ), 'data', ([('ref', )], )),
-            (('ref', ), 'refdata', ([], ))])
-        index2 = self.make_index('2', 1, nodes=[
-            (('ref', ), 'refdata', ([], ))])
-        index = CombinedGraphIndex([index1, index2])
-        self.assertEqual(set([(index1, ('name', ), 'data', ((('ref',),),)),
-            (index1, ('ref', ), 'refdata', ((), ))]),
-            set(index.iter_entries([('name', ), ('ref', )])))
+        idx1 = self.make_index('1', 1, nodes=[(('name', ), 'data',
+                                                 ([('ref', )], )),
+                                                (('ref', ), 'refdata', ([], ))])
+        idx2 = self.make_index('2', 1, nodes=[(('ref', ), 'refdata', ([], ))])
+        idx = index.CombinedGraphIndex([idx1, idx2])
+        self.assertEqual(set([(idx1, ('name', ), 'data', ((('ref',),),)),
+                              (idx1, ('ref', ), 'refdata', ((), ))]),
+                         set(idx.iter_entries([('name', ), ('ref', )])))
 
     def test_iter_missing_entry_empty(self):
-        index = CombinedGraphIndex([])
-        self.assertEqual([], list(index.iter_entries([('a', )])))
+        idx = index.CombinedGraphIndex([])
+        self.assertEqual([], list(idx.iter_entries([('a', )])))
 
     def test_iter_missing_entry_one_index(self):
-        index1 = self.make_index('1')
-        index = CombinedGraphIndex([index1])
-        self.assertEqual([], list(index.iter_entries([('a', )])))
+        idx1 = self.make_index('1')
+        idx = index.CombinedGraphIndex([idx1])
+        self.assertEqual([], list(idx.iter_entries([('a', )])))
 
     def test_iter_missing_entry_two_index(self):
-        index1 = self.make_index('1')
-        index2 = self.make_index('2')
-        index = CombinedGraphIndex([index1, index2])
-        self.assertEqual([], list(index.iter_entries([('a', )])))
+        idx1 = self.make_index('1')
+        idx2 = self.make_index('2')
+        idx = index.CombinedGraphIndex([idx1, idx2])
+        self.assertEqual([], list(idx.iter_entries([('a', )])))
 
     def test_iter_entry_present_one_index_only(self):
-        index1 = self.make_index('1', nodes=[(('key', ), '', ())])
-        index2 = self.make_index('2', nodes=[])
-        index = CombinedGraphIndex([index1, index2])
-        self.assertEqual([(index1, ('key', ), '')],
-            list(index.iter_entries([('key', )])))
+        idx1 = self.make_index('1', nodes=[(('key', ), '', ())])
+        idx2 = self.make_index('2', nodes=[])
+        idx = index.CombinedGraphIndex([idx1, idx2])
+        self.assertEqual([(idx1, ('key', ), '')],
+                         list(idx.iter_entries([('key', )])))
         # and in the other direction
-        index = CombinedGraphIndex([index2, index1])
-        self.assertEqual([(index1, ('key', ), '')],
-            list(index.iter_entries([('key', )])))
+        idx = index.CombinedGraphIndex([idx2, idx1])
+        self.assertEqual([(idx1, ('key', ), '')],
+                         list(idx.iter_entries([('key', )])))
 
     def test_key_count_empty(self):
-        index1 = self.make_index('1', nodes=[])
-        index2 = self.make_index('2', nodes=[])
-        index = CombinedGraphIndex([index1, index2])
-        self.assertEqual(0, index.key_count())
+        idx1 = self.make_index('1', nodes=[])
+        idx2 = self.make_index('2', nodes=[])
+        idx = index.CombinedGraphIndex([idx1, idx2])
+        self.assertEqual(0, idx.key_count())
 
     def test_key_count_sums_index_keys(self):
-        index1 = self.make_index('1', nodes=[
+        idx1 = self.make_index('1', nodes=[
             (('1',), '', ()),
             (('2',), '', ())])
-        index2 = self.make_index('2', nodes=[(('1',), '', ())])
-        index = CombinedGraphIndex([index1, index2])
-        self.assertEqual(3, index.key_count())
+        idx2 = self.make_index('2', nodes=[(('1',), '', ())])
+        idx = index.CombinedGraphIndex([idx1, idx2])
+        self.assertEqual(3, idx.key_count())
 
     def test_validate_bad_child_index_errors(self):
         trans = self.get_transport()
         trans.put_bytes('name', "not an index\n")
-        index1 = GraphIndex(trans, 'name', 13)
-        index = CombinedGraphIndex([index1])
-        self.assertRaises(errors.BadIndexFormatSignature, index.validate)
+        idx1 = index.GraphIndex(trans, 'name', 13)
+        idx = index.CombinedGraphIndex([idx1])
+        self.assertRaises(errors.BadIndexFormatSignature, idx.validate)
 
     def test_validate_empty(self):
-        index = CombinedGraphIndex([])
-        index.validate()
+        idx = index.CombinedGraphIndex([])
+        idx.validate()
 
     def test_key_count_reloads(self):
-        index, reload_counter = self.make_combined_index_with_missing()
-        self.assertEqual(2, index.key_count())
+        idx, reload_counter = self.make_combined_index_with_missing()
+        self.assertEqual(2, idx.key_count())
         self.assertEqual([1, 1, 0], reload_counter)
 
     def test_key_count_no_reload(self):
-        index, reload_counter = self.make_combined_index_with_missing()
-        index._reload_func = None
+        idx, reload_counter = self.make_combined_index_with_missing()
+        idx._reload_func = None
         # Without a _reload_func we just raise the exception
-        self.assertRaises(errors.NoSuchFile, index.key_count)
+        self.assertRaises(errors.NoSuchFile, idx.key_count)
 
     def test_key_count_reloads_and_fails(self):
         # We have deleted all underlying indexes, so we will try to reload, but
         # still fail. This is mostly to test we don't get stuck in an infinite
         # loop trying to reload
-        index, reload_counter = self.make_combined_index_with_missing(
-                                    ['1', '2', '3'])
-        self.assertRaises(errors.NoSuchFile, index.key_count)
+        idx, reload_counter = self.make_combined_index_with_missing(
+            ['1', '2', '3'])
+        self.assertRaises(errors.NoSuchFile, idx.key_count)
         self.assertEqual([2, 1, 1], reload_counter)
 
     def test_iter_entries_reloads(self):
@@ -1392,27 +1399,27 @@
         return self.make_index('index-%s' % name, 0, nodes=nodes)
 
     def test_reorder_after_iter_entries(self):
-        # Four indices: [key1] in index1, [key2,key3] in index2, [] in index3,
-        # [key4] in index4.
-        index = CombinedGraphIndex([])
-        index.insert_index(0, self.make_index_with_simple_nodes('1'), '1')
-        index.insert_index(1, self.make_index_with_simple_nodes('2'), '2')
-        index.insert_index(2, self.make_index_with_simple_nodes('3'), '3')
-        index.insert_index(3, self.make_index_with_simple_nodes('4'), '4')
-        index1, index2, index3, index4 = index._indices
-        # Query a key from index4 and index2.
-        self.assertLength(2, list(index.iter_entries(
+        # Four indices: [key1] in idx1, [key2,key3] in idx2, [] in idx3,
+        # [key4] in idx4.
+        idx = index.CombinedGraphIndex([])
+        idx.insert_index(0, self.make_index_with_simple_nodes('1'), '1')
+        idx.insert_index(1, self.make_index_with_simple_nodes('2'), '2')
+        idx.insert_index(2, self.make_index_with_simple_nodes('3'), '3')
+        idx.insert_index(3, self.make_index_with_simple_nodes('4'), '4')
+        idx1, idx2, idx3, idx4 = idx._indices
+        # Query a key from idx4 and idx2.
+        self.assertLength(2, list(idx.iter_entries(
             [('index-4-key-1',), ('index-2-key-1',)])))
-        # Now index2 and index4 should be moved to the front (and index1 should
-        # still be before index3).
-        self.assertEqual([index2, index4, index1, index3], index._indices)
-        self.assertEqual(['2', '4', '1', '3'], index._index_names)
+        # Now idx2 and idx4 should be moved to the front (and idx1 should
+        # still be before idx3).
+        self.assertEqual([idx2, idx4, idx1, idx3], idx._indices)
+        self.assertEqual(['2', '4', '1', '3'], idx._index_names)
 
     def test_reorder_propagates_to_siblings(self):
         # Two CombinedGraphIndex objects, with the same number of indicies with
         # matching names.
-        cgi1 = CombinedGraphIndex([])
-        cgi2 = CombinedGraphIndex([])
+        cgi1 = index.CombinedGraphIndex([])
+        cgi2 = index.CombinedGraphIndex([])
         cgi1.insert_index(0, self.make_index_with_simple_nodes('1-1'), 'one')
         cgi1.insert_index(1, self.make_index_with_simple_nodes('1-2'), 'two')
         cgi2.insert_index(0, self.make_index_with_simple_nodes('2-1'), 'one')
@@ -1425,23 +1432,23 @@
         self.assertEqual(['two', 'one'], cgi2._index_names)
 
     def test_validate_reloads(self):
-        index, reload_counter = self.make_combined_index_with_missing()
-        index.validate()
+        idx, reload_counter = self.make_combined_index_with_missing()
+        idx.validate()
         self.assertEqual([1, 1, 0], reload_counter)
 
     def test_validate_reloads_midway(self):
-        index, reload_counter = self.make_combined_index_with_missing(['2'])
-        index.validate()
+        idx, reload_counter = self.make_combined_index_with_missing(['2'])
+        idx.validate()
 
     def test_validate_no_reload(self):
-        index, reload_counter = self.make_combined_index_with_missing()
-        index._reload_func = None
-        self.assertRaises(errors.NoSuchFile, index.validate)
+        idx, reload_counter = self.make_combined_index_with_missing()
+        idx._reload_func = None
+        self.assertRaises(errors.NoSuchFile, idx.validate)
 
     def test_validate_reloads_and_fails(self):
-        index, reload_counter = self.make_combined_index_with_missing(
-                                    ['1', '2', '3'])
-        self.assertRaises(errors.NoSuchFile, index.validate)
+        idx, reload_counter = self.make_combined_index_with_missing(
+            ['1', '2', '3'])
+        self.assertRaises(errors.NoSuchFile, idx.validate)
 
     def test_find_ancestors_across_indexes(self):
         key1 = ('key-1',)
@@ -1456,7 +1463,7 @@
             (key3, 'value', ([key2],)),
             (key4, 'value', ([key3],)),
             ])
-        c_index = CombinedGraphIndex([index1, index2])
+        c_index = index.CombinedGraphIndex([index1, index2])
         parent_map, missing_keys = c_index.find_ancestry([key1], 0)
         self.assertEqual({key1: ()}, parent_map)
         self.assertEqual(set(), missing_keys)
@@ -1479,7 +1486,7 @@
         index2 = self.make_index('34', ref_lists=1, nodes=[
             (key3, 'value', ([key2],)),
             ])
-        c_index = CombinedGraphIndex([index1, index2])
+        c_index = index.CombinedGraphIndex([index1, index2])
         # Searching for a key which is actually not present at all should
         # eventually converge
         parent_map, missing_keys = c_index.find_ancestry([key4], 0)
@@ -1487,7 +1494,7 @@
         self.assertEqual(set([key4]), missing_keys)
 
     def test_find_ancestors_no_indexes(self):
-        c_index = CombinedGraphIndex([])
+        c_index = index.CombinedGraphIndex([])
         key1 = ('key-1',)
         parent_map, missing_keys = c_index.find_ancestry([key1], 0)
         self.assertEqual({}, parent_map)
@@ -1505,7 +1512,7 @@
         index2 = self.make_index('34', ref_lists=1, nodes=[
             (key4, 'value', ([key2, key3],)),
             ])
-        c_index = CombinedGraphIndex([index1, index2])
+        c_index = index.CombinedGraphIndex([index1, index2])
         # Searching for a key which is actually not present at all should
         # eventually converge
         parent_map, missing_keys = c_index.find_ancestry([key4], 0)
@@ -1514,20 +1521,20 @@
         self.assertEqual(set([key3]), missing_keys)
 
     def test__find_ancestors_empty_index(self):
-        index = self.make_index('test', ref_lists=1, key_elements=1, nodes=[])
+        idx = self.make_index('test', ref_lists=1, key_elements=1, nodes=[])
         parent_map = {}
         missing_keys = set()
-        search_keys = index._find_ancestors([('one',), ('two',)], 0, parent_map,
-                                            missing_keys)
+        search_keys = idx._find_ancestors([('one',), ('two',)], 0, parent_map,
+                                          missing_keys)
         self.assertEqual(set(), search_keys)
         self.assertEqual({}, parent_map)
         self.assertEqual(set([('one',), ('two',)]), missing_keys)
 
 
-class TestInMemoryGraphIndex(TestCaseWithMemoryTransport):
+class TestInMemoryGraphIndex(tests.TestCaseWithMemoryTransport):
 
     def make_index(self, ref_lists=0, key_elements=1, nodes=[]):
-        result = InMemoryGraphIndex(ref_lists, key_elements=key_elements)
+        result = index.InMemoryGraphIndex(ref_lists, key_elements=key_elements)
         result.add_nodes(nodes)
         return result
 
@@ -1654,23 +1661,26 @@
         index.validate()
 
 
-class TestGraphIndexPrefixAdapter(TestCaseWithMemoryTransport):
+class TestGraphIndexPrefixAdapter(tests.TestCaseWithMemoryTransport):
 
-    def make_index(self, ref_lists=1, key_elements=2, nodes=[], add_callback=False):
-        result = InMemoryGraphIndex(ref_lists, key_elements=key_elements)
+    def make_index(self, ref_lists=1, key_elements=2, nodes=[],
+                   add_callback=False):
+        result = index.InMemoryGraphIndex(ref_lists, key_elements=key_elements)
         result.add_nodes(nodes)
         if add_callback:
             add_nodes_callback = result.add_nodes
         else:
             add_nodes_callback = None
-        adapter = GraphIndexPrefixAdapter(result, ('prefix', ), key_elements - 1,
+        adapter = index.GraphIndexPrefixAdapter(
+            result, ('prefix', ), key_elements - 1,
             add_nodes_callback=add_nodes_callback)
         return result, adapter
 
     def test_add_node(self):
         index, adapter = self.make_index(add_callback=True)
         adapter.add_node(('key',), 'value', ((('ref',),),))
-        self.assertEqual(set([(index, ('prefix', 'key'), 'value', ((('prefix', 'ref'),),))]),
+        self.assertEqual(set([(index, ('prefix', 'key'), 'value',
+                               ((('prefix', 'ref'),),))]),
             set(index.iter_all_entries()))
 
     def test_add_nodes(self):
@@ -1686,12 +1696,13 @@
             set(index.iter_all_entries()))
 
     def test_construct(self):
-        index = InMemoryGraphIndex()
-        adapter = GraphIndexPrefixAdapter(index, ('prefix', ), 1)
+        idx = index.InMemoryGraphIndex()
+        adapter = index.GraphIndexPrefixAdapter(idx, ('prefix', ), 1)
 
     def test_construct_with_callback(self):
-        index = InMemoryGraphIndex()
-        adapter = GraphIndexPrefixAdapter(index, ('prefix', ), 1, index.add_nodes)
+        idx = index.InMemoryGraphIndex()
+        adapter = index.GraphIndexPrefixAdapter(idx, ('prefix', ), 1,
+                                                idx.add_nodes)
 
     def test_iter_all_entries_cross_prefix_map_errors(self):
         index, adapter = self.make_index(nodes=[

=== modified file 'bzrlib/tests/test_knit.py'
--- bzrlib/tests/test_knit.py	2010-06-04 03:09:35 +0000
+++ bzrlib/tests/test_knit.py	2010-06-23 18:34:40 +0000
@@ -26,6 +26,7 @@
     osutils,
     pack,
     tests,
+    transport,
     tuned_gzip,
     )
 from bzrlib.errors import (
@@ -53,7 +54,6 @@
     TestCaseWithTransport,
     TestNotApplicable,
     )
-from bzrlib.transport import get_transport
 from bzrlib.versionedfile import (
     AbsentContentFactory,
     ConstantMapper,
@@ -1571,13 +1571,13 @@
         # could leave an empty .kndx file, which bzr would later claim was a
         # corrupted file since the header was not present. In reality, the file
         # just wasn't created, so it should be ignored.
-        t = get_transport('.')
+        t = transport.get_transport('.')
         t.put_bytes('test.kndx', '')
 
         knit = self.make_test_knit()
 
     def test_knit_index_checks_header(self):
-        t = get_transport('.')
+        t = transport.get_transport('.')
         t.put_bytes('test.kndx', '# not really a knit header\n\n')
         k = self.make_test_knit()
         self.assertRaises(KnitHeaderError, k.keys)

=== modified file 'bzrlib/tests/test_lockable_files.py'
--- bzrlib/tests/test_lockable_files.py	2010-02-17 17:11:16 +0000
+++ bzrlib/tests/test_lockable_files.py	2010-06-23 18:34:40 +0000
@@ -21,6 +21,7 @@
     errors,
     lockdir,
     osutils,
+    transport,
     )
 from bzrlib.errors import BzrBadParameterNotString, NoSuchFile, ReadOnlyError
 from bzrlib.lockable_files import LockableFiles, TransportLock
@@ -37,7 +38,6 @@
                                  ReadOnlyTransaction,
                                  WriteTransaction,
                                  )
-from bzrlib.transport import get_transport
 
 
 # these tests are applied in each parameterized suite for LockableFiles
@@ -279,9 +279,9 @@
 
     def setUp(self):
         TestCaseInTempDir.setUp(self)
-        transport = get_transport('.')
-        transport.mkdir('.bzr')
-        self.sub_transport = transport.clone('.bzr')
+        t = transport.get_transport('.')
+        t.mkdir('.bzr')
+        self.sub_transport = t.clone('.bzr')
         self.lockable = self.get_lockable()
         self.lockable.create_lock()
 
@@ -304,7 +304,7 @@
 
     def setUp(self):
         TestCaseInTempDir.setUp(self)
-        self.transport = get_transport('.')
+        self.transport = transport.get_transport('.')
         self.lockable = self.get_lockable()
         # the lock creation here sets mode - test_permissions on branch
         # tests that implicitly, but it might be a good idea to factor
@@ -347,7 +347,7 @@
         # in test_remote and test_smart as usual.
         b = self.make_branch('foo')
         self.addCleanup(b.bzrdir.transport.disconnect)
-        self.transport = get_transport('.')
+        self.transport = transport.get_transport('.')
         self.lockable = self.get_lockable()
 
     def get_lockable(self):

=== modified file 'bzrlib/tests/test_osutils.py'
--- bzrlib/tests/test_osutils.py	2010-06-08 01:45:09 +0000
+++ bzrlib/tests/test_osutils.py	2010-06-23 18:34:40 +0000
@@ -861,7 +861,7 @@
         self.assertEqual('//HOST/path', osutils._win98_abspath('//HOST/path'))
         # relative path
         cwd = osutils.getcwd().rstrip('/')
-        drive = osutils._nt_splitdrive(cwd)[0]
+        drive = osutils.ntpath.splitdrive(cwd)[0]
         self.assertEqual(cwd+'/path', osutils._win98_abspath('path'))
         self.assertEqual(drive+'/path', osutils._win98_abspath('/path'))
         # unicode path

=== modified file 'bzrlib/tests/test_permissions.py'
--- bzrlib/tests/test_permissions.py	2009-09-07 08:46:00 +0000
+++ bzrlib/tests/test_permissions.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Canonical Ltd
+# Copyright (C) 2005-2010 Canonical Ltd
 # -*- coding: utf-8 -*-
 #
 # This program is free software; you can redistribute it and/or modify
@@ -36,11 +36,11 @@
 from cStringIO import StringIO
 import urllib
 
+from bzrlib import transport
 from bzrlib.branch import Branch
 from bzrlib.bzrdir import BzrDir
 from bzrlib.tests import TestCaseWithTransport, TestSkipped
 from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
-from bzrlib.transport import get_transport
 from bzrlib.workingtree import WorkingTree
 
 
@@ -65,7 +65,7 @@
     :param dir_mode: The mode for all directories
     :param include_base: If false, only check the subdirectories
     """
-    t = get_transport(".")
+    t = transport.get_transport(".")
     if include_base:
         test.assertTransportMode(t, base, dir_mode)
     for root, dirs, files in os.walk(base):
@@ -180,7 +180,7 @@
 
         # bodge around for stubsftpserver not letting use connect
         # more than once
-        _t = get_transport(self.get_url())
+        _t = transport.get_transport(self.get_url())
 
         os.mkdir('local')
         t_local = self.make_branch_and_tree('local')
@@ -257,7 +257,7 @@
         original_umask = os.umask(umask)
 
         try:
-            t = get_transport(self.get_url())
+            t = transport.get_transport(self.get_url())
             # Direct access should be masked by umask
             t._sftp_open_exclusive('a', mode=0666).write('foo\n')
             self.assertTransportMode(t, 'a', 0666 &~umask)

=== modified file 'bzrlib/tests/test_reconcile.py'
--- bzrlib/tests/test_reconcile.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/test_reconcile.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006, 2008, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,15 +17,18 @@
 """Tests for reconiliation behaviour that is repository independent."""
 
 
-from bzrlib import bzrdir, errors, tests
+from bzrlib import (
+    bzrdir,
+    errors,
+    tests,
+    )
 from bzrlib.reconcile import reconcile, Reconciler
 from bzrlib.revision import Revision
-from bzrlib.tests.per_repository import TestCaseWithRepository
-from bzrlib.transport import get_transport
+from bzrlib.tests import per_repository
 from bzrlib.workingtree import WorkingTree
 
 
-class TestWorksWithSharedRepositories(TestCaseWithRepository):
+class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):
 
     def test_reweave_empty(self):
         # we want a repo capable format

=== modified file 'bzrlib/tests/test_remote.py'
--- bzrlib/tests/test_remote.py	2010-05-20 18:23:17 +0000
+++ bzrlib/tests/test_remote.py	2010-06-23 18:34:40 +0000
@@ -38,6 +38,7 @@
     remote,
     repository,
     tests,
+    transport,
     treebuilder,
     urlutils,
     versionedfile,
@@ -63,7 +64,6 @@
     multiply_tests,
     test_server,
     )
-from bzrlib.transport import get_transport
 from bzrlib.transport.memory import MemoryTransport
 from bzrlib.transport.remote import (
     RemoteTransport,
@@ -359,8 +359,8 @@
         a given client_base and transport_base.
         """
         client_medium = medium.SmartClientMedium(client_base)
-        transport = get_transport(transport_base)
-        result = client_medium.remote_path_from_transport(transport)
+        t = transport.get_transport(transport_base)
+        result = client_medium.remote_path_from_transport(t)
         self.assertEqual(expected, result)
 
     def test_remote_path_from_transport(self):
@@ -377,7 +377,7 @@
         a given transport_base and relpath of that transport.  (Note that
         HttpTransportBase is a subclass of SmartClientMedium)
         """
-        base_transport = get_transport(transport_base)
+        base_transport = transport.get_transport(transport_base)
         client_medium = base_transport.get_smart_medium()
         cloned_transport = base_transport.clone(relpath)
         result = client_medium.remote_path_from_transport(cloned_transport)

=== modified file 'bzrlib/tests/test_selftest.py'
--- bzrlib/tests/test_selftest.py	2010-05-14 09:48:51 +0000
+++ bzrlib/tests/test_selftest.py	2010-06-23 18:34:40 +0000
@@ -622,7 +622,6 @@
     """Tests for the convenience functions TestCaseWithTransport introduces."""
 
     def test_get_readonly_url_none(self):
-        from bzrlib.transport import get_transport
         from bzrlib.transport.readonly import ReadonlyTransportDecorator
         self.vfs_transport_factory = memory.MemoryServer
         self.transport_readonly_server = None
@@ -630,15 +629,14 @@
         # for the server
         url = self.get_readonly_url()
         url2 = self.get_readonly_url('foo/bar')
-        t = get_transport(url)
-        t2 = get_transport(url2)
+        t = transport.get_transport(url)
+        t2 = transport.get_transport(url2)
         self.failUnless(isinstance(t, ReadonlyTransportDecorator))
         self.failUnless(isinstance(t2, ReadonlyTransportDecorator))
         self.assertEqual(t2.base[:-1], t.abspath('foo/bar'))
 
     def test_get_readonly_url_http(self):
         from bzrlib.tests.http_server import HttpServer
-        from bzrlib.transport import get_transport
         from bzrlib.transport.http import HttpTransportBase
         self.transport_server = test_server.LocalURLServer
         self.transport_readonly_server = HttpServer
@@ -646,8 +644,8 @@
         url = self.get_readonly_url()
         url2 = self.get_readonly_url('foo/bar')
         # the transport returned may be any HttpTransportBase subclass
-        t = get_transport(url)
-        t2 = get_transport(url2)
+        t = transport.get_transport(url)
+        t2 = transport.get_transport(url2)
         self.failUnless(isinstance(t, HttpTransportBase))
         self.failUnless(isinstance(t2, HttpTransportBase))
         self.assertEqual(t2.base[:-1], t.abspath('foo/bar'))
@@ -691,8 +689,7 @@
 class TestChrootedTest(tests.ChrootedTestCase):
 
     def test_root_is_root(self):
-        from bzrlib.transport import get_transport
-        t = get_transport(self.get_readonly_url())
+        t = transport.get_transport(self.get_readonly_url())
         url = t.base
         self.assertEqual(url, t.clone('..').base)
 

=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- bzrlib/tests/test_sftp_transport.py	2010-02-23 07:43:11 +0000
+++ bzrlib/tests/test_sftp_transport.py	2010-06-23 18:34:40 +0000
@@ -41,7 +41,6 @@
     TestSkipped,
     )
 from bzrlib.tests.http_server import HttpServer
-from bzrlib.transport import get_transport
 import bzrlib.transport.http
 
 if features.paramiko.available():
@@ -190,7 +189,7 @@
         server = stub_sftp.SFTPSiblingAbsoluteServer()
         server.start_server()
         try:
-            transport = get_transport(server.get_url())
+            transport = _mod_transport.get_transport(server.get_url())
             self.assertFalse(transport.abspath('/').endswith('/~/'))
             self.assertTrue(transport.abspath('/').endswith('/'))
             del transport
@@ -313,7 +312,7 @@
         """Test that a real connection attempt raises the right error"""
         from bzrlib.transport import ssh
         self.set_vendor(ssh.ParamikoVendor())
-        t = bzrlib.transport.get_transport(self.bogus_url)
+        t = _mod_transport.get_transport(self.bogus_url)
         self.assertRaises(errors.ConnectionError, t.get, 'foobar')
 
     def test_bad_connection_ssh(self):
@@ -324,7 +323,7 @@
         # However, 'ssh' will create stipple on the output, so instead
         # I'm using run_bzr_subprocess, and parsing the output
         # try:
-        #     t = bzrlib.transport.get_transport(self.bogus_url)
+        #     t = _mod_transport.get_transport(self.bogus_url)
         # except errors.ConnectionError:
         #     # Correct error
         #     pass
@@ -511,7 +510,7 @@
             conf._get_config().update(
                 {'sftptest': {'scheme': 'ssh', 'port': port, 'user': 'bar'}})
             conf._save()
-        t = get_transport('sftp://localhost:%d' % port)
+        t = _mod_transport.get_transport('sftp://localhost:%d' % port)
         # force a connection to be performed.
         t.has('foo')
         return t

=== modified file 'bzrlib/tests/test_smart_request.py'
--- bzrlib/tests/test_smart_request.py	2009-07-27 02:11:25 +0000
+++ bzrlib/tests/test_smart_request.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,11 +18,13 @@
 
 import threading
 
-from bzrlib import errors
+from bzrlib import (
+    errors,
+    transport,
+    )
 from bzrlib.bzrdir import BzrDir
 from bzrlib.smart import request
 from bzrlib.tests import TestCase, TestCaseWithMemoryTransport
-from bzrlib.transport import get_transport
 
 
 class NoBodyRequest(request.SmartServerRequest):
@@ -34,7 +36,7 @@
 
 class DoErrorRequest(request.SmartServerRequest):
     """A request that raises an error from self.do()."""
-    
+
     def do(self):
         raise errors.NoSuchFile('xyzzy')
 
@@ -172,7 +174,7 @@
 
 
 class TestRequestJail(TestCaseWithMemoryTransport):
-    
+
     def test_jail(self):
         transport = self.get_transport('blah')
         req = request.SmartServerRequest(transport)
@@ -203,8 +205,8 @@
         # A parent is not allowed
         self.assertRaises(errors.JailBreak, _pre_open_hook, t.clone('..'))
         # A completely unrelated transport is not allowed
-        self.assertRaises(
-            errors.JailBreak, _pre_open_hook, get_transport('http://host/'))
+        self.assertRaises(errors.JailBreak, _pre_open_hook,
+                          transport.get_transport('http://host/'))
 
     def test_open_bzrdir_in_non_main_thread(self):
         """Opening a bzrdir in a non-main thread should work ok.

=== modified file 'bzrlib/tests/test_transport_log.py'
--- bzrlib/tests/test_transport_log.py	2010-02-17 17:11:16 +0000
+++ bzrlib/tests/test_transport_log.py	2010-06-23 18:34:40 +0000
@@ -20,10 +20,9 @@
 
 import types
 
-
+from bzrlib import transport
 from bzrlib.tests import TestCaseWithMemoryTransport
 from bzrlib.trace import mutter
-from bzrlib.transport import get_transport
 from bzrlib.transport.log import TransportLogDecorator
 
 
@@ -31,7 +30,8 @@
 
     def test_log_transport(self):
         base_transport = self.get_transport('')
-        logging_transport = get_transport('log+' + base_transport.base)
+        logging_transport = transport.get_transport(
+            'log+' + base_transport.base)
 
         # operations such as mkdir are logged
         mutter('where are you?')

=== modified file 'bzrlib/tests/test_upgrade.py'
--- bzrlib/tests/test_upgrade.py	2010-02-15 10:46:49 +0000
+++ bzrlib/tests/test_upgrade.py	2010-06-23 18:34:40 +0000
@@ -31,13 +31,13 @@
     bzrdir,
     progress,
     repository,
+    transport,
     workingtree,
     workingtree_4,
     )
 import bzrlib.branch
 from bzrlib.branch import Branch
 from bzrlib.tests import TestCaseWithTransport
-from bzrlib.transport import get_transport
 from bzrlib.upgrade import upgrade
 
 
@@ -80,27 +80,27 @@
             rt.unlock()
         # check a backup was made:
         backup_dir = 'backup.bzr.~1~'
-        transport = get_transport(b.base)
-        transport.stat(backup_dir)
-        transport.stat(backup_dir + '/README')
-        transport.stat(backup_dir + '/branch-format')
-        transport.stat(backup_dir + '/revision-history')
-        transport.stat(backup_dir + '/merged-patches')
-        transport.stat(backup_dir + '/pending-merged-patches')
-        transport.stat(backup_dir + '/pending-merges')
-        transport.stat(backup_dir + '/branch-name')
-        transport.stat(backup_dir + '/branch-lock')
-        transport.stat(backup_dir + '/inventory')
-        transport.stat(backup_dir + '/stat-cache')
-        transport.stat(backup_dir + '/text-store')
-        transport.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
-        transport.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz')
-        transport.stat(backup_dir + '/inventory-store/')
-        transport.stat(backup_dir + '/inventory-store/[e-mail]')
-        transport.stat(backup_dir + '/inventory-store/[e-mail]')
-        transport.stat(backup_dir + '/revision-store/')
-        transport.stat(backup_dir + '/revision-store/[e-mail]')
-        transport.stat(backup_dir + '/revision-store/[e-mail]')
+        t = transport.get_transport(b.base)
+        t.stat(backup_dir)
+        t.stat(backup_dir + '/README')
+        t.stat(backup_dir + '/branch-format')
+        t.stat(backup_dir + '/revision-history')
+        t.stat(backup_dir + '/merged-patches')
+        t.stat(backup_dir + '/pending-merged-patches')
+        t.stat(backup_dir + '/pending-merges')
+        t.stat(backup_dir + '/branch-name')
+        t.stat(backup_dir + '/branch-lock')
+        t.stat(backup_dir + '/inventory')
+        t.stat(backup_dir + '/stat-cache')
+        t.stat(backup_dir + '/text-store')
+        t.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
+        t.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz')
+        t.stat(backup_dir + '/inventory-store/')
+        t.stat(backup_dir + '/inventory-store/[e-mail]')
+        t.stat(backup_dir + '/inventory-store/[e-mail]')
+        t.stat(backup_dir + '/revision-store/')
+        t.stat(backup_dir + '/revision-store/[e-mail]')
+        t.stat(backup_dir + '/revision-store/[e-mail]')
 
     def test_upgrade_with_ghosts(self):
         """Upgrade v0.0.4 tree containing ghost references.
@@ -153,12 +153,12 @@
         # such a branch to metadir must not setup a working tree.
         self.build_tree_contents(_upgrade1_template)
         upgrade('.', bzrdir.BzrDirFormat6())
-        transport = get_transport('.')
-        transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
-        self.assertFalse(transport.has('.bzr/stat-cache'))
+        t = transport.get_transport('.')
+        t.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
+        self.assertFalse(t.has('.bzr/stat-cache'))
         # XXX: upgrade fails if a backup.bzr is already present
         # -- David Allouche 2006-08-11
-        transport.delete_tree('backup.bzr.~1~')
+        t.delete_tree('backup.bzr.~1~')
         # At this point, we have a format6 branch without checkout files.
         upgrade('.', bzrdir.BzrDirMetaFormat1())
         # The upgrade should not have set up a working tree.

=== modified file 'bzrlib/tests/test_workingtree.py'
--- bzrlib/tests/test_workingtree.py	2010-04-23 08:51:52 +0000
+++ bzrlib/tests/test_workingtree.py	2010-06-23 18:34:40 +0000
@@ -22,6 +22,7 @@
     bzrdir,
     conflicts,
     errors,
+    transport,
     workingtree,
     )
 from bzrlib.branch import Branch
@@ -29,7 +30,6 @@
 from bzrlib.lockdir import LockDir
 from bzrlib.mutabletree import needs_tree_write_lock
 from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
-from bzrlib.transport import get_transport
 from bzrlib.workingtree import (
     TreeEntry,
     TreeDirectory,
@@ -138,7 +138,7 @@
             dir.create_repository()
             dir.create_branch()
             format.initialize(dir)
-            t = get_transport(url)
+            t = transport.get_transport(url)
             found_format = workingtree.WorkingTreeFormat.find_format(dir)
             self.failUnless(isinstance(found_format, format.__class__))
         check_format(workingtree.WorkingTreeFormat3(), "bar")

=== modified file 'bzrlib/textmerge.py'
--- bzrlib/textmerge.py	2010-06-04 03:09:35 +0000
+++ bzrlib/textmerge.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2006, 2009, 2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/transport/decorator.py'
--- bzrlib/transport/decorator.py	2010-02-23 07:43:11 +0000
+++ bzrlib/transport/decorator.py	2010-06-23 18:34:40 +0000
@@ -20,10 +20,10 @@
 stub functions to allow other decorators to be written easily.
 """
 
-from bzrlib.transport import get_transport, Transport, Server
-
-
-class TransportDecorator(Transport):
+from bzrlib import transport
+
+
+class TransportDecorator(transport.Transport):
     """A no-change decorator for Transports.
 
     Subclasses of this are new transports that are based on an
@@ -50,7 +50,7 @@
                              (url, prefix))
         not_decorated_url = url[len(prefix):]
         if _decorated is None:
-            self._decorated = get_transport(not_decorated_url)
+            self._decorated = transport.get_transport(not_decorated_url)
         else:
             self._decorated = _decorated
         super(TransportDecorator, self).__init__(prefix + self._decorated.base)

=== modified file 'bzrlib/transport/remote.py'
--- bzrlib/transport/remote.py	2010-06-16 05:47:02 +0000
+++ bzrlib/transport/remote.py	2010-06-23 18:34:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/workingtree.py'
--- bzrlib/workingtree.py	2010-05-25 17:27:52 +0000
+++ bzrlib/workingtree.py	2010-06-23 18:34:40 +0000
@@ -61,13 +61,12 @@
     revisiontree,
     trace,
     transform,
+    transport,
     ui,
     views,
     xml5,
     xml7,
     )
-import bzrlib.branch
-from bzrlib.transport import get_transport
 from bzrlib.workingtree_4 import (
     WorkingTreeFormat4,
     WorkingTreeFormat5,
@@ -369,10 +368,10 @@
                 return True, None
             else:
                 return True, tree
-        transport = get_transport(location)
-        iterator = bzrdir.BzrDir.find_bzrdirs(transport, evaluate=evaluate,
+        t = transport.get_transport(location)
+        iterator = bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate,
                                               list_current=list_current)
-        return [t for t in iterator if t is not None]
+        return [tr for tr in iterator if tr is not None]
 
     # should be deprecated - this is slow and in any case treating them as a
     # container is (we now know) bad style -- mbp 20070302