Rev 2517: [merge] bzr.dev 2483 in http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/dirstate_pyrex
John Arbash Meinel
john at arbash-meinel.com
Mon May 7 19:25:07 BST 2007
At http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/dirstate_pyrex
------------------------------------------------------------
revno: 2517
revision-id: john at arbash-meinel.com-20070507182449-mm860vvdw9keyfx5
parent: john at arbash-meinel.com-20070507180840-e0r1jomaos7an93j
parent: pqm at pqm.ubuntu.com-20070507175017-mvwcdqzq0w4z36lr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 13:24:49 -0500
message:
[merge] bzr.dev 2483
added:
doc/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/default.css default.css-20060622101119-tgwtdci8z769bjb9-1
------------------------------------------------------------
revno: 2474.1.9
merged: pqm at pqm.ubuntu.com-20070507175017-mvwcdqzq0w4z36lr
parent: pqm at pqm.ubuntu.com-20070507134218-nk6vem1ok21xv3yt
parent: robertc at robertcollins.net-20070507165517-xbsjn40to6rw3w5e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-05-07 18:50:17 +0100
message:
(robertc) Trivially update the location of bzrtools in doc/centralized_workflow.txt
------------------------------------------------------------
revno: 2474.1.8.1.1
merged: robertc at robertcollins.net-20070507165517-xbsjn40to6rw3w5e
parent: pqm at pqm.ubuntu.com-20070507134218-nk6vem1ok21xv3yt
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-05-08 02:55:17 +1000
message:
(robertc) Trivially update the location of bzrtools in doc/centralized_workflow.txt
------------------------------------------------------------
revno: 2474.1.8
merged: pqm at pqm.ubuntu.com-20070507134218-nk6vem1ok21xv3yt
parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
parent: andrew.bennetts at canonical.com-20070430064224-hagj8m0855p1sxn7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-05-07 14:42:18 +0100
message:
(robertc) Fix trivial incompatibility with bzr 0.11 servers, which give a slightly different error to bzr 0.15 servers. (Andrew Bennetts)
------------------------------------------------------------
revno: 2471.2.1
merged: andrew.bennetts at canonical.com-20070430064224-hagj8m0855p1sxn7
parent: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-0.11-compat
timestamp: Mon 2007-04-30 16:42:24 +1000
message:
Fix trivial incompatibility with bzr 0.11 servers, which give a slightly different error to bzr 0.15 servers.
------------------------------------------------------------
revno: 2474.1.7
merged: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
parent: pqm at pqm.ubuntu.com-20070503194912-pzlcms91kk2uqfdo
parent: john at arbash-meinel.com-20070503164230-y0411liq6w3bphj0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-05-04 04:45:56 +0100
message:
(John Arbash Meinel) make 'install_bundle' significantly faster by only validating the revisions 1 time, rather than validating all revisions n times.
------------------------------------------------------------
revno: 2474.1.2.2.1
merged: john at arbash-meinel.com-20070503164230-y0411liq6w3bphj0
parent: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: install_bundle_performance
timestamp: Thu 2007-05-03 11:42:30 -0500
message:
Vastly improve bundle install performance by only validating the bundle one time
------------------------------------------------------------
revno: 2474.1.6
merged: pqm at pqm.ubuntu.com-20070503194912-pzlcms91kk2uqfdo
parent: pqm at pqm.ubuntu.com-20070503192218-gq01rpszgraa681p
parent: john at arbash-meinel.com-20070502152116-cli5do15pznxvl9g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-03 20:49:12 +0100
message:
(John Arbash Meinel) Add doc/shared_repository_layouts.txt
------------------------------------------------------------
revno: 2474.1.2.1.1
merged: john at arbash-meinel.com-20070502152116-cli5do15pznxvl9g
parent: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: shared_repo_layouts
timestamp: Wed 2007-05-02 10:21:16 -0500
message:
Add shared_repository_layouts.txt as a core document.
------------------------------------------------------------
revno: 2474.1.5
merged: pqm at pqm.ubuntu.com-20070503192218-gq01rpszgraa681p
parent: pqm at pqm.ubuntu.com-20070503094732-4ypcrctuxb93rwcv
parent: john at arbash-meinel.com-20070502145420-k2vebnl0rd45q8kk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-03 20:22:18 +0100
message:
(John Arbash Meinel) Fix bug #75721: 'bzr push' should only connect a single time.
------------------------------------------------------------
revno: 2474.1.1.3.3
merged: john at arbash-meinel.com-20070502145420-k2vebnl0rd45q8kk
parent: john at arbash-meinel.com-20070502143655-id25373m3lgue8ke
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: single_connect_for_push_75721
timestamp: Wed 2007-05-02 09:54:20 -0500
message:
Change calls to try/mkdir('.')/except FileExists to ensure_base()
------------------------------------------------------------
revno: 2474.1.1.3.2
merged: john at arbash-meinel.com-20070502143655-id25373m3lgue8ke
parent: john at arbash-meinel.com-20070501224141-23intuz4dabm0j73
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: single_connect_for_push_75721
timestamp: Wed 2007-05-02 09:36:55 -0500
message:
Add Transport.ensure_base()
------------------------------------------------------------
revno: 2474.1.1.3.1
merged: john at arbash-meinel.com-20070501224141-23intuz4dabm0j73
parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: single_connect_for_push_75721
timestamp: Tue 2007-05-01 17:41:41 -0500
message:
Fix bug #75721. Update the BzrDir api to add clone_on_transport()
This allows us to pass around a Transport which we already have open
rather calling get_transport(url).
This is mostly noticeable in 'bzr push' which was connecting 3-4 times.
------------------------------------------------------------
revno: 2474.1.4
merged: pqm at pqm.ubuntu.com-20070503094732-4ypcrctuxb93rwcv
parent: pqm at pqm.ubuntu.com-20070503064943-wh3ls1tw3q2awye0
parent: bialix at ukr.net-20070501090918-km46cslj820tiyzl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-03 10:47:32 +0100
message:
(bialix,r=john,martin) Bugfix #110901: commit message template written
with native line-endings; corresponding unit tests added
------------------------------------------------------------
revno: 2472.4.2
merged: bialix at ukr.net-20070501090918-km46cslj820tiyzl
parent: bialix at ukr.net-20070430195244-pxc5r3x72ckh027e
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.fixes
timestamp: Tue 2007-05-01 12:09:18 +0300
message:
unwrapping long lines in tests
------------------------------------------------------------
revno: 2472.4.1
merged: bialix at ukr.net-20070430195244-pxc5r3x72ckh027e
parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.fixes
timestamp: Mon 2007-04-30 22:52:44 +0300
message:
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
------------------------------------------------------------
revno: 2474.1.3
merged: pqm at pqm.ubuntu.com-20070503064943-wh3ls1tw3q2awye0
parent: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
parent: mbp at sourcefrog.net-20070503062149-mkf0na5ce8j3rpzm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-03 07:49:43 +0100
message:
Integrated developer guide cleanups
------------------------------------------------------------
revno: 2474.1.1.2.4
merged: mbp at sourcefrog.net-20070503062149-mkf0na5ce8j3rpzm
parent: mbp at sourcefrog.net-20070503061911-1mmho1eh1pz7y950
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-05-03 16:21:49 +1000
message:
HACKING rest fixes from jam
------------------------------------------------------------
revno: 2474.1.1.2.3
merged: mbp at sourcefrog.net-20070503061911-1mmho1eh1pz7y950
parent: mbp at sourcefrog.net-20070503061300-db7vcrdh10vhhqih
parent: ian.clatworthy at internode.on.net-20070502044327-uvny1xwti20eh1p3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-05-03 16:19:11 +1000
message:
Merge ian's HACKING updates
------------------------------------------------------------
revno: 2466.6.3
merged: ian.clatworthy at internode.on.net-20070502044327-uvny1xwti20eh1p3
parent: ian.clatworthy at internode.on.net-20070430081033-2uer1v88nhaz4532
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.HACKING
timestamp: Wed 2007-05-02 14:43:27 +1000
message:
Incorporate feedback from Aaron B. & Alex B.
------------------------------------------------------------
revno: 2466.6.2
merged: ian.clatworthy at internode.on.net-20070430081033-2uer1v88nhaz4532
parent: ian.clatworthy at internode.on.net-20070427150319-tldij8hy0tcsij2q
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.HACKING
timestamp: Mon 2007-04-30 18:10:33 +1000
message:
Incorporate feedback from LarstiQ
------------------------------------------------------------
revno: 2466.6.1
merged: ian.clatworthy at internode.on.net-20070427150319-tldij8hy0tcsij2q
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.HACKING
timestamp: Sat 2007-04-28 01:03:19 +1000
message:
Expand HACKING into Bazaar Developer Guide
------------------------------------------------------------
revno: 2474.1.1.2.2
merged: mbp at sourcefrog.net-20070503061300-db7vcrdh10vhhqih
parent: mbp at sourcefrog.net-20070502113316-dshmmkjwwzjsyuq8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-05-03 16:13:00 +1000
message:
Clarify TestSkipped
------------------------------------------------------------
revno: 2474.1.1.2.1
merged: mbp at sourcefrog.net-20070502113316-dshmmkjwwzjsyuq8
parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2007-05-02 21:33:16 +1000
message:
Description of how to use TestSkipped, test features, etc
------------------------------------------------------------
revno: 2474.1.2
merged: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
parent: mbp at sourcefrog.net-20070502120036-ap7wytspwly1p00k
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-05-02 13:51:59 +0100
message:
Rename test_plugin tests and the example module used there.
------------------------------------------------------------
revno: 2474.1.1.1.1
merged: mbp at sourcefrog.net-20070502120036-ap7wytspwly1p00k
parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2007-05-02 22:00:36 +1000
message:
Rename test_plugin tests and the example module used there.
------------------------------------------------------------
revno: 2474.1.1
merged: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
parent: pqm at pqm.ubuntu.com-20070430223205-x4uyrteryh0230fp
parent: john at arbash-meinel.com-20070430174510-qdteh5dy45gbj785
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-05-01 19:27:14 +0100
message:
(John Arbash Meinel) Fix bug #111127 and bug #111288. WT4._iter_changes had difficulties with directories with '-', and filesystem renames.
------------------------------------------------------------
revno: 2472.2.2
merged: john at arbash-meinel.com-20070430174510-qdteh5dy45gbj785
parent: john at arbash-meinel.com-20070430174107-jec5pf7b63kc2uj9
parent: john at arbash-meinel.com-20070430173412-538b3mvbh9b8db8l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_fixes
timestamp: Mon 2007-04-30 12:45:10 -0500
message:
[merge] bugfix for bug #111288, resolve conflicts.
------------------------------------------------------------
revno: 2472.3.2
merged: john at arbash-meinel.com-20070430173412-538b3mvbh9b8db8l
parent: john at arbash-meinel.com-20070430172939-hvjgsm1pinoawdy5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: renamed_file_111288
timestamp: Mon 2007-04-30 12:34:12 -0500
message:
Now that finding a file on disk which doesn't match
the dirblock doesn't claim 'path_handled', it is identical
to the case when the dirblock entry is marked as 'a' or 'r'.
So remove the extra else clause for simplicity.
------------------------------------------------------------
revno: 2472.3.1
merged: john at arbash-meinel.com-20070430172939-hvjgsm1pinoawdy5
parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: renamed_file_111288
timestamp: Mon 2007-04-30 12:29:39 -0500
message:
Fix bug #111288. When we don't have a match
don't consider the disk file processed. Because we need to
emit an 'unknown' record for it.
------------------------------------------------------------
revno: 2472.2.1
merged: john at arbash-meinel.com-20070430174107-jec5pf7b63kc2uj9
parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
parent: john at arbash-meinel.com-20070430170541-pdh0k81zpedgjl70
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_fixes
timestamp: Mon 2007-04-30 12:41:07 -0500
message:
[merge] fix for bug #111127
------------------------------------------------------------
revno: 2466.5.4
merged: john at arbash-meinel.com-20070430170541-pdh0k81zpedgjl70
parent: john at arbash-meinel.com-20070430162558-f040stduyrfflef9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mixed_names_111127
timestamp: Mon 2007-04-30 12:05:41 -0500
message:
Fix bug #11127 by splitting paths on '/'.
This adds a bit of overhead when paths don't match.
So conceptually we might want to cache the split value,
or return it from the underlying iterator.
However, we only need it when the current iterators don't match
so most of the time a simple 'x == y' is sufficient, since
equality is correct with or without the split().
So the computational overhead should be fine.
------------------------------------------------------------
revno: 2466.5.3
merged: john at arbash-meinel.com-20070430162558-f040stduyrfflef9
parent: john at arbash-meinel.com-20070430162242-3gds64wynnny2t57
parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mixed_names_111127
timestamp: Mon 2007-04-30 11:25:58 -0500
message:
[merge] bzr.dev 2472
------------------------------------------------------------
revno: 2466.5.2
merged: john at arbash-meinel.com-20070430162242-3gds64wynnny2t57
parent: john at arbash-meinel.com-20070430160855-z8zh7eb7r629ch6g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mixed_names_111127
timestamp: Mon 2007-04-30 11:22:42 -0500
message:
Extend the test a bit to make sure the include_unchanged value is correct.
still (broken)
------------------------------------------------------------
revno: 2466.5.1
merged: john at arbash-meinel.com-20070430160855-z8zh7eb7r629ch6g
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: mixed_names_111127
timestamp: Mon 2007-04-30 11:08:55 -0500
message:
Add a (failing) test for bug 111127
-------------- next part --------------
Diff too large for email (2330 lines, the limit is 1000).
More information about the bazaar-commits
mailing list