Rev 979: Merge 0.4. in file:///data/jelmer/bzr-svn/layout/
Jelmer Vernooij
jelmer at samba.org
Tue Mar 25 00:14:51 GMT 2008
At file:///data/jelmer/bzr-svn/layout/
------------------------------------------------------------
revno: 979
revision-id: jelmer at samba.org-20080325001447-r6r603657u1z64b5
parent: jelmer at samba.org-20080325001434-31may4n43ac656vh
parent: jelmer at samba.org-20080325000226-d8m40yxz3pcpjstq
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: layout
timestamp: Tue 2008-03-25 01:14:47 +0100
message:
Merge 0.4.
added:
tests/test_graph.py test_graph.py-20080323225749-eyw94e0k0lje6a3g-1
modified:
COPYING COPYING-20060516183744-c9cf734586074d2d
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
cache.py cache.py-20070520185908-qbtlcet08bllgs0f-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
graph.py graph.py-20080323011903-mbq10fze4gy0d7tl-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
remote.py format.py-20060406233823-b6fa009fe35dfde7
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
revspec.py revspec.py-20071106211507-q4fz2en91yrmjjl8-1
scheme.py scheme.py-20060516195850-95181aae6b272f9e
setup.py setup.py-20060502115218-86950492da22353f
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_branchprops.py test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
tests/test_checkout.py test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_config.py test_config.py-20070624193244-itvnst60evjidr4z-1
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_errors.py test_errors.py-20070129114605-ban03f32t6ja14ez-1
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
tests/test_transport.py test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
tests/test_tree.py test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
tests/test_upgrade.py test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 974.1.51
revision-id: jelmer at samba.org-20080325000226-d8m40yxz3pcpjstq
parent: jelmer at samba.org-20080324231110-157o536acqwtpjaj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2008-03-25 01:02:26 +0100
message:
Add new append-revisions-only'' option with similar behaviour as in standard bzr formats.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
tests/test_config.py test_config.py-20070624193244-itvnst60evjidr4z-1
------------------------------------------------------------
revno: 974.1.50
revision-id: jelmer at samba.org-20080324231110-157o536acqwtpjaj
parent: jelmer at samba.org-20080324174004-bzwepzj5x1tf59am
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2008-03-25 00:11:10 +0100
message:
Remove revision number cache.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
------------------------------------------------------------
revno: 974.1.49
revision-id: jelmer at samba.org-20080324174004-bzwepzj5x1tf59am
parent: jelmer at samba.org-20080324045230-io4g1m998tniq3ho
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-03-24 18:40:04 +0100
message:
Remove duplicate definition of CachingParentsProvider.
modified:
graph.py graph.py-20080323011903-mbq10fze4gy0d7tl-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 974.1.48
revision-id: jelmer at samba.org-20080324045230-io4g1m998tniq3ho
parent: jelmer at samba.org-20080324043225-1qffs2e1myj76bn1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-03-24 05:52:30 +0100
message:
Switch license to GPLv3 or later.
modified:
COPYING COPYING-20060516183744-c9cf734586074d2d
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
cache.py cache.py-20070520185908-qbtlcet08bllgs0f-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
remote.py format.py-20060406233823-b6fa009fe35dfde7
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
revspec.py revspec.py-20071106211507-q4fz2en91yrmjjl8-1
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_branchprops.py test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
tests/test_checkout.py test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_config.py test_config.py-20070624193244-itvnst60evjidr4z-1
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_errors.py test_errors.py-20070129114605-ban03f32t6ja14ez-1
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
tests/test_transport.py test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
tests/test_tree.py test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
tests/test_upgrade.py test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
upgrade.py upgrade.py-20070106192108-0rakplee2lzah4gs-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 974.1.47
revision-id: jelmer at samba.org-20080324043225-1qffs2e1myj76bn1
parent: jelmer at samba.org-20080324025155-k9l4cghp1dlb21nd
parent: jelmer at samba.org-20080324041102-i63thjooa5mbmlvh
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-03-24 05:32:25 +0100
message:
merge 0.4.9.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
setup.py setup.py-20060502115218-86950492da22353f
------------------------------------------------------------
revno: 974.2.2
tags: bzr-svn-0.4.9
revision-id: jelmer at samba.org-20080324041102-i63thjooa5mbmlvh
parent: jelmer at samba.org-20080323174720-yinp9cti85ldw0dk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.9
timestamp: Mon 2008-03-24 05:11:02 +0100
message:
Change assertions to warnings to help older bzr-svn users.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
------------------------------------------------------------
revno: 974.2.1
revision-id: jelmer at samba.org-20080323174720-yinp9cti85ldw0dk
parent: jelmer at samba.org-20080323170835-8453f9hy2hnbgl5q
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.9
timestamp: Sun 2008-03-23 18:47:20 +0100
message:
Start working on final 0.4.9.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 974.1.46
revision-id: jelmer at samba.org-20080324025155-k9l4cghp1dlb21nd
parent: jelmer at samba.org-20080324015800-71h0sbtq6566kb4a
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-03-24 03:51:55 +0100
message:
Allow more granularity over what svn properties can be overridden.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
tests/test_config.py test_config.py-20070624193244-itvnst60evjidr4z-1
------------------------------------------------------------
revno: 974.1.45
revision-id: jelmer at samba.org-20080324015800-71h0sbtq6566kb4a
parent: jelmer at samba.org-20080324012410-5lgmyxmfu3r5lcf4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-03-24 02:58:00 +0100
message:
Fix test to match new behaviour.
modified:
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
------------------------------------------------------------
revno: 974.1.44
revision-id: jelmer at samba.org-20080324012410-5lgmyxmfu3r5lcf4
parent: jelmer at samba.org-20080324011219-0zffk64p7gpva9o2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-03-24 02:24:10 +0100
message:
Add log-strip-trailing-newline option.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
tests/test_config.py test_config.py-20070624193244-itvnst60evjidr4z-1
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
------------------------------------------------------------
revno: 974.1.43
revision-id: jelmer at samba.org-20080324011219-0zffk64p7gpva9o2
parent: jelmer at samba.org-20080324002516-wja7xsgkk29246se
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-03-24 02:12:19 +0100
message:
Allow exporting the commit message from a mapping.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
------------------------------------------------------------
revno: 974.1.42
revision-id: jelmer at samba.org-20080324002516-wja7xsgkk29246se
parent: jelmer at samba.org-20080323235330-vnkxg7p9wm3kv6mh
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-03-24 01:25:16 +0100
message:
Avoid special-casing revision 0.
modified:
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
------------------------------------------------------------
revno: 974.1.41
revision-id: jelmer at samba.org-20080323235330-vnkxg7p9wm3kv6mh
parent: jelmer at samba.org-20080323231203-qnlk2lsprcr75mrq
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-03-24 00:53:30 +0100
message:
Avoid using get_revision_paths().
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 974.1.40
revision-id: jelmer at samba.org-20080323231203-qnlk2lsprcr75mrq
parent: jelmer at samba.org-20080323230914-xy9i25spznwhxxja
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-03-24 00:12:03 +0100
message:
Don't enable rhs fetching by default.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
------------------------------------------------------------
revno: 974.1.39
revision-id: jelmer at samba.org-20080323230914-xy9i25spznwhxxja
parent: jelmer at samba.org-20080323224550-nvq0lnq9xaoqmmn3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-03-24 00:09:14 +0100
message:
Add tests for graph code.
added:
tests/test_graph.py test_graph.py-20080323225749-eyw94e0k0lje6a3g-1
modified:
graph.py graph.py-20080323011903-mbq10fze4gy0d7tl-1
------------------------------------------------------------
revno: 974.1.38
revision-id: jelmer at samba.org-20080323224550-nvq0lnq9xaoqmmn3
parent: jelmer at samba.org-20080323220734-okj7avhvl2hec3u8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-03-23 23:45:50 +0100
message:
Implement CachingParentsProvider that implements get_lhs_parent.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
graph.py graph.py-20080323011903-mbq10fze4gy0d7tl-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 974.1.37
revision-id: jelmer at samba.org-20080323220734-okj7avhvl2hec3u8
parent: jelmer at samba.org-20080323220459-h05sx5wa0r7ocact
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-03-23 23:07:34 +0100
message:
Fetch right hand side parents in fetch.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
------------------------------------------------------------
revno: 974.1.36
revision-id: jelmer at samba.org-20080323220459-h05sx5wa0r7ocact
parent: jelmer at samba.org-20080323213443-6nul6pti2ug8dfru
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-03-23 23:04:59 +0100
message:
implement newer get_parent_map rather than get_parents.
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 974.1.35
revision-id: jelmer at samba.org-20080323213443-6nul6pti2ug8dfru
parent: jelmer at samba.org-20080323175343-94wjwf8bj4yu0iy0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-03-23 22:34:43 +0100
message:
Work around a bug trying to open nonexistant branches.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
------------------------------------------------------------
revno: 974.1.34
revision-id: jelmer at samba.org-20080323175343-94wjwf8bj4yu0iy0
parent: jelmer at samba.org-20080323173316-bjoa629dslzarekh
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-03-23 18:53:43 +0100
message:
Move iter_lhs_ancestry function to graph object.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
graph.py graph.py-20080323011903-mbq10fze4gy0d7tl-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 974.1.33
revision-id: jelmer at samba.org-20080323173316-bjoa629dslzarekh
parent: jelmer at samba.org-20080323170835-8453f9hy2hnbgl5q
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-03-23 18:33:16 +0100
message:
Track actual latest revnum (that changed the branch).
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
------------------------------------------------------------
revno: 974.1.32
revision-id: jelmer at samba.org-20080323170835-8453f9hy2hnbgl5q
parent: jelmer at samba.org-20080323170810-sfnwgm2gpf4yqk9t
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-03-23 18:08:35 +0100
message:
Fix typo
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
------------------------------------------------------------
revno: 974.1.31
revision-id: jelmer at samba.org-20080323170810-sfnwgm2gpf4yqk9t
parent: jelmer at samba.org-20080323170014-cojzhr2xaxo18922
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-03-23 18:08:10 +0100
message:
Add ability to mutter about cache use.
modified:
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
------------------------------------------------------------
revno: 974.1.30
revision-id: jelmer at samba.org-20080323170014-cojzhr2xaxo18922
parent: jelmer at samba.org-20080323164658-6l8iat7cdlz2kuf1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-03-23 18:00:14 +0100
message:
Specify serializer in only one place.
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
Diff too large for email (2668 lines, the limit is 1000).
More information about the bazaar-commits
mailing list