Rev 1251: Merge from Aaron. in /home/robertc/source/baz/storage
Robert Collins
robertc at robertcollins.net
Tue Jan 3 04:44:09 GMT 2006
------------------------------------------------------------
revno: 1251
revision-id: robertc at robertcollins.net-20060103044402-66a4f012627e7f24
parent: robertc at robertcollins.net-20051207044813-9274c8afaee3fcbb
parent: aaron.bentley at utoronto.ca-20051226045422-91dda93d1e9fb2ba
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Tue 2006-01-03 15:44:02 +1100
message:
Merge from Aaron.
added:
bzrlib/iterablefile.py iterablefile.py-20051225230610-c93e5550a82115ed
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_remove.py test_remove.py-20051212071329-1925f463b565a5c3
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr_man.py bzrman.py-20050601153041-0ff7f74de456d15e
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/weave.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/test_revprops.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weavefile.py weavefile.py-20050629135233-2ffe0200f103f6c2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226045422-91dda93d1e9fb2ba
parent: aaron.bentley at utoronto.ca-20051226044338-1368eef04da9ee0c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 23:54:22 -0500
message:
Moved the .bzr constraint out of LockableFiles
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226044338-1368eef04da9ee0c
parent: aaron.bentley at utoronto.ca-20051226014806-5c0a9fceb1f7995c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 23:43:38 -0500
message:
Removed LockableFiles.make_transport
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226014806-5c0a9fceb1f7995c
parent: aaron.bentley at utoronto.ca-20051226014616-631090d43006cb4a
parent: aaron.bentley at utoronto.ca-20051226005636-3a836e2766166570
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 20:48:06 -0500
message:
Merged transaction tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226005636-3a836e2766166570
parent: aaron.bentley at utoronto.ca-20051226005411-c3792ed46786d5c6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 19:56:36 -0500
message:
test transactions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226005411-c3792ed46786d5c6
parent: aaron.bentley at utoronto.ca-20051226001110-cf590f668a99ba1a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 19:54:11 -0500
message:
Test and fix read locks
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226001110-cf590f668a99ba1a
parent: aaron.bentley at utoronto.ca-20051225230624-f61a1538912a578a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 19:11:10 -0500
message:
Refactored a bit
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051225230624-f61a1538912a578a
parent: aaron.bentley at utoronto.ca-20051225224453-098a11d24b7edf84
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 18:06:24 -0500
message:
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051225224453-098a11d24b7edf84
parent: aaron.bentley at utoronto.ca-20051225211805-269cd3a50e5aa5fa
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 17:44:53 -0500
message:
Added write locks as appropriate
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051225211805-269cd3a50e5aa5fa
parent: aaron.bentley at utoronto.ca-20051225003913-9d453b78065f5c6b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 16:18:05 -0500
message:
Throw if we try to write to a LockableFiles with no write lock
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051225003913-9d453b78065f5c6b
parent: aaron.bentley at utoronto.ca-20051225003848-111ac71170cb2605
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sat 2005-12-24 19:39:13 -0500
message:
Tweaked some text
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051225003848-111ac71170cb2605
parent: aaron.bentley at utoronto.ca-20051222040342-5496534a029b1189
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sat 2005-12-24 19:38:48 -0500
message:
Renamed Branch.storage to Branch.repository
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051222040342-5496534a029b1189
parent: robertc at robertcollins.net-20051207044813-9274c8afaee3fcbb
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Wed 2005-12-21 23:03:42 -0500
message:
Merged the mainline
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
parent: mbp at sourcefrog.net-20051216003931-476d497e6dbd21b9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 12:47:35 +1100
message:
Remove config.guess and configure.in from builtin ignore list.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216003931-476d497e6dbd21b9
parent: mbp at sourcefrog.net-20051216002517-73448ea063865983
parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 11:39:31 +1100
message:
[merge] robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20051215083203-07b824bae89674c1
parent: robertc at robertcollins.net-20051215032958-9ca8405f44373730
parent: abentley at panoramicfeedback.com-20051214183411-f013b7006e68d0eb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2005-12-15 19:32:03 +1100
message:
* bzr add now lists how many files were ignored per glob. add --verbose
lists the specific files. (Aaron Bentley)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051214183411-f013b7006e68d0eb
parent: abentley at panoramicfeedback.com-20051213201315-8f8f4ab3bc677d35
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2005-12-14 13:34:11 -0500
message:
Updated NEWS about add and ignored
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051213201315-8f8f4ab3bc677d35
parent: abentley at panoramicfeedback.com-20051213185657-3f900268287d6559
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-12-13 15:13:15 -0500
message:
Added verbose option to bzr add, to list all ignored files.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051213185657-3f900268287d6559
parent: abentley at panoramicfeedback.com-20051213175140-f78fa05a446006fa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-12-13 13:56:57 -0500
message:
bzr add reports ignored patterns.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051213175140-f78fa05a446006fa
parent: abentley at panoramicfeedback.com-20051212172310-38340344da93b3cf
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-12-13 12:51:40 -0500
message:
Merged the mainline
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
parent: mbp at sourcefrog.net-20051213054640-05a8971e11b1ba66
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:48:04 +1100
message:
MsgEditor tests should be skipped on platforms without unicode fs.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213054640-05a8971e11b1ba66
parent: mbp at sourcefrog.net-20051213054051-a82f95d7d417f73b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:46:40 +1100
message:
Fix up display of reasons why tests were skipped.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213054051-a82f95d7d417f73b
parent: mbp at sourcefrog.net-20051213051217-5efd4ec3b060bfaf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:40:51 +1100
message:
New TestSkipped facility, and tests for it.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213051217-5efd4ec3b060bfaf
parent: mbp at sourcefrog.net-20051213035433-26282b8f72702fc3
parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 16:12:17 +1100
message:
[merge] robertc, source-examination test
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
parent: robertc at robertcollins.net-20051212220750-e1ff9f5a18f795ad
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2005-12-13 09:34:21 +1100
message:
Bugfix to source testing logic to get the right path when .py is returned by __file__
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212220750-e1ff9f5a18f795ad
parent: robertc at robertcollins.net-20051208055700-5d85edd70fd15d4d
parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2005-12-13 09:07:50 +1100
message:
Merge from mbp.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
parent: mbp at sourcefrog.net-20051212070634-364b095fe76623e5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 18:20:02 +1100
message:
[patch] fix for 'bzr rm -v' (Wouter van Heyst)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051212070634-364b095fe76623e5
parent: mbp at sourcefrog.net-20051212052559-d3b1591f2404e90a
parent: aaron.bentley at utoronto.ca-20051212002414-d5c9e3eab54e705a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 18:06:34 +1100
message:
[merge] improved 'missing' command from aaron
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051212002414-d5c9e3eab54e705a
parent: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
parent: aaron.bentley at utoronto.ca-20051212002032-1a2c4bdb573bf3bc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2005-12-11 19:24:14 -0500
message:
Merged the new bzr missing command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051212002032-1a2c4bdb573bf3bc
parent: aaron.bentley at utoronto.ca-20051211232656-8b2d7eaa92903c39
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 19:20:32 -0500
message:
Added unit tests for find_unmerged
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211232656-8b2d7eaa92903c39
parent: aaron.bentley at utoronto.ca-20051211224007-bf524313537779dc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 18:26:56 -0500
message:
Test every option for "bzr missing"
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211224007-bf524313537779dc
parent: aaron.bentley at utoronto.ca-20051211223621-bd7b225c3f212d15
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:40:07 -0500
message:
Fixed up tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211223621-bd7b225c3f212d15
parent: aaron.bentley at utoronto.ca-20051211222951-7adde03c2e93b70c
parent: larstiq at larstiq.dyndns.org-20051211220521-094e867abca7417c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:36:21 -0500
message:
Added tests from LarstiQ
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051211220521-094e867abca7417c
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bzr.lq
timestamp: Sun 2005-12-11 23:05:21 +0100
message:
Add testcase for missing command, improved with feedback from Robert
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211222951-7adde03c2e93b70c
parent: aaron.bentley at utoronto.ca-20051211220440-287aea608ac8ed8b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:29:51 -0500
message:
All tests pass
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211220440-287aea608ac8ed8b
parent: aaron.bentley at utoronto.ca-20051211220405-6002fa6de0ef8ce0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:04:40 -0500
message:
Noted difference of opinion wrt BzrCommandError
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211220405-6002fa6de0ef8ce0
parent: aaron.bentley at utoronto.ca-20051211215248-7e44e03f11ad2ec5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 17:04:05 -0500
message:
Set status to 1 when there are missing revisions on either side.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211215248-7e44e03f11ad2ec5
parent: aaron.bentley at utoronto.ca-20051211202841-44e47aeb2895bf49
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 16:52:48 -0500
message:
fixed location handling to match old missing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211202841-44e47aeb2895bf49
parent: aaron.bentley at utoronto.ca-20051211075914-ef46f14b0ab647b8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 15:28:41 -0500
message:
Removed merge fix with no test case
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211075914-ef46f14b0ab647b8
parent: aaron.bentley at utoronto.ca-20051211075126-7785e370b0f70cbc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 02:59:14 -0500
message:
Added missing revision counts.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051211075126-7785e370b0f70cbc
parent: abentley at panoramicfeedback.com-20051129211134-2e69b6ad9ef11c85
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.missing
timestamp: Sun 2005-12-11 02:51:26 -0500
message:
merged the mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129211134-2e69b6ad9ef11c85
parent: abentley at panoramicfeedback.com-20051129202344-10d31e85468d0de8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 16:11:34 -0500
message:
Added log formatter selection and show-ids to missing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129202344-10d31e85468d0de8
parent: abentley at panoramicfeedback.com-20051129200000-cd4331961ebedd63
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 15:23:44 -0500
message:
Added no-difference message
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129200000-cd4331961ebedd63
parent: abentley at panoramicfeedback.com-20051129195419-9f87fe116aff380d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 15:00:00 -0500
message:
Refactored shortcut
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129195419-9f87fe116aff380d
parent: abentley at panoramicfeedback.com-20051129192044-43b22b9806c73fb3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:54:19 -0500
message:
Added revision-history shortcuts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129192044-43b22b9806c73fb3
parent: abentley at panoramicfeedback.com-20051129191719-08a4f85324588aa5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:20:44 -0500
message:
Ensured progress bar is cleaned up except for lock errors
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129191719-08a4f85324588aa5
parent: abentley at panoramicfeedback.com-20051129184747-3f28d5b7a02f7955
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 14:17:19 -0500
message:
More refactoring, handled branches with no commits
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129184747-3f28d5b7a02f7955
parent: abentley at panoramicfeedback.com-20051129183500-0da736b0a323dded
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:47:47 -0500
message:
Used more set operations
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129183500-0da736b0a323dded
parent: abentley at panoramicfeedback.com-20051129183421-8ee4609bc4c8fec3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:35:00 -0500
message:
Inverted the meaning of reverse
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129183421-8ee4609bc4c8fec3
parent: abentley at panoramicfeedback.com-20051129181721-b7818abfc198e50a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:34:21 -0500
message:
Restructured find_unmerged, so it returns lists of (revno, revision) pairs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129181721-b7818abfc198e50a
parent: abentley at panoramicfeedback.com-20051129174759-b6fc5d163e28834b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 13:17:21 -0500
message:
Factored out find_unmerged
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129174759-b6fc5d163e28834b
parent: abentley at panoramicfeedback.com-20051129174721-c2ba7e09668e0b89
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 12:47:59 -0500
message:
Replace missing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051129174721-c2ba7e09668e0b89
parent: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.missing
timestamp: Tue 2005-11-29 12:47:21 -0500
message:
Import Kinnison's plugin
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051129050222-56e09f54af4e21d5
parent: aaron.bentley at utoronto.ca-20051126013218-9c8e1f00ccba641e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2005-11-29 00:02:22 -0500
message:
Fixed revert bug [NEEDS TEST CASE]
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051212052559-d3b1591f2404e90a
parent: mbp at sourcefrog.net-20051208120109-dbead329ce38f295
parent: michael at ellerman.id.au-20051209071246-cc9d514bb992f011
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 16:25:59 +1100
message:
[merge] add --dry-run option (mpe)
------------------------------------------------------------
merged: michael at ellerman.id.au-20051209071246-cc9d514bb992f011
parent: michael at ellerman.id.au-20051209071231-5b895fd4faca47b8
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: add-dry-run
timestamp: Fri 2005-12-09 01:12:46 -0600
message:
Add tests for bzr add --dry-run
------------------------------------------------------------
merged: michael at ellerman.id.au-20051209071231-5b895fd4faca47b8
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: add-dry-run
timestamp: Fri 2005-12-09 01:12:31 -0600
message:
Add support for bzr add --dry-run
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208120109-dbead329ce38f295
parent: mbp at sourcefrog.net-20051208073529-61ad33e6c4fc8e61
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 23:01:09 +1100
message:
[patch] add a selftest test that the setup build script works (Alexander Belchenko)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208073529-61ad33e6c4fc8e61
parent: mbp at sourcefrog.net-20051208071308-3a71ecddda863fa8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 18:35:29 +1100
message:
[patch] read only the table-of-contents of weaves to speed up commit
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208071308-3a71ecddda863fa8
parent: mbp at sourcefrog.net-20051208071037-1a8ad346ec267c2d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 18:13:08 +1100
message:
[patch] refactor code that make sure stores are opened with unicode filenames (robertc)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208071037-1a8ad346ec267c2d
parent: mbp at sourcefrog.net-20051208061800-1849090041773314
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 18:10:37 +1100
message:
Add additional module for lsprof.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208061800-1849090041773314
parent: mbp at sourcefrog.net-20051208040047-8fdf91aa5b0047f0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 17:18:00 +1100
message:
New --lsprof option from Denys Duchier
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051208040047-8fdf91aa5b0047f0
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
parent: robertc at robertcollins.net-20051207061337-6edae828b9c29103
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-08 15:00:47 +1100
message:
[merge] robertc, small tests
------------------------------------------------------------
merged: robertc at robertcollins.net-20051207061337-6edae828b9c29103
parent: robertc at robertcollins.net-20051207055358-757787e694d89456
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-07 17:13:37 +1100
message:
Test for the number of uses of self.working_tree() in branch.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051207055358-757787e694d89456
parent: robertc at robertcollins.net-20051207030832-1f86f7bf2daeecf2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-07 16:53:58 +1100
message:
Test for the number of uses of self.working_tree() in branch.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051208055700-5d85edd70fd15d4d
parent: robertc at robertcollins.net-20051207061337-6edae828b9c29103
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2005-12-08 16:57:00 +1100
message:
Test the uses of WorkingTree from branch.py
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051213035433-26282b8f72702fc3
parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2005-12-13 14:54:33 +1100
message:
[patch] Speed improvement for Weave.join() (Goffredo Baroncelli)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051212172310-38340344da93b3cf
parent: abentley at panoramicfeedback.com-20051212171442-c5eeec64016bb1f7
parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2005-12-12 12:23:10 -0500
message:
Merged mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051212171442-c5eeec64016bb1f7
parent: aaron.bentley at utoronto.ca-20051212002414-d5c9e3eab54e705a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2005-12-12 12:14:42 -0500
message:
Use unicode pathname in cmd_missing
------------------------------------------------------------
merged: robertc at robertcollins.net-20051215032958-9ca8405f44373730
parent: robertc at robertcollins.net-20051215032111-e68d5e6ffbd4b574
parent: michael at ellerman.id.au-20051212073124-b228f6206d4f395d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2005-12-15 14:29:58 +1100
message:
Take Michaels nicer NEWS entry for dry-run.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051212073124-b228f6206d4f395d
parent: michael at ellerman.id.au-20051209071246-cc9d514bb992f011
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: add-dry-run
timestamp: Mon 2005-12-12 01:31:24 -0600
message:
Add NEWS entry for bzr add --dry-run
------------------------------------------------------------
merged: robertc at robertcollins.net-20051215032111-e68d5e6ffbd4b574
parent: robertc at robertcollins.net-20051214075934-6e951a9908674e50
parent: michael at ellerman.id.au-20051210221145-7765347ea4ca0093
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2005-12-15 14:21:11 +1100
message:
* Raise NoSuchFile when someone tries to add a non-existant file.
(Michael Ellerman)
* Simplify handling of DivergedBranches in cmd_pull().
(Michael Ellerman)
------------------------------------------------------------
merged: michael at ellerman.id.au-20051210221145-7765347ea4ca0093
parent: michael at ellerman.id.au-20051210221113-99ca561aaab4661e
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: fixes
timestamp: Sat 2005-12-10 16:11:45 -0600
message:
Raise NoSuchFile when someone tries to add a non-existant file.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051210221113-99ca561aaab4661e
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: fixes
timestamp: Sat 2005-12-10 16:11:13 -0600
message:
Simplify handling of DivergedBranches in cmd_pull()
------------------------------------------------------------
merged: robertc at robertcollins.net-20051214075934-6e951a9908674e50
parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-14 18:59:34 +1100
message:
merge from mbp.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216002517-73448ea063865983
parent: mbp at sourcefrog.net-20051216001728-5c9086013d1bbf8f
parent: robertc at robertcollins.net-20051214090140-b70938f467aaea6f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 11:25:17 +1100
message:
[merge] robertc: file encoding tests, and run all tests in C locale as well as default
------------------------------------------------------------
merged: robertc at robertcollins.net-20051214090140-b70938f467aaea6f
parent: robertc at robertcollins.net-20051214075326-3c1f619fa0f73514
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Wed 2005-12-14 20:01:40 +1100
message:
forgot my self.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051214075326-3c1f619fa0f73514
parent: robertc at robertcollins.net-20051212233303-1084576233b6e3b1
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Wed 2005-12-14 18:53:26 +1100
message:
Merge from upstream.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212233303-1084576233b6e3b1
parent: robertc at robertcollins.net-20051212231443-a2228c4350ea0a14
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Tue 2005-12-13 10:33:03 +1100
message:
Fix typo in my msgeditor test changes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212231443-a2228c4350ea0a14
parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Tue 2005-12-13 10:14:43 +1100
message:
Run the test suite with no locale as well as the default locale. Also add a test for build_tree_shape to selftest.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216001728-5c9086013d1bbf8f
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 11:17:28 +1100
message:
Add notes on merge/review process.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226014616-631090d43006cb4a
parent: aaron.bentley at utoronto.ca-20051226013944-2126b53ec3a9fb1e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 20:46:16 -0500
message:
Switched to locking README. (can't lock data files, it seems)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226013944-2126b53ec3a9fb1e
parent: aaron.bentley at utoronto.ca-20051226005411-c3792ed46786d5c6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 20:39:44 -0500
message:
Fixed most bugs
More information about the bazaar-commits
mailing list