Rev 2465: Merge incremental improvements from bzr.dev to create bzr 0.16rc2 in http://people.ubuntu.com/~robertc/baz2.0/0.16
Robert Collins
robertc at robertcollins.net
Mon Apr 30 07:58:26 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/0.16
------------------------------------------------------------
revno: 2465
revision-id: robertc at robertcollins.net-20070430065822-v91uqhvvn071teqo
parent: mbp at sourcefrog.net-20070426105838-f54z8279m88bl6ea
parent: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.16
timestamp: Mon 2007-04-30 16:58:22 +1000
message:
Merge incremental improvements from bzr.dev to create bzr 0.16rc2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2463.1.8
merged: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
parent: pqm at pqm.ubuntu.com-20070430042900-o9x8ggxoevt9s9fi
parent: robertc at robertcollins.net-20070430051358-8cp7kvp1q0tqhxx0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 06:44:16 +0100
message:
(robertc) ``WorkingTree4._iter_changes`` should not descend into unversioned directories. (John Arbash Meinel, #110399)
------------------------------------------------------------
revno: 2463.1.3.4.4
merged: robertc at robertcollins.net-20070430051358-8cp7kvp1q0tqhxx0
parent: john at arbash-meinel.com-20070426230146-ip22905t91xhkjs9
parent: pqm at pqm.ubuntu.com-20070430042900-o9x8ggxoevt9s9fi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-30 15:13:58 +1000
message:
Merge Johns fix for bug 110399.
------------------------------------------------------------
revno: 2463.1.3.4.3
merged: john at arbash-meinel.com-20070426230146-ip22905t91xhkjs9
parent: john at arbash-meinel.com-20070426225601-ae4qfcb8bzcfomny
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_ignores_unknowns
timestamp: Thu 2007-04-26 18:01:46 -0500
message:
Fix bug #110399 by changing _iter_changes to never descend into unknown directories.
There was a bug when a versioned directory had no versioned children.
It would descend into all unknown subdirs.
This was originally fixed when 'want_unchanged=True', but now it is
also fixed when 'want_unchanged=False'.
We really should have an intertree test for this, but to detect
descent, we spy on walkdirs, which WT3 doesn't use.
------------------------------------------------------------
revno: 2463.1.3.4.2
merged: john at arbash-meinel.com-20070426225601-ae4qfcb8bzcfomny
parent: john at arbash-meinel.com-20070426224632-6nrmxl1kfbji3c63
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_ignores_unknowns
timestamp: Thu 2007-04-26 17:56:01 -0500
message:
Clean up the (failing) test so that the last thing
to fail is what I'm fixing.
------------------------------------------------------------
revno: 2463.1.3.4.1
merged: john at arbash-meinel.com-20070426224632-6nrmxl1kfbji3c63
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_ignores_unknowns
timestamp: Thu 2007-04-26 17:46:32 -0500
message:
Add a (failing) test that exposes how _iter_changes is accidentally walking into unversioned directories.
------------------------------------------------------------
revno: 2463.1.7
merged: pqm at pqm.ubuntu.com-20070430042900-o9x8ggxoevt9s9fi
parent: pqm at pqm.ubuntu.com-20070430040006-olr7xpzdbp02y1sd
parent: robertc at robertcollins.net-20070430034851-aik2bzpubf44oyjc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 05:29:00 +0100
message:
(robertc) Properly compare filesystem paths with absent and renamed entries. (John Arbash Meinel, #110256)
------------------------------------------------------------
revno: 2463.1.2.1.4
merged: robertc at robertcollins.net-20070430034851-aik2bzpubf44oyjc
parent: john at arbash-meinel.com-20070426211345-fh5tuoii9mb7w15a
parent: pqm at pqm.ubuntu.com-20070430025942-y83xydh67a37zebd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-30 13:48:51 +1000
message:
Merge Johns fix for bug 110256.
------------------------------------------------------------
revno: 2463.1.2.1.3
merged: john at arbash-meinel.com-20070426211345-fh5tuoii9mb7w15a
parent: john at arbash-meinel.com-20070426211150-q67uvpdf3os770u2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status_after_merge_110256
timestamp: Thu 2007-04-26 16:13:45 -0500
message:
NEWS entry for fixing bug #110256
------------------------------------------------------------
revno: 2463.1.2.1.2
merged: john at arbash-meinel.com-20070426211150-q67uvpdf3os770u2
parent: john at arbash-meinel.com-20070426204553-sfw4mo98pxggdrfm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status_after_merge_110256
timestamp: Thu 2007-04-26 16:11:50 -0500
message:
Alternate fix for 'absent' entries.
This also handles 'renamed' entries properly.
Basically, when we get a path which happens to match a dirstate entry
check to see if the entry is considered 'live'.
If it isn't, then we treat it as a non-match, which allows
later checks to properly handle the file on disk.
------------------------------------------------------------
revno: 2463.1.2.1.1
merged: john at arbash-meinel.com-20070426204553-sfw4mo98pxggdrfm
parent: pqm at pqm.ubuntu.com-20070426181928-ot99t6eyhjjfj5h3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status_after_merge_110256
timestamp: Thu 2007-04-26 15:45:53 -0500
message:
Add a (failing) test exposing the bug in _iter_changes
If you bzr mv a => b, and then bzr add a (for a new a), bzr can get
confused as to the state of 'a'.
------------------------------------------------------------
revno: 2463.1.6
merged: pqm at pqm.ubuntu.com-20070430040006-olr7xpzdbp02y1sd
parent: pqm at pqm.ubuntu.com-20070430025942-y83xydh67a37zebd
parent: andrew.bennetts at canonical.com-20070427021911-pk1ylmrmc1ueo9ad
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 05:00:06 +0100
message:
(Andrew Bennetts) Normalise URLs in RemoteHTTPTransport before doing URL calculations to fix bad results.
------------------------------------------------------------
revno: 2463.1.3.3.1
merged: andrew.bennetts at canonical.com-20070427021911-pk1ylmrmc1ueo9ad
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: normalize-remote-http-urls
timestamp: Fri 2007-04-27 12:19:11 +1000
message:
Normalise URLs in RemoteHTTPTransport before doing URL calculations to fix bad results.
------------------------------------------------------------
revno: 2463.1.5
merged: pqm at pqm.ubuntu.com-20070430025942-y83xydh67a37zebd
parent: pqm at pqm.ubuntu.com-20070430022343-wnbvslzfz6fpyyj7
parent: andrew.bennetts at canonical.com-20070430022545-iubud5mcxc1mdsw9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 03:59:42 +0100
message:
(Andrew Bennetts) Fix incompatibility with < 0.16 smart servers.
------------------------------------------------------------
revno: 2463.1.3.2.4
merged: andrew.bennetts at canonical.com-20070430022545-iubud5mcxc1mdsw9
parent: andrew.bennetts at canonical.com-20070430020406-9vvmb4f9x8bdmvv8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-older-server-compat-bug
timestamp: Mon 2007-04-30 12:25:45 +1000
message:
Tweaks asked for by Robert.
------------------------------------------------------------
revno: 2463.1.3.2.3
merged: andrew.bennetts at canonical.com-20070430020406-9vvmb4f9x8bdmvv8
parent: andrew.bennetts at canonical.com-20070430020205-ensbvu0t14yb3tk4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-older-server-compat-bug
timestamp: Mon 2007-04-30 12:04:06 +1000
message:
Remove another XXX.
------------------------------------------------------------
revno: 2463.1.3.2.2
merged: andrew.bennetts at canonical.com-20070430020205-ensbvu0t14yb3tk4
parent: andrew.bennetts at canonical.com-20070427030144-vz2vna1t31ymdgz9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-older-server-compat-bug
timestamp: Mon 2007-04-30 12:02:05 +1000
message:
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
------------------------------------------------------------
revno: 2463.1.3.2.1
merged: andrew.bennetts at canonical.com-20070427030144-vz2vna1t31ymdgz9
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-older-server-compat-bug
timestamp: Fri 2007-04-27 13:01:44 +1000
message:
Fix incompatibility with < 0.16 smart servers.
------------------------------------------------------------
revno: 2463.1.4
merged: pqm at pqm.ubuntu.com-20070430022343-wnbvslzfz6fpyyj7
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
parent: robertc at robertcollins.net-20070430014939-mjnji1bq7zulpjlv
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 03:23:43 +0100
message:
(robertc) Fix the bzr commit message to be in text mode. (Alexander Belchenko)
------------------------------------------------------------
revno: 2463.1.3.1.1
merged: robertc at robertcollins.net-20070430014939-mjnji1bq7zulpjlv
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-30 11:49:39 +1000
message:
Fix the bzr commit message to be in text mode. (Alexander Belchenko)
------------------------------------------------------------
revno: 2463.1.3
merged: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
parent: pqm at pqm.ubuntu.com-20070426181928-ot99t6eyhjjfj5h3
parent: john at arbash-meinel.com-20070426185333-i1xlyaeyf049kdxc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 22:11:03 +0100
message:
(John Arbash Meinel) Fix bug #109613 by teaching Bundle how to properly read/write revision properties with no value.
------------------------------------------------------------
revno: 2447.1.7
merged: john at arbash-meinel.com-20070426185333-i1xlyaeyf049kdxc
parent: john at arbash-meinel.com-20070426145512-xnda2pxcpfa86yld
parent: pqm at pqm.ubuntu.com-20070426181928-ot99t6eyhjjfj5h3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Thu 2007-04-26 13:53:33 -0500
message:
[merge] bzr.dev 2465
------------------------------------------------------------
revno: 2447.1.6
merged: john at arbash-meinel.com-20070426145512-xnda2pxcpfa86yld
parent: john at arbash-meinel.com-20070425175514-il068rykvdulkm2k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Thu 2007-04-26 09:55:12 -0500
message:
NEWS update for fixing bug #109613
------------------------------------------------------------
revno: 2447.1.5
merged: john at arbash-meinel.com-20070425175514-il068rykvdulkm2k
parent: john at arbash-meinel.com-20070425174944-mti4294wv55nimd3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Wed 2007-04-25 12:55:14 -0500
message:
NEWS
------------------------------------------------------------
revno: 2447.1.4
merged: john at arbash-meinel.com-20070425174944-mti4294wv55nimd3
parent: john at arbash-meinel.com-20070425165625-d2act28kmjn5avel
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Wed 2007-04-25 12:49:44 -0500
message:
Add a test that we properly round-trip unicode properties.
And fix the (unreported) bug :)
------------------------------------------------------------
revno: 2447.1.3
merged: john at arbash-meinel.com-20070425165625-d2act28kmjn5avel
parent: john at arbash-meinel.com-20070425164125-nr7pmz4tfp5qkze2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Wed 2007-04-25 11:56:25 -0500
message:
Change the default serializer to include a trailing whitespace for empty properties.
This means that new bundles can be read by old versions of bzr
(though they cannot read their own).
On the flip side, the new bzr can read old outputs correctly.
------------------------------------------------------------
revno: 2447.1.2
merged: john at arbash-meinel.com-20070425164125-nr7pmz4tfp5qkze2
parent: john at arbash-meinel.com-20070425143231-wy5jkw8g9tr471ji
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Wed 2007-04-25 11:41:25 -0500
message:
Add tests that we handle empty values whether they end in ': \n' or ':\n'.
And fix the reader to handle the ':\n' case.
------------------------------------------------------------
revno: 2447.1.1
merged: john at arbash-meinel.com-20070425143231-wy5jkw8g9tr471ji
parent: pqm at pqm.ubuntu.com-20070423170758-qd512ltqglzfo6w9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bundle_empty_properties
timestamp: Wed 2007-04-25 09:32:31 -0500
message:
For stability and ease of testing, write properties in sorted order.
This doesn't really change the bundle format, since we read the
properties into a dictionary, so their position in the file doesn't
matter. Plus the Revision xml serializer also writes them in sorted
order.
------------------------------------------------------------
revno: 2463.1.2
merged: pqm at pqm.ubuntu.com-20070426181928-ot99t6eyhjjfj5h3
parent: pqm at pqm.ubuntu.com-20070426153904-l91p9ybsqpxt2vyv
parent: john at arbash-meinel.com-20070426165232-lbjqbhqld4k106uv
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 19:19:28 +0100
message:
(John Arbash Meinel, trivial) Clean up NEWS to conform to reST syntax
------------------------------------------------------------
revno: 2463.1.1.1.2
merged: john at arbash-meinel.com-20070426165232-lbjqbhqld4k106uv
parent: john at arbash-meinel.com-20070426160504-ob2sd03xgjuo0f9o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-04-26 11:52:32 -0500
message:
Cleanup NEWS in accordance with rst formatting rules.
Wrap explicit text with ``foo`` when reasonable (especially if we have an underscore
or other rst meta character).
Also, reformat attributions to be (User Name, #bugnumber), prefering not to wrap.
------------------------------------------------------------
revno: 2463.1.1.1.1
merged: john at arbash-meinel.com-20070426160504-ob2sd03xgjuo0f9o
parent: pqm at pqm.ubuntu.com-20070426153904-l91p9ybsqpxt2vyv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-04-26 11:05:04 -0500
message:
Move NEWS entry for 109993 to IN DEVELOPMENT rather than 0.16rc1
------------------------------------------------------------
revno: 2463.1.1
merged: pqm at pqm.ubuntu.com-20070426153904-l91p9ybsqpxt2vyv
parent: pqm at pqm.ubuntu.com-20070426104148-4l5wq2zemlzv0shg
parent: john at arbash-meinel.com-20070426144401-zdbrjiuao7xqrp0r
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-26 16:39:04 +0100
message:
(John Arbash Meinel) Fix bug #109993 by fixing _iter_changes to not sync an on-disk file with an 'absent' dirblock record.
------------------------------------------------------------
revno: 2456.2.6
merged: john at arbash-meinel.com-20070426144401-zdbrjiuao7xqrp0r
parent: john at arbash-meinel.com-20070425224555-msapt0k72c4h8wju
parent: pqm at pqm.ubuntu.com-20070426104148-4l5wq2zemlzv0shg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Thu 2007-04-26 09:44:01 -0500
message:
[merge] bzr.dev 2463
------------------------------------------------------------
revno: 2456.2.5
merged: john at arbash-meinel.com-20070425224555-msapt0k72c4h8wju
parent: john at arbash-meinel.com-20070425221045-z3oqq15r3g5p9goj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 17:45:55 -0500
message:
Make sure the output with want_unversioned=False is reasonable.
------------------------------------------------------------
revno: 2456.2.4
merged: john at arbash-meinel.com-20070425221045-z3oqq15r3g5p9goj
parent: john at arbash-meinel.com-20070425220709-smtrld4n70yy3u51
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 17:10:45 -0500
message:
NEWS entry for fixing bug 109993
------------------------------------------------------------
revno: 2456.2.3
merged: john at arbash-meinel.com-20070425220709-smtrld4n70yy3u51
parent: john at arbash-meinel.com-20070425215414-3zso9m2xndcd4rwp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 17:07:09 -0500
message:
Tests now pass
------------------------------------------------------------
revno: 2456.2.2
merged: john at arbash-meinel.com-20070425215414-3zso9m2xndcd4rwp
parent: john at arbash-meinel.com-20070425184156-weys7l94o2nn6d4l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 16:54:14 -0500
message:
Add another (failing) test case.
If we unversion a file, but it is still on disk
we should get 2 records from _iter_changes
one to indicate the removal
the other to indicate the unknown file on disk
------------------------------------------------------------
revno: 2456.2.1
merged: john at arbash-meinel.com-20070425184156-weys7l94o2nn6d4l
parent: pqm at pqm.ubuntu.com-20070425143732-c4aa489eylhhfnzg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_iter_changes_109993
timestamp: Wed 2007-04-25 13:41:56 -0500
message:
(broken) Add a (failing) test that _iter_changes works correctly
in the case that you delete a file, and rename another file overtop.
(Dirstate currently has a chance to report the renamed file as deleted
if the rename goes to a name which sorts first in the list.)
Diff too large for email (2014 lines, the limit is 1000).
More information about the bazaar-commits
mailing list