Rev 951: Merge 0.4. in file:///data/jelmer/bzr-svn/revisionloader/
Jelmer Vernooij
jelmer at samba.org
Sat Mar 22 00:19:23 GMT 2008
At file:///data/jelmer/bzr-svn/revisionloader/
------------------------------------------------------------
revno: 951
revision-id: jelmer at samba.org-20080322001921-n16l7gpbv0r3npam
parent: jelmer at samba.org-20080318195429-npub72gcqzs6xqfb
parent: jelmer at samba.org-20080321233545-o06rh49csiw8k1pg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: revisionloader
timestamp: Sat 2008-03-22 01:19:21 +0100
message:
Merge 0.4.
modified:
AUTHORS AUTHORS-20060508114718-4c90c0062645106d
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
scheme.py scheme.py-20060516195850-95181aae6b272f9e
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 948.1.24
revision-id: jelmer at samba.org-20080321233545-o06rh49csiw8k1pg
parent: jelmer at samba.org-20080321233322-c4eihjtm4tz8jtj2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-03-22 00:35:45 +0100
message:
Fix typo.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
------------------------------------------------------------
revno: 948.1.23
revision-id: jelmer at samba.org-20080321233322-c4eihjtm4tz8jtj2
parent: jelmer at samba.org-20080321233029-wethm3d2vg2pf920
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-03-22 00:33:22 +0100
message:
Print invalid property name.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
------------------------------------------------------------
revno: 948.1.22
revision-id: jelmer at samba.org-20080321233029-wethm3d2vg2pf920
parent: jelmer at samba.org-20080321224326-k9fj54i1gc2ugmhw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-03-22 00:30:29 +0100
message:
Fix tests.
modified:
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 948.1.21
revision-id: jelmer at samba.org-20080321224326-k9fj54i1gc2ugmhw
parent: jelmer at samba.org-20080321224148-xg8qm2xcml0fm6wp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 23:43:26 +0100
message:
Allow more characters.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
------------------------------------------------------------
revno: 948.1.20
revision-id: jelmer at samba.org-20080321224148-xg8qm2xcml0fm6wp
parent: jelmer at samba.org-20080321203334-sk393a080u8a424w
parent: jelmer at samba.org-20080321220845-v50bgo6bywij8x1e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 23:41:48 +0100
message:
merge 0.4.8.
modified:
AUTHORS AUTHORS-20060508114718-4c90c0062645106d
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
NEWS news-20061231030336-h9fhq245ie0de8bs-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
------------------------------------------------------------
revno: 878.1.39
tags: bzr-svn-0.4.8
revision-id: jelmer at samba.org-20080321220845-v50bgo6bywij8x1e
parent: jelmer at samba.org-20080321212852-cryaibyigqibtjam
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 23:08:45 +0100
message:
Fix remaining tests.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 878.1.38
revision-id: jelmer at samba.org-20080321212852-cryaibyigqibtjam
parent: jelmer at samba.org-20080321203943-7c1auf0uprfpyqul
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 22:28:52 +0100
message:
Fix more tests.
modified:
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_revids.py test_revids.py-20070516230044-d7x872cqi7xb4eow-1
------------------------------------------------------------
revno: 878.1.37
revision-id: jelmer at samba.org-20080321203943-7c1auf0uprfpyqul
parent: jelmer at samba.org-20080321203707-c85mtyl2tab4axkx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 21:39:43 +0100
message:
Merge another test fix.
modified:
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 878.1.36
revision-id: jelmer at samba.org-20080321203707-c85mtyl2tab4axkx
parent: jelmer at samba.org-20080321135611-opp27hno5n3gabt8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 21:37:07 +0100
message:
Merge 0.4.
modified:
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 878.1.35
revision-id: jelmer at samba.org-20080321135611-opp27hno5n3gabt8
parent: jelmer at samba.org-20080321131049-ywoyv74pwlskq257
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 14:56:11 +0100
message:
Return tuples in parent determine functions.
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 878.1.34
revision-id: jelmer at samba.org-20080321131049-ywoyv74pwlskq257
parent: jelmer at samba.org-20080312190445-3ba6xgya7m0nzvz2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Fri 2008-03-21 14:10:49 +0100
message:
Cherrypick test symlink improvement.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 878.1.33
revision-id: jelmer at samba.org-20080312190445-3ba6xgya7m0nzvz2
parent: jelmer at samba.org-20080312165346-0nj31c5lv6a7nchi
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Wed 2008-03-12 20:04:45 +0100
message:
Deal with newer versions of bzr passing in unicode strings.
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 878.1.32
revision-id: jelmer at samba.org-20080312165346-0nj31c5lv6a7nchi
parent: jelmer at samba.org-20080312164804-579nv50cj019ehs4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Wed 2008-03-12 17:53:46 +0100
message:
Fix line wrapping
modified:
AUTHORS AUTHORS-20060508114718-4c90c0062645106d
------------------------------------------------------------
revno: 878.1.31
revision-id: jelmer at samba.org-20080312164804-579nv50cj019ehs4
parent: jelmer at samba.org-20080312161205-d9d1lj8ljvjmilf9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Wed 2008-03-12 17:48:04 +0100
message:
Add bug #
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
------------------------------------------------------------
revno: 878.1.30
revision-id: jelmer at samba.org-20080312161205-d9d1lj8ljvjmilf9
parent: jelmer at samba.org-20080312151424-slxtuacqbs0c6ods
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Wed 2008-03-12 17:12:05 +0100
message:
Allow overriding tests to run.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
------------------------------------------------------------
revno: 878.1.29
revision-id: jelmer at samba.org-20080312151424-slxtuacqbs0c6ods
parent: jelmer at samba.org-20080311200056-aiwgs3z6grrfzyrk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4.8
timestamp: Wed 2008-03-12 16:14:24 +0100
message:
Cherrypick some formatting fixes from the 0.4 branch
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
auth.py auth.py-20071209174622-w8d42k6nm5yhxvi8-1
cache.py cache.py-20070520185908-qbtlcet08bllgs0f-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
------------------------------------------------------------
revno: 948.1.19
revision-id: jelmer at samba.org-20080321203334-sk393a080u8a424w
parent: jelmer at samba.org-20080321200216-f02az3w8p2tyuw27
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 21:33:34 +0100
message:
Fix another test.
modified:
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 948.1.18
revision-id: jelmer at samba.org-20080321200216-f02az3w8p2tyuw27
parent: jelmer at samba.org-20080321185710-2t0sfckz99oygfr8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 21:02:16 +0100
message:
Fix bug in the mapping code.
modified:
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 948.1.17
revision-id: jelmer at samba.org-20080321185710-2t0sfckz99oygfr8
parent: jelmer at samba.org-20080321183614-t84oj8ncv2qssjwm
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 19:57:10 +0100
message:
Change get_revision_graph() to behave the same way as the bzrlib implementation.
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 948.1.16
revision-id: jelmer at samba.org-20080321183614-t84oj8ncv2qssjwm
parent: jelmer at samba.org-20080321172256-mpww0zst86b0lp2i
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 19:36:14 +0100
message:
Split caching layer out of file id map code.
modified:
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
------------------------------------------------------------
revno: 948.1.15
revision-id: jelmer at samba.org-20080321172256-mpww0zst86b0lp2i
parent: jelmer at samba.org-20080321171421-hn9kb2ykx44spe7n
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 18:22:56 +0100
message:
use full branch property list functions rather than doing single property queries.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 948.1.14
revision-id: jelmer at samba.org-20080321171421-hn9kb2ykx44spe7n
parent: jelmer at samba.org-20080321163739-g4ud3ipvuxdnbnil
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 18:14:21 +0100
message:
Fix get_revision_graph() tests.
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 948.1.13
revision-id: jelmer at samba.org-20080321163739-g4ud3ipvuxdnbnil
parent: jelmer at samba.org-20080321160952-ld57yla8mx7sgpc1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 17:37:39 +0100
message:
--prefix is now determined from the specified url in svn-import.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
------------------------------------------------------------
revno: 948.1.12
revision-id: jelmer at samba.org-20080321160952-ld57yla8mx7sgpc1
parent: jelmer at samba.org-20080321150137-mk2q5ehxvyf1wo2c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 17:09:52 +0100
message:
Change get_ancestry() to use get_graph().
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
------------------------------------------------------------
revno: 948.1.11
revision-id: jelmer at samba.org-20080321150137-mk2q5ehxvyf1wo2c
parent: jelmer at samba.org-20080321143829-60v1ksle4ub32y0z
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 16:01:37 +0100
message:
Reimplement get_revision_graph() using get_graph().
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
------------------------------------------------------------
revno: 948.1.10
revision-id: jelmer at samba.org-20080321143829-60v1ksle4ub32y0z
parent: jelmer at samba.org-20080321130751-90h9dt4wbtwbh7s9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 15:38:29 +0100
message:
Avoid property lookup when getting revision information.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 948.1.9
revision-id: jelmer at samba.org-20080321130751-90h9dt4wbtwbh7s9
parent: jelmer at samba.org-20080321031902-tx2f9kddff5gvoe6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 14:07:51 +0100
message:
Fix test run symlinks.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
------------------------------------------------------------
revno: 948.1.8
revision-id: jelmer at samba.org-20080321031902-tx2f9kddff5gvoe6
parent: jelmer at samba.org-20080321023621-rwdv5acu9j0n6f5s
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 04:19:02 +0100
message:
Fix bug in prop.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
scheme.py scheme.py-20060516195850-95181aae6b272f9e
------------------------------------------------------------
revno: 948.1.7
revision-id: jelmer at samba.org-20080321023621-rwdv5acu9j0n6f5s
parent: jelmer at samba.org-20080321011504-76ycbcwvsmlpwt1q
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 03:36:21 +0100
message:
Add functions for unescaping/escaping strings for use in property names.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
scheme.py scheme.py-20060516195850-95181aae6b272f9e
------------------------------------------------------------
revno: 948.1.6
revision-id: jelmer at samba.org-20080321011504-76ycbcwvsmlpwt1q
parent: jelmer at samba.org-20080318194550-jea4hwu2jqshsq9c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-03-21 02:15:04 +0100
message:
Debug file property.
modified:
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
Diff too large for email (1038 lines, the limit is 1000).
More information about the bazaar-commits
mailing list