Rev 1565: Merge in bound branches core support. in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Mar 6 00:49:37 GMT 2006
------------------------------------------------------------
revno: 1565
revision-id: pqm at pqm.ubuntu.com-20060306004926-6d7a10c990bc17d1
parent: pqm at pqm.ubuntu.com-20060303134251-e9c7ea87d21f3888
parent: robertc at robertcollins.net-20060305114854-d95dbe4adfee32e9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-03-06 00:49:26 +0000
message:
Merge in bound branches core support.
added:
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: robertc at robertcollins.net-20060305114854-d95dbe4adfee32e9
parent: robertc at robertcollins.net-20060305083128-d23aadbfb2939761
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 22:48:54 +1100
message:
Make bound branch creation happen via 'checkout'
------------------------------------------------------------
merged: robertc at robertcollins.net-20060305083128-d23aadbfb2939761
parent: robertc at robertcollins.net-20060305082622-1ae79047490c239a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 19:31:28 +1100
message:
Explain why update pivots more clearly in the relevant test.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060305082622-1ae79047490c239a
parent: robertc at robertcollins.net-20060305022007-53e5907d083453e8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 19:26:22 +1100
message:
Update help message to be more bound branch friendly.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060305022007-53e5907d083453e8
parent: robertc at robertcollins.net-20060305001931-051a5898ad439113
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 13:20:07 +1100
message:
Local commits appear to be working properly.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060305001931-051a5898ad439113
parent: robertc at robertcollins.net-20060304230437-3c1c3098f37a39cb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 11:19:31 +1100
message:
update updates working tree and branch together.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060304230437-3c1c3098f37a39cb
parent: robertc at robertcollins.net-20060304223519-51db134273f7a5a1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 10:04:37 +1100
message:
Local commits do no alter or access the master branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060304223519-51db134273f7a5a1
parent: robertc at robertcollins.net-20060304215237-b1ee1a8c3238a251
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 09:35:19 +1100
message:
Local commits on unbound branches fail.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060304215237-b1ee1a8c3238a251
parent: robertc at robertcollins.net-20060304130357-95990a95920f57bb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 08:52:37 +1100
message:
Commit revision data locally first for bound branch commits.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060304130357-95990a95920f57bb
parent: robertc at robertcollins.net-20060303132246-5527bd85b7a33fe7
parent: john at arbash-meinel.com-20060103235145-7daca9e6edf27703
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bound-branches
timestamp: Sun 2006-03-05 00:03:57 +1100
message:
Update bound branch implementation to 0.8.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103235145-7daca9e6edf27703
parent: john at arbash-meinel.com-20051231151921-351e2877d360e537
parent: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Tue 2006-01-03 17:51:45 -0600
message:
[merge] jam-integration 1495
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231151921-351e2877d360e537
parent: john at arbash-meinel.com-20051231060441-1234627a5fa6e6f1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Sat 2005-12-31 09:19:21 -0600
message:
Added special exceptions when unable to contact parent branch. Added tests for failure. bind() no longer updates the remote working tree
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231060441-1234627a5fa6e6f1
parent: john at arbash-meinel.com-20051231055713-351f8d30e4dc1a8f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Sat 2005-12-31 00:04:41 -0600
message:
todo
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231055713-351f8d30e4dc1a8f
parent: john at arbash-meinel.com-20051231051647-48a9b9751df50bec
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 23:57:13 -0600
message:
Adding tests against an sftp branch.
Fixed a couple of errors it revealed.
Including that we were re-connecting to the master branch
multiple times, inside a write lock (because inside commit
we call pull, which needs the master branch)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231051647-48a9b9751df50bec
parent: john at arbash-meinel.com-20051231005134-dd54e393c7d3b612
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 23:16:47 -0600
message:
Created a set of tests which bind to an sftp branch. Found some bugs, need to fix commit.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231005134-dd54e393c7d3b612
parent: john at arbash-meinel.com-20051231002303-fbc5cf80469ef0cf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 18:51:34 -0600
message:
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051231002303-fbc5cf80469ef0cf
parent: john at arbash-meinel.com-20051230232216-8f4ca70c6af10a40
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 18:23:03 -0600
message:
Updated commit to handle bound branches. Included test to handle commit after merge
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230232216-8f4ca70c6af10a40
parent: john at arbash-meinel.com-20051230224621-26c3a50a460989a0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 17:22:16 -0600
message:
Whitespace cleanup of bzrlib.errors
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230224621-26c3a50a460989a0
parent: john at arbash-meinel.com-20051230213745-6b85584a7e1a9ce0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 16:46:21 -0600
message:
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230213745-6b85584a7e1a9ce0
parent: john at arbash-meinel.com-20051230213210-a5f4e287d7fe7e5a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 15:37:45 -0600
message:
Removing changes for bound branch by invading set-revision-history.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230213210-a5f4e287d7fe7e5a
parent: john at arbash-meinel.com-20051127220506-6daf908286c7d704
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Fri 2005-12-30 15:32:10 -0600
message:
[merge] bzr.dev 1491
------------------------------------------------------------
merged: john at arbash-meinel.com-20051127220506-6daf908286c7d704
parent: john at arbash-meinel.com-20051120215122-081d3a3c352b7225
parent: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Sun 2005-11-27 16:05:06 -0600
message:
[merge] up-to-date against bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051120215122-081d3a3c352b7225
parent: john at arbash-meinel.com-20051117224950-1c5de92567527104
parent: jelmer at samba.org-20051120204442-18bfa8e003cc92ea
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bound-branch
timestamp: Sun 2005-11-20 15:51:22 -0600
message:
[merge] Jelmer Vernooij's cleanup
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117224950-1c5de92567527104
parent: john at arbash-meinel.com-20051117224653-d0b7ceb49e5c9851
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Thu 2005-11-17 16:49:50 -0600
message:
Moved test_bound_branches into blackbox package.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051117224653-d0b7ceb49e5c9851
parent: john at arbash-meinel.com-20051114230331-7446f4c41816df34
parent: john at arbash-meinel.com-20051117221217-7b51f99a1a60c578
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-bound-branch
timestamp: Thu 2005-11-17 16:46:53 -0600
message:
[merge] robertc's integration, updated tests to check for retcode=3
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114230331-7446f4c41816df34
parent: john at arbash-meinel.com-20051114171932-2a4a6a845c5e638b
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 17:03:31 -0600
message:
Playing around with changing the default pull location for a bound branch.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114171932-2a4a6a845c5e638b
parent: john at arbash-meinel.com-20051114171833-7c7abd6245e20e0f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 11:19:32 -0600
message:
Fixed the error message to request using bzr update instead of bzr pull
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114171833-7c7abd6245e20e0f
parent: john at arbash-meinel.com-20051114170235-f85afa458bae956e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 11:18:33 -0600
message:
Adding the bzr update command, to update checkouts and bound branches.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051114170235-f85afa458bae956e
parent: john at arbash-meinel.com-20051113024239-baea9ea45ecd2796
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Mon 2005-11-14 11:02:35 -0600
message:
Fixing up the error message for a failed bind.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113024239-baea9ea45ecd2796
parent: john at arbash-meinel.com-20051113023217-3c97625faca853b4
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 20:42:39 -0600
message:
Adding a little bit more to the test suite.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113023217-3c97625faca853b4
parent: john at arbash-meinel.com-20051113021130-fe8ac4acfd26fe6c
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 20:32:17 -0600
message:
Brought back 'optimized' version, for better errors, cleaned up exception handling.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113021130-fe8ac4acfd26fe6c
parent: john at arbash-meinel.com-20051113021053-343a2bf544770e94
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 20:11:30 -0600
message:
Reverting bogus optimization attempt
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113021053-343a2bf544770e94
parent: john at arbash-meinel.com-20051113015537-77804ccc93479b4f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 20:10:53 -0600
message:
Attempted to improve bound performance, didn't help, will revert
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113015537-77804ccc93479b4f
parent: john at arbash-meinel.com-20051113015016-6ca45e7115ab63f6
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 19:55:37 -0600
message:
Bound branches seem to work, need to improve the performance.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051113015016-6ca45e7115ab63f6
parent: john at arbash-meinel.com-20051112214210-6afc243ae098682f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 19:50:16 -0600
message:
Cleaned up tests and code, all bound branch tests succeed.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051112214210-6afc243ae098682f
parent: john at arbash-meinel.com-20051112213835-282bdea6a76e7230
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 15:42:10 -0600
message:
Added a test for the unbind command.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051112213835-282bdea6a76e7230
parent: john at arbash-meinel.com-20051112213359-925abcf4ba6b452f
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 15:38:35 -0600
message:
Wrote a simple test which actually makes a branch become bound, and made it work
------------------------------------------------------------
merged: john at arbash-meinel.com-20051112213359-925abcf4ba6b452f
parent: john at arbash-meinel.com-20051112195534-3e33d6225502834b
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 15:33:59 -0600
message:
(broken) Adding more tests, and some functionality
------------------------------------------------------------
merged: john at arbash-meinel.com-20051112195534-3e33d6225502834b
parent: john at arbash-meinel.com-20051112041705-f53471838021b7f3
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Sat 2005-11-12 13:55:34 -0600
message:
(broken) working on implementing bound branches.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051112041705-f53471838021b7f3
parent: robertc at robertcollins.net-20051108005548-417f470e4b50a467
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Fri 2005-11-11 22:17:05 -0600
message:
Adding test for bound behavior
------------------------------------------------------------
merged: robertc at robertcollins.net-20060303132246-5527bd85b7a33fe7
parent: robertc at robertcollins.net-20060303094100-1efead555ecdd1a5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-03-04 00:22:46 +1100
message:
Put bzr branch behaviour back to the 0.7 ignore-working-tree state.
More information about the bazaar-commits
mailing list