Rev 1415: Merge from Martin. Adjust check to work with HTTP again.
in /home/robertc/source/baz/integration
Robert Collins
robertc at robertcollins.net
Mon Nov 28 05:13:47 GMT 2005
------------------------------------------------------------
revno: 1415
revision-id: robertc at robertcollins.net-20051128051341-059936f2f29a12c8
parent: robertc at robertcollins.net-20051127225107-51ad77cb1f322e3d
parent: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2005-11-28 16:13:41 +1100
message:
Merge from Martin. Adjust check to work with HTTP again.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
parent: mbp at sourcefrog.net-20051125043654-106a589368532d7e
parent: john at arbash-meinel.com-20051123154759-784e7805281e831c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: merge-recovered
timestamp: Fri 2005-11-25 17:28:56 +1100
message:
[merge] test renames and other fixes (John)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123154759-784e7805281e831c
parent: john at arbash-meinel.com-20051123154424-a02f8bf990a1fed5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 09:47:59 -0600
message:
I was stripping off too much of the name in --verbose mode.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123154424-a02f8bf990a1fed5
parent: john at arbash-meinel.com-20051123153207-adf60598914ab5c2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 09:44:24 -0600
message:
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123153207-adf60598914ab5c2
parent: john at arbash-meinel.com-20051123135446-6d79a500f3e3f3e2
parent: john at arbash-meinel.com-20051117204707-4f738cb8f6857051
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 09:32:07 -0600
message:
[merge] Added the uncommit plugin
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117204707-4f738cb8f6857051
parent: john at arbash-meinel.com-20051027213130-d2c5a6c65a3bfbb2
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-11-17 14:47:07 -0600
message:
[merge] Aaron's fix to log messages, when undoing multiple entries.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027213130-d2c5a6c65a3bfbb2
parent: jelmer at samba.org-20051020122445-a5526166d1199517
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-27 16:31:30 -0500
message:
Updated to latest bzr.dev code, and added tests.
------------------------------------------------------------
merged: jelmer at samba.org-20051020122445-a5526166d1199517
parent: john at arbash-meinel.com-20051012030827-6c1b3d68011e7b82
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Thu 2005-10-20 14:24:45 +0200
message:
Update for new options API
------------------------------------------------------------
merged: john at arbash-meinel.com-20051012030827-6c1b3d68011e7b82
parent: john at arbash-meinel.com-20050924000443-6cf6a4c848bab97e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Tue 2005-10-11 22:08:27 -0500
message:
Upgrading plugin for v5
------------------------------------------------------------
merged: john at arbash-meinel.com-20050924000443-6cf6a4c848bab97e
parent: john at arbash-meinel.com-20050923183322-1441a26b3cd167dc
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 19:04:43 -0500
message:
Changed the --remove command to --all
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923183322-1441a26b3cd167dc
parent: john at arbash-meinel.com-20050923183046-1d5dc250bb7d4e4d
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 13:33:22 -0500
message:
Made --dry-run print a better warning, so we don't scare people.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923183046-1d5dc250bb7d4e4d
parent: john at arbash-meinel.com-20050923181227-bbc42f66c1dc197b
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 13:30:46 -0500
message:
Adding ability to revert back to earlier revisions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050923181227-bbc42f66c1dc197b
parent: john at arbash-meinel.com-20050627215851-6105227ec3848593
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-09-23 13:12:27 -0500
message:
Updated to not use find_branch.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050627215851-6105227ec3848593
parent: john at arbash-meinel.com-20050627215821-28583a3356383aaf
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-06-27 15:58:51 -0600
message:
Updated for new log_formatter.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050627215821-28583a3356383aaf
parent: john at arbash-meinel.com-20050627215733-f4419eee3c33dd37
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-06-27 15:58:21 -0600
message:
Updated for new log_formatter.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050627215733-f4419eee3c33dd37
parent: john at arbash-meinel.com-20050626215527-0deb543cd20be09a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-06-27 15:57:33 -0600
message:
Updated for new log_formatter.
------------------------------------------------------------
merged: john at arbash-meinel.com-20050626215527-0deb543cd20be09a
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-06-26 16:55:27 -0500
message:
Creating a plugin for uncommitting the last revision.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123135446-6d79a500f3e3f3e2
parent: john at arbash-meinel.com-20051123134057-6fb7565337e9e18b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 07:54:46 -0600
message:
[patch] Johan Rydberg - let clone use set_revision_history instead of append_revision
------------------------------------------------------------
merged: john at arbash-meinel.com-20051123134057-6fb7565337e9e18b
parent: john at arbash-meinel.com-20051121154158-1845aa886bfac4b4
parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-11-23 07:40:57 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
parent: mbp at sourcefrog.net-20051122230746-bf3c32915a79653b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 10:08:22 +1100
message:
NEWS typo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051122230746-bf3c32915a79653b
parent: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
parent: robey at lag.net-20051122015612-24810f5a892a6bd6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 10:07:46 +1100
message:
[merge] sftp fixes
------------------------------------------------------------
merged: robey at lag.net-20051122015612-24810f5a892a6bd6
parent: robey at lag.net-20051122015034-755f8d30106bfb8b
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:56:12 -0800
message:
modified version of john's patch to add atomic put and locking to the sftp transport
------------------------------------------------------------
merged: robey at lag.net-20051122015034-755f8d30106bfb8b
parent: robey at lag.net-20051122014631-42d9600803476389
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:50:34 -0800
message:
patch from erik to fix sftp relpath to only check the path component
------------------------------------------------------------
merged: robey at lag.net-20051122014631-42d9600803476389
parent: robey at lag.net-20051122014514-eef2e2bce22d7356
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:46:31 -0800
message:
tighten up the sftp unit tests a bit to make them work better on windows
------------------------------------------------------------
merged: robey at lag.net-20051122014514-eef2e2bce22d7356
parent: robey at lag.net-20051122014331-6f62bc9dead6483c
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:45:14 -0800
message:
modified patch from alexey shamrin & john meinel to stdout-encode the getpass prompts within sftp transport
------------------------------------------------------------
merged: robey at lag.net-20051122014331-6f62bc9dead6483c
parent: robey at lag.net-20051122014146-5186f5e310a15202
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:43:31 -0800
message:
fix sftp urls to support the ietf draft url spec wrt relative vs absolute sftp urls (this will break existing branch urls); fix username/password parsing in sftp urls; add unit tests to make sure sftp url parsing is working
------------------------------------------------------------
merged: robey at lag.net-20051122014146-5186f5e310a15202
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
parent: robey at lag.net-20051107050204-885fb734a3dd3906
committer: Robey Pointer <robey at lag.net>
branch nick: bzr.sftp
timestamp: Mon 2005-11-21 17:41:46 -0800
message:
make sftp put faster when using paramiko 1.5.1
------------------------------------------------------------
merged: robey at lag.net-20051107050204-885fb734a3dd3906
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Robey Pointer <robey at lag.net>
timestamp: Sun 2005-11-06 21:02:04 -0800
message:
prefetch files under paramiko 1.5.1 for improved speed
------------------------------------------------------------
merged: john at arbash-meinel.com-20051121154158-1845aa886bfac4b4
parent: john at arbash-meinel.com-20051121152016-f53ba54bbbbc4474
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-11-21 09:41:58 -0600
message:
Added test for log formatting, found bug when redirecting short logs to a file instead of stdout.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051121152016-f53ba54bbbbc4474
parent: john at arbash-meinel.com-20051118210153-88fd1a200bdd872c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-11-21 09:20:16 -0600
message:
Stripping trailing newlines when displaying log messages
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118210153-88fd1a200bdd872c
parent: john at arbash-meinel.com-20051118205706-825c182e74708a7e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 15:01:53 -0600
message:
Updating transport test, to handle NoSuchFile if a bogus url accidentally resolves.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118205706-825c182e74708a7e
parent: john at arbash-meinel.com-20051118163428-498977103afee28e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 14:57:06 -0600
message:
[patch] Alexey Shamrin's patch for small win32 fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118163428-498977103afee28e
parent: john at arbash-meinel.com-20051118161638-f3cc5fcfb6504126
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 10:34:28 -0600
message:
Shorten test names in verbose mode in a logical way. Removed bzrlib.selftest prefix
------------------------------------------------------------
merged: john at arbash-meinel.com-20051118161638-f3cc5fcfb6504126
parent: john at arbash-meinel.com-20051117221217-7b51f99a1a60c578
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2005-11-18 10:16:38 -0600
message:
Renamed all test modules to remove the 'test' prefix
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117221217-7b51f99a1a60c578
parent: john at arbash-meinel.com-20051117210621-37e9410490227390
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-11-17 16:12:17 -0600
message:
Refactoring blackbox tests into a package, rather than just a single file.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117210621-37e9410490227390
parent: john at arbash-meinel.com-20051115000939-8861c35580bf690f
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-11-17 15:06:21 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051115000939-8861c35580bf690f
parent: john at arbash-meinel.com-20051114235851-09fdf17b94c10438
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 18:09:39 -0600
message:
Updated the test to also test zip exports. Fixed some small bugs exposed by test suite.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114235851-09fdf17b94c10438
parent: john at arbash-meinel.com-20051114230926-08b82fe07c945d30
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 17:58:51 -0600
message:
Refactored the export code to make it easier to add new export formats.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114230926-08b82fe07c945d30
parent: john at arbash-meinel.com-20051113195705-ab81d5c77138884f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 17:09:26 -0600
message:
Merging Alexander's zip export patch
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113195705-ab81d5c77138884f
parent: john at arbash-meinel.com-20051113164619-6f9ba5898a45dc5c
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sun 2005-11-13 13:57:05 -0600
message:
Adding merge-delete-conflicts test case.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125043654-106a589368532d7e
parent: mbp at sourcefrog.net-20051125040741-a49e7d347c01d531
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 15:36:54 +1100
message:
Don't ignore bzrlib/plugins -- really bad idea because they can have bad
old plugins lying around!
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125040741-a49e7d347c01d531
parent: mbp at sourcefrog.net-20051125040609-9053145620fdc52b
parent: aaron.bentley at utoronto.ca-20051124060520-0279acee0f7c1d70
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 15:07:41 +1100
message:
[merge] aaron
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051124060520-0279acee0f7c1d70
parent: aaron.bentley at utoronto.ca-20051124041913-de24c05411cdc948
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2005-11-24 01:05:20 -0500
message:
Tweaked tree name generation when applying changesets
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051124041913-de24c05411cdc948
parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2005-11-23 23:19:13 -0500
message:
Handled cases where inventory entries need renaming but files don't exist
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125040609-9053145620fdc52b
parent: mbp at sourcefrog.net-20051125003446-c79b479619f99236
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 15:06:09 +1100
message:
Fix trace of non-ascii messages, and add test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051125003446-c79b479619f99236
parent: mbp at sourcefrog.net-20051124063651-e74eb497a72609d6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Fri 2005-11-25 11:34:46 +1100
message:
[patch] Commit editor temporary files now start with 'bzr_log.' (Magnus Therning)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124063651-e74eb497a72609d6
parent: mbp at sourcefrog.net-20051124043018-863bd95e46cce874
parent: mbp at sourcefrog.net-20051124061140-12da2df0f37a2756
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 17:36:51 +1100
message:
[merge] basic_io metaformat (mbp)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124061140-12da2df0f37a2756
parent: mbp at sourcefrog.net-20051124060634-fa1e3a5a871ec5e7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.basic_io
timestamp: Thu 2005-11-24 17:11:40 +1100
message:
More basicio quoting tests.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124060634-fa1e3a5a871ec5e7
parent: mbp at sourcefrog.net-20051124053538-25fa7f2dc9ad8b01
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-24 17:06:34 +1100
message:
Addition test and bugfix for basic_io escaped strings.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124053538-25fa7f2dc9ad8b01
parent: mbp at sourcefrog.net-20051104051950-beda983475a8793c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.basic_io
timestamp: Thu 2005-11-24 16:35:38 +1100
message:
Fix up handling of escaped doublequotes at end of line.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104051950-beda983475a8793c
parent: mbp at sourcefrog.net-20051104050311-f49d57035d772a7a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-11-04 00:19:50 -0500
message:
Remove dead code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104050311-f49d57035d772a7a
parent: mbp at sourcefrog.net-20051104050210-d27f4c97961e98ee
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-11-04 00:03:11 -0500
message:
Update basic_io revision output
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104050210-d27f4c97961e98ee
parent: mbp at sourcefrog.net-20051104032149-dd09b953390fcb66
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-11-04 00:02:10 -0500
message:
more basic_io tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104032149-dd09b953390fcb66
parent: mbp at sourcefrog.net-20051104031759-b0f5f6f53e042b68
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 22:21:49 -0500
message:
Packing of empty basic_io stanzas
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104031759-b0f5f6f53e042b68
parent: mbp at sourcefrog.net-20051104030537-19aaa444866ed40a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 22:17:59 -0500
message:
More basic_io tests for quoting
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104030537-19aaa444866ed40a
parent: mbp at sourcefrog.net-20051104014631-750e0ad4172c952c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 22:05:37 -0500
message:
Go back to multiline quoted string values.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051104014631-750e0ad4172c952c
parent: mbp at sourcefrog.net-20051101215117-e7c33dde397b2350
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-03 20:46:31 -0500
message:
Make biobench directly executable
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101215117-e7c33dde397b2350
parent: mbp at sourcefrog.net-20051101214801-77042eb9a8c56702
parent: mbp at sourcefrog.net-20051101123326-aa08b92ee6e8a659
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 16:51:17 -0500
message:
[merge] main -> bzr.mbp.basic_io
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101214801-77042eb9a8c56702
parent: mbp at sourcefrog.net-20051101213350-123332025d47320e
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 16:48:01 -0500
message:
Get basic_io selftests running again for new format.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101213350-123332025d47320e
parent: mbp at sourcefrog.net-20051101203022-441edf9d621f8d27
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 16:33:50 -0500
message:
More basic_io tweaking; break format
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101203022-441edf9d621f8d27
parent: mbp at sourcefrog.net-20051101201130-e14511e01cae1624
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 15:30:22 -0500
message:
More basic_io tweaking
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101201130-e14511e01cae1624
parent: mbp at sourcefrog.net-20051101174138-9dbc20cee1947bb7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 15:11:30 -0500
message:
Experiments with basic_io for inventory
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101174138-9dbc20cee1947bb7
parent: mbp at sourcefrog.net-20051101172517-659cff2957e91d71
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 12:41:38 -0500
message:
Fix basic_io writing of bools, and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101172517-659cff2957e91d71
parent: mbp at sourcefrog.net-20051101133945-ce6f1c59ebd59002
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 12:25:17 -0500
message:
New BasicReader to pull a sequence of stanzas from a file, and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101133945-ce6f1c59ebd59002
parent: mbp at sourcefrog.net-20051101131616-4fa90461dedafa7b
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 08:39:45 -0500
message:
Fix up reading sequence of stanzas from a file, and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101131616-4fa90461dedafa7b
parent: mbp at sourcefrog.net-20051101131541-f499e47897d14d05
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 08:16:16 -0500
message:
Simple benchmark for basic_io
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051101131541-f499e47897d14d05
parent: mbp at sourcefrog.net-20051030075741-9617a3608c929266
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-11-01 08:15:41 -0500
message:
More basic_io development:
- update BasicWriter
- better writing of inventories
- refactored quoted string parser
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030075741-9617a3608c929266
parent: mbp at sourcefrog.net-20051030074858-7becf1fe627355d8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:57:41 +1100
message:
Add Stanza.get_all and test repeated fields
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030074858-7becf1fe627355d8
parent: mbp at sourcefrog.net-20051030074350-ac526d8179d65a22
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:48:58 +1100
message:
More basic_io quoting tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030074350-ac526d8179d65a22
parent: mbp at sourcefrog.net-20051030070307-84f53d7f658ce896
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:43:50 +1100
message:
More robust basic_io parsing of quoted/multiline strings
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030070307-84f53d7f658ce896
parent: mbp at sourcefrog.net-20051030064119-a511529bd0af1ae6
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 18:03:07 +1100
message:
Fix up reading basic_io multiline strings
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030064119-a511529bd0af1ae6
parent: mbp at sourcefrog.net-20051030063959-1b1b0e558a871f93
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:41:19 +1100
message:
Add Stanza eq and ne methods and test.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063959-1b1b0e558a871f93
parent: mbp at sourcefrog.net-20051030063617-309bc4b4179e0ceb
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:39:59 +1100
message:
Fix handling of negative integers and add test
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063617-309bc4b4179e0ceb
parent: mbp at sourcefrog.net-20051030063449-5b0f79cd4a5803fa
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:36:17 +1100
message:
Add len(Stanza)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063449-5b0f79cd4a5803fa
parent: mbp at sourcefrog.net-20051030063005-fd2d00e417bb7cb0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:34:49 +1100
message:
more basic_io read tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030063005-fd2d00e417bb7cb0
parent: mbp at sourcefrog.net-20051030041218-89757315bff8cad5
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 17:30:05 +1100
message:
Update Stanza iteration tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030041218-89757315bff8cad5
parent: mbp at sourcefrog.net-20051030035632-fe26a238180a8cff
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 15:12:18 +1100
message:
Simple basic_io from_lines and .get()
Remove Stanza.__iter__; not really list-like
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030035632-fe26a238180a8cff
parent: mbp at sourcefrog.net-20051030034853-9b07d841176bf791
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:56:32 +1100
message:
Test basic_io writing multiline strings.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030034853-9b07d841176bf791
parent: mbp at sourcefrog.net-20051030034219-059eafe037aeafb8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:48:53 +1100
message:
Larger test for writing basic_io
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030034219-059eafe037aeafb8
parent: mbp at sourcefrog.net-20051030032112-e24acbeee867b8f7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:42:19 +1100
message:
More basic_io development
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030032112-e24acbeee867b8f7
parent: mbp at sourcefrog.net-20051030031835-7a295ef241d19450
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:21:12 +1100
message:
Iteration of Stanzas()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051030031835-7a295ef241d19450
parent: mbp at sourcefrog.net-20051028054949-98b4a70546cb7129
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sun 2005-10-30 14:18:35 +1100
message:
Start bringing in basicio code
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124043018-863bd95e46cce874
parent: mbp at sourcefrog.net-20051124024527-3cba8d517f403af4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 15:30:18 +1100
message:
Hacking notes on TDD
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124024527-3cba8d517f403af4
parent: mbp at sourcefrog.net-20051124022811-add704653e62d42b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 13:45:27 +1100
message:
Add ChangesetEntry.__repr__
Fix bad results from ChangesetEntry.summarize_name()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124022811-add704653e62d42b
parent: mbp at sourcefrog.net-20051124014111-b73f6da5f344f5ce
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 13:28:11 +1100
message:
Better exception for one unhandled merge case
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051124014111-b73f6da5f344f5ce
parent: mbp at sourcefrog.net-20051123062927-f33c0abd742146af
parent: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 12:41:11 +1100
message:
[merge] refactoring of branch vs working tree, etc (robertc)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
parent: robertc at robertcollins.net-20051118072940-c0e304e5d0935d86
parent: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-11-23 18:18:42 +1100
message:
Merge from mpool.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118072940-c0e304e5d0935d86
parent: robertc at robertcollins.net-20051118013610-33b08df8810ecca7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 18:29:40 +1100
message:
Nuke __main__ for annotate.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118013610-33b08df8810ecca7
parent: robertc at robertcollins.net-20051118013104-0189bf9fafb6e21a
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:36:10 +1100
message:
clarify use of Branch and WorkingTree in annotate.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118013104-0189bf9fafb6e21a
parent: robertc at robertcollins.net-20051118012015-2c838373b4117f46
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:31:04 +1100
message:
Dont use Branch.open in smart_add when checking for child trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118012015-2c838373b4117f46
parent: robertc at robertcollins.net-20051118011319-39cb6e79d1155a19
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:20:15 +1100
message:
Documentation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118011319-39cb6e79d1155a19
parent: robertc at robertcollins.net-20051117225933-612cf96076e37272
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:13:19 +1100
message:
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117225933-612cf96076e37272
parent: robertc at robertcollins.net-20051117225758-4c0f785d2849df07
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:59:33 +1100
message:
Cleanup the working_tree comments in Branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117225758-4c0f785d2849df07
parent: robertc at robertcollins.net-20051117224342-1bd6578c82bd62aa
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:57:58 +1100
message:
move move() from Branch to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117224342-1bd6578c82bd62aa
parent: robertc at robertcollins.net-20051117222954-3404028201eaabd7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:43:42 +1100
message:
Move rename_one from Branch to WorkingTree. (Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117222954-3404028201eaabd7
parent: robertc at robertcollins.net-20051117215555-035e7347e08eb7c9
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:29:54 +1100
message:
Move Branch.unknowns() to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117215555-035e7347e08eb7c9
parent: robertc at robertcollins.net-20051117081213-cefaacbf5dfb5652
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 08:55:55 +1100
message:
Move add from Branch to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117081213-cefaacbf5dfb5652
parent: robertc at robertcollins.net-20051117065251-6f7dcf54580a84ec
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 19:12:13 +1100
message:
Convert most of the front ends commands to use WorkingTree.open_containing
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117065251-6f7dcf54580a84ec
parent: robertc at robertcollins.net-20051117061735-ace312c6dae3f67c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 17:52:51 +1100
message:
Do not consider urls to be relative paths within working trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117061735-ace312c6dae3f67c
parent: robertc at robertcollins.net-20051117052111-5f2e91c961f02d5c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 17:17:35 +1100
message:
Use abspath not realpath in WorkingTree.open_containing, to avoid symlink resolution lies.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117052111-5f2e91c961f02d5c
parent: robertc at robertcollins.net-20051113201422-8a34ef413bfc8222
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 16:21:11 +1100
message:
Provide a open_containing for WorkingTree.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123062927-f33c0abd742146af
parent: mbp at sourcefrog.net-20051123062550-4da88b201d7d34b8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 17:29:27 +1100
message:
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123062550-4da88b201d7d34b8
parent: mbp at sourcefrog.net-20051123051652-13ba89e07170fcc9
parent: mbp at sourcefrog.net-20051123055520-5f2ad7ea4cca7adb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 17:25:50 +1100
message:
[merge] trace improvements
- shorter error messages on exceptions
- shorter display of status and time in selftest output
- send debug output direct to file to reduce cost of going
through Python logging
- always send exception tracebacks to trace file
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123055520-5f2ad7ea4cca7adb
parent: mbp at sourcefrog.net-20051111232450-aec10ff8afa12bae
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-11-23 16:55:20 +1100
message:
Remove need for BZR_DEBUG to get debug info in trace file.
Clean up new trace file.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232450-aec10ff8afa12bae
parent: mbp at sourcefrog.net-20051111232203-e1c6e4437f6fe9a7
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:24:50 +1100
message:
Make logging of errors go through our trace functions
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232203-e1c6e4437f6fe9a7
parent: mbp at sourcefrog.net-20051111232033-a06ce840d036efa9
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:22:03 +1100
message:
Don't enable default logging twice
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232033-a06ce840d036efa9
parent: mbp at sourcefrog.net-20051111232015-275817884c803e49
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:20:33 +1100
message:
Do debug messages not through python logging
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111232015-275817884c803e49
parent: mbp at sourcefrog.net-20051111231627-4cb27769d0eb1010
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:20:15 +1100
message:
Enable logging early enough to save argv
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111231627-4cb27769d0eb1010
parent: mbp at sourcefrog.net-20051111230656-b1f0dcf7062e48ae
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:16:27 +1100
message:
Update log message quoting
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111230656-b1f0dcf7062e48ae
parent: mbp at sourcefrog.net-20051111224736-8457569f2b10f629
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 10:06:56 +1100
message:
Fix up format strings for some log calls
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051111224736-8457569f2b10f629
parent: mbp at sourcefrog.net-20051110234206-2fa4ada64c9cb8a0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Sat 2005-11-12 09:47:36 +1100
message:
Remove unnecessary import of obsolete bzrlib.revfile
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110234206-2fa4ada64c9cb8a0
parent: mbp at sourcefrog.net-20051110233631-da361bc235b6da49
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:42:06 -0500
message:
Nicer display of verbose test results and progress
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051110233631-da361bc235b6da49
parent: mbp at sourcefrog.net-20051110232200-e59722d2c343821f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-11-10 18:36:31 -0500
message:
Remove direct logging calls from selftest
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123051652-13ba89e07170fcc9
parent: mbp at sourcefrog.net-20051123022222-8b8514ae885f0c72
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 16:16:52 +1100
message:
[patch] make --quiet a global option (robey)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123022222-8b8514ae885f0c72
parent: mbp at sourcefrog.net-20051123011409-c7bd7982cf710184
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 13:22:22 +1100
message:
Fix regression of 'bzr log -v' - it wasn't showing changed files at all. (#4676)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123011409-c7bd7982cf710184
parent: mbp at sourcefrog.net-20051123004549-32b59267a00938bf
parent: jelmer at samba.org-20051121201056-b5b364b20cb58115
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 12:14:09 +1100
message:
[merge] jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20051121201056-b5b364b20cb58115
parent: jelmer at samba.org-20051121175528-358e070f5f303534
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: jelmer.integration
timestamp: Mon 2005-11-21 21:10:56 +0100
message:
Don't clear Revision.parent_ids after it has been set from the arguments
------------------------------------------------------------
merged: jelmer at samba.org-20051121175528-358e070f5f303534
parent: jelmer at samba.org-20051120204442-18bfa8e003cc92ea
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: jelmer.integration
timestamp: Mon 2005-11-21 18:55:28 +0100
message:
Make get_revision_xml_file() private
------------------------------------------------------------
merged: jelmer at samba.org-20051120204442-18bfa8e003cc92ea
parent: jelmer at samba.org-20051120193851-91fb5ea757facb74
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: jelmer.integration
timestamp: Sun 2005-11-20 21:44:42 +0100
message:
Remove methods from BzrBranch that were already implemented in Branch
------------------------------------------------------------
merged: jelmer at samba.org-20051120193851-91fb5ea757facb74
parent: jelmer at samba.org-20051120192409-32999f70ba448f5f
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: integration
timestamp: Sun 2005-11-20 20:38:51 +0100
message:
Fix error that was declared twice
------------------------------------------------------------
merged: jelmer at samba.org-20051120192409-32999f70ba448f5f
parent: jelmer at samba.org-20051118005738-6a5a3f5db00432bd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: integration
timestamp: Sun 2005-11-20 20:24:09 +0100
message:
Remove some abstract methods that were no longer used.
------------------------------------------------------------
merged: jelmer at samba.org-20051118005738-6a5a3f5db00432bd
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Fri 2005-11-18 01:57:38 +0100
message:
Remove already fixed items from TODO
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051123004549-32b59267a00938bf
parent: mbp at sourcefrog.net-20051122230822-b876b5abe3f6bd0c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-23 11:45:49 +1100
message:
[patch] annotate --long (robey pointer)
This fixes a single TODO in 'bzr annotate' that has been bugging me:
the email field is truncated even with '--long'.
The fix is pretty tiny (as you can see). It causes some generator
results to be collected instead of iterated, but this turns out to be
not a big deal, since the yield is very shallow and comes from a
collection one stack level deeper.
More information about the bazaar-commits
mailing list