Rev 2149: Merge from bzr.dev. Breaks a few tests because there are new methods not yet implemented. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/
Andrew Bennetts
andrew.bennetts at canonical.com
Thu Mar 1 05:30:39 GMT 2007
At sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/
------------------------------------------------------------
revno: 2149
revision-id: andrew.bennetts at canonical.com-20070301050832-rf5egucjf7uypta5
parent: andrew.bennetts at canonical.com-20070301023318-yz01arzlhgmgnz7g
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-03-01 16:08:32 +1100
message:
Merge from bzr.dev. Breaks a few tests because there are new methods not yet implemented.
added:
bzrlib/repofmt/__init__.py __init__.py-20070206060649-j4kznrq6xkjmy092-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
bzrlib/tests/test_https_ca_bundle.py test_https_ca_bundle-20070226095439-x5899kvqg7xsbk8e-1
bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cache_utf8.py cache_utf8.py-20060810004311-x4cph46la06h9azm-1
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/generate_ids.py generate_ids.py-20061102205935-z3do15ipw6m7v26u-1
bzrlib/identitymap.py identitymap.py-20051007040721-83e837d831a6636a
bzrlib/inter.py inter.py-20060302012326-a57300cb382c618f
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/shellcomplete.py shellcomplete.py-20050822153127-3be115ff5e70fc39
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_cache_utf8.py test_cache_utf8.py-20060810004311-x4cph46la06h9azm-2
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_generate_ids.py test_generate_ids.py-20061102205935-z3do15ipw6m7v26u-2
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/test_get_parent_ids.py test_get_parent_ids.py-20060616123734-jq0zc755ud2u644s-1
bzrlib/tests/workingtree_implementations/test_set_root_id.py test_set_root_id.py-20061004073850-0r1c7qikmnkb8m9k-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26
merged: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
parent: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: john at arbash-meinel.com-20070228151923-1s7oa2i2kk9u9ufo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-28 21:10:48 +0000
message:
(James Westby) Allow passing a template message to commit.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.25.1.1
merged: john at arbash-meinel.com-20070228151923-1s7oa2i2kk9u9ufo
parent: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: jw+debian at jameswestby.net-20070226214805-umfrbzkqnvvrna64
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-02-28 09:19:23 -0600
message:
[merge] James Westby allow passing a default message to commit
Also clean up NEWS a bit to reduce conflicts and conform to rST.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.3.4
merged: jw+debian at jameswestby.net-20070226214805-umfrbzkqnvvrna64
parent: jw+debian at jameswestby.net-20070205235821-09fbu7wbof8xc9k8
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Mon 2007-02-26 21:48:05 +0000
message:
Make the handling of the msgfile more sane.
* Close it in a finally block for more safety.
* Open it at the start and just write to it instead of building up the
message.
* Don't close the fileno from mkstemp, just convert it to a filehandle
straight away.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.3.3
merged: jw+debian at jameswestby.net-20070205235821-09fbu7wbof8xc9k8
parent: jw+debian at jameswestby.net-20070204215850-64v3uwm4lc906nyy
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Mon 2007-02-05 23:58:21 +0000
message:
Refactor again from John and Alexander's comments.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.3.2
merged: jw+debian at jameswestby.net-20070204215850-64v3uwm4lc906nyy
parent: jw+debian at jameswestby.net-20070203135827-15twzpv89r1uygks
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Sun 2007-02-04 21:58:50 +0000
message:
Allow an empty start message.
Following comments from Robert the start_message is now allowed to be empty.
The tests are also split out more.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.3.1
merged: jw+debian at jameswestby.net-20070203135827-15twzpv89r1uygks
parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.editmsg
timestamp: Sat 2007-02-03 13:58:27 +0000
message:
Add a way to specify a template commit message.
Add start_message to the edit_commit_message function. This adds the text
above the separator so that it will not be removed after the user has edited.
Allows a template commit message to be specified. It however does nothing to
make it easy to actually hook in and set that.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.25
merged: pqm at pqm.ubuntu.com-20070228065654-50cafaf8459ede53
parent: pqm at pqm.ubuntu.com-20070227220846-8cce3b2986915092
parent: bialix at ukr.net-20070227221207-icy06420x3b0ceyf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-28 06:56:54 +0000
message:
(biaklix) bzr init works with non-ascii location (#85599)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.2.2
merged: bialix at ukr.net-20070227221207-icy06420x3b0ceyf
parent: bialix at ukr.net-20070217071147-pc4zm6d4rc8zqv77
parent: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: init.non.ascii
timestamp: Wed 2007-02-28 00:12:07 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.2.1
merged: bialix at ukr.net-20070217071147-pc4zm6d4rc8zqv77
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: init.non.ascii
timestamp: Sat 2007-02-17 09:11:47 +0200
message:
Bugfix #85599: ``bzr init`` works with unicode argument LOCATION
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.24
merged: pqm at pqm.ubuntu.com-20070227220846-8cce3b2986915092
parent: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
parent: v.ladeuil+lp at free.fr-20070110023240-m844hew538cwg618
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 22:08:46 +0000
message:
Capitalize rocks output
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.77.4.1
merged: v.ladeuil+lp at free.fr-20070110023240-m844hew538cwg618
parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
committer: v.ladeuil+lp at free.fr
branch nick: bzr.78026
timestamp: Wed 2007-01-10 03:32:40 +0100
message:
Fix #78026.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.23
merged: pqm at pqm.ubuntu.com-20070227210131-478bc8c5f83bd5dc
parent: pqm at pqm.ubuntu.com-20070227040724-41ae309eb90f4744
parent: bialix at ukr.net-20070227065737-yoon57v79cgycto6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 21:01:31 +0000
message:
(bialix) Searching CA bundle for PyCurl in env variable, and on win32
along the path
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.19.5.3
merged: bialix at ukr.net-20070227065737-yoon57v79cgycto6
parent: bialix at ukr.net-20070226202808-9t3wvwmh172lw6br
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Tue 2007-02-27 08:57:37 +0200
message:
added comment about excluding cwd from PATH
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.19.5.2
merged: bialix at ukr.net-20070226202808-9t3wvwmh172lw6br
parent: bialix at ukr.net-20070226100258-weo9uj2qnf35icxp
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Mon 2007-02-26 22:28:08 +0200
message:
Don't look in cwd for CA bundle (note from John)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.19.5.1
merged: bialix at ukr.net-20070226100258-weo9uj2qnf35icxp
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: ca-bundle
timestamp: Mon 2007-02-26 12:02:58 +0200
message:
Bugfix #82086: Searching location of CA bundle for PyCurl in env variable (CURL_CA_BUNDLE), and on win32 along the PATH
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.22
merged: pqm at pqm.ubuntu.com-20070227040724-41ae309eb90f4744
parent: pqm at pqm.ubuntu.com-20070226201622-2f1d97a573b34d44
parent: andrew.bennetts at canonical.com-20070227022050-mop4cp2f5gf3bx9t
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-27 04:07:24 +0000
message:
(andrew,r=mbp,r=john) bzr:// defaults to port 4155
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.19.4.3
merged: andrew.bennetts at canonical.com-20070227022050-mop4cp2f5gf3bx9t
parent: andrew.bennetts at canonical.com-20070227004247-ow9tmwdw9lufkhi6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Tue 2007-02-27 13:20:50 +1100
message:
Use a BZR_DEFAULT_PORT constant instead of bare 4155.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.19.4.2
merged: andrew.bennetts at canonical.com-20070227004247-ow9tmwdw9lufkhi6
parent: andrew.bennetts at canonical.com-20070226092026-d56e1sqtimfkd5zt
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Tue 2007-02-27 11:42:47 +1100
message:
Add NEWS entry.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.19.4.1
merged: andrew.bennetts at canonical.com-20070226092026-d56e1sqtimfkd5zt
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: default-port
timestamp: Mon 2007-02-26 20:20:26 +1100
message:
Give bzr:// a default port of 4155.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.21
merged: pqm at pqm.ubuntu.com-20070226201622-2f1d97a573b34d44
parent: pqm at pqm.ubuntu.com-20070226085224-84d4ff0445f116f8
parent: john at arbash-meinel.com-20070226183328-v83bgfqwxlwp6kem
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-02-26 20:16:22 +0000
message:
(Jonathan Lange) Change the import order for plugins, to prefer user dirs.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.19.2.1
merged: john at arbash-meinel.com-20070226183328-v83bgfqwxlwp6kem
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: jml at canonical.com-20070223060654-hna3q6wwljswnkh3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-02-26 12:33:28 -0600
message:
(Jonathan Lange) Change the import order for plugins, to prefer user dirs.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.19.3.1
merged: jml at canonical.com-20070223060654-hna3q6wwljswnkh3
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: jml at canonical.com
branch nick: bzr.plugin-path
timestamp: Fri 2007-02-23 17:06:54 +1100
message:
Make set_plugins_path search user-specified directories (BZR_PLUGIN_PATH
or get_default_plugin_path()) before searching in site-wide directories
(dirname(bzrlib.plugins.__file__)).
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.20
merged: pqm at pqm.ubuntu.com-20070226085224-84d4ff0445f116f8
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-02-26 08:52:24 +0000
message:
(mbp,r=aaron) tests for merge_modified
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.19.1.1
merged: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2007-02-26 15:40:16 +1100
message:
Add test for merge_modified
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.19
merged: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
parent: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
parent: john at arbash-meinel.com-20070222142819-7f57k9v54ni12i18
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-22 14:45:05 +0000
message:
(John Arbash Meinel, r=robert) Update apis to expect UTF-8 file ids instead of Unicode
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.1.11
merged: john at arbash-meinel.com-20070222142819-7f57k9v54ni12i18
parent: john at arbash-meinel.com-20070218002224-nfsw9ubivr178ahn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Thu 2007-02-22 08:28:19 -0600
message:
Update NEWS to indicate file-ids are also utf-8 strings
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.1.10
merged: john at arbash-meinel.com-20070218002224-nfsw9ubivr178ahn
parent: john at arbash-meinel.com-20070217222537-p0hxseinc3x84e96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 18:22:24 -0600
message:
Switch all apis over to utf8 file ids. All tests pass
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.1.9
merged: john at arbash-meinel.com-20070217222537-p0hxseinc3x84e96
parent: john at arbash-meinel.com-20070217221226-op8ol98ngy4219fd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 16:25:37 -0600
message:
Minor performance improvement, use None as signal rather than ROOT_ID
for xml5 inventories. Discover small bug in serialized text because of this.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.1.8
merged: john at arbash-meinel.com-20070217221226-op8ol98ngy4219fd
parent: john at arbash-meinel.com-20070217220308-1zol1ee5a0stse1u
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 16:12:26 -0600
message:
Fix one doc test in Inventory which expected a plain str
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.1.7
merged: john at arbash-meinel.com-20070217220308-1zol1ee5a0stse1u
parent: john at arbash-meinel.com-20070217215417-fpufrf0o749ce85d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 16:03:08 -0600
message:
Add tests for parent ids in test_test_trees
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.1.6
merged: john at arbash-meinel.com-20070217215417-fpufrf0o749ce85d
parent: john at arbash-meinel.com-20070217214837-fcv01ahawwq8u687
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:54:17 -0600
message:
Include parent_id checks in the xml serializer tests.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.1.5
merged: john at arbash-meinel.com-20070217214837-fcv01ahawwq8u687
parent: john at arbash-meinel.com-20070217211722-yxx3xjxtxeijc8d7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:48:37 -0600
message:
Fix Inventory.iter_entries_by_dir to return Unicode paths,
update xml5 serializer tests to ensure that we get unicode paths and file ids
and utf8 revision ids.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.1.4
merged: john at arbash-meinel.com-20070217211722-yxx3xjxtxeijc8d7
parent: john at arbash-meinel.com-20070217211255-kzskwwv9rukq6r7r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:17:22 -0600
message:
Add safe_file_id as a helper in osutils.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.1.3
merged: john at arbash-meinel.com-20070217211255-kzskwwv9rukq6r7r
parent: john at arbash-meinel.com-20070217185558-mhsvsed3azztcuez
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 15:12:55 -0600
message:
Make sure the inventory enrtries returned are properly formed.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.1.2
merged: john at arbash-meinel.com-20070217185558-mhsvsed3azztcuez
parent: john at arbash-meinel.com-20070217172506-ps0riemt041fkz0q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 12:55:58 -0600
message:
Track down and add tests that all tree.commit() can handle
non-ascii revision ids, as well as that file_ids_affected_by can handle
non-ascii revision ids. Also track down pending-merges needing to
write byte streams rather than unicode.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15.1.1
merged: john at arbash-meinel.com-20070217172506-ps0riemt041fkz0q
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: utf8_file_ids
timestamp: Sat 2007-02-17 11:25:06 -0600
message:
Track down some non-ascii deficiencies in commit logic.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.18
merged: pqm at pqm.ubuntu.com-20070221200818-3edf47a2bd3f472b
parent: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
parent: mbp at sourcefrog.net-20070221075917-aum4hz1p7nirak7l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-21 20:08:18 +0000
message:
(mbp,r=robert,trivial) make status blackbox tests pass on wide terminals
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.17.1.1
merged: mbp at sourcefrog.net-20070221075917-aum4hz1p7nirak7l
parent: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2007-02-21 18:59:17 +1100
message:
Make tests for truncation of status output more robust on wide terminals.
(Relates to bug #56011)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.17
merged: pqm at pqm.ubuntu.com-20070220091037-861977f648914cc0
parent: pqm at pqm.ubuntu.com-20070218185039-b5d56cdea8765e63
parent: mbp at sourcefrog.net-20070220071627-b21ex5e2rm6dvp7b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-20 09:10:37 +0000
message:
(mbp,r=alexander) flush log before exiting
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.16.1.1
merged: mbp at sourcefrog.net-20070220071627-b21ex5e2rm6dvp7b
parent: pqm at pqm.ubuntu.com-20070218185039-b5d56cdea8765e63
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: osexit
timestamp: Tue 2007-02-20 18:16:27 +1100
message:
Flush trace file before doing os._exit.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.16
merged: pqm at pqm.ubuntu.com-20070218185039-b5d56cdea8765e63
parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
parent: bialix at ukr.net-20070215222448-g4viotfpx1b8h98a
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-02-18 18:50:39 +0000
message:
(Matthias Rahlf, Alexander Belchenko) human readable error message
for 'bzr add .bzr/'
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.6.1
merged: bialix at ukr.net-20070215222448-g4viotfpx1b8h98a
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
parent: rahlf at fs.tum.de-20070213031637-23eekp1wawcskcdx
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: add.dot.bzr
timestamp: Fri 2007-02-16 00:24:48 +0200
message:
Instead of __str__ method for FastPath object we use .raw_path attribute (note from Aaron).
Also slightly reworked test.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.7.1
merged: rahlf at fs.tum.de-20070213031637-23eekp1wawcskcdx
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: Matthias Rahlf <rahlf at fs.tum.de>
branch nick: bzr.dev.fastpath
timestamp: Tue 2007-02-13 04:16:37 +0100
message:
FastPath objects can now be printed nicely
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.15
merged: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
parent: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
parent: john at arbash-meinel.com-20070217023632-ad2nt50u1oal2ji0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-02-17 02:58:22 +0000
message:
(John Arbash Meinel) Clean up most internals to use utf-8 revision ids instead of Unicode.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.20
merged: john at arbash-meinel.com-20070217023632-ad2nt50u1oal2ji0
parent: john at arbash-meinel.com-20070217023345-vhrz7igv9q7kd762
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 20:36:32 -0600
message:
Add NEWS entry about utf8 revision ids.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.19
merged: john at arbash-meinel.com-20070217023345-vhrz7igv9q7kd762
parent: john at arbash-meinel.com-20070217020241-cy6wl3oa17mvnvax
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 20:33:45 -0600
message:
Track through the new Branch6 code, and make sure revision ids are utf8
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.18
merged: john at arbash-meinel.com-20070217020241-cy6wl3oa17mvnvax
parent: john at arbash-meinel.com-20070217014257-3chgn02femptf4co
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 20:02:41 -0600
message:
Add tests for iter_reverse_revision_history
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.17
merged: john at arbash-meinel.com-20070217014257-3chgn02femptf4co
parent: john at arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
parent: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-16 19:42:57 -0600
message:
[merge] bzr.dev 2293 and resolve conflicts, but still broken
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.16
merged: john at arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
parent: john at arbash-meinel.com-20070213133816-r6swt6ibvtms473f
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Tue 2007-02-13 14:33:57 -0600
message:
[merge] bzr.dev 2283
resolve conflicts in moved repository formats
small issue with osutils.contains_whitespace()
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.15
merged: john at arbash-meinel.com-20070213133816-r6swt6ibvtms473f
parent: john at arbash-meinel.com-20070210170218-6qxxiywltp0uawzw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Tue 2007-02-13 07:38:16 -0600
message:
remove get_cached_utf8 checks which were slowing things down.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.14
merged: john at arbash-meinel.com-20070210170218-6qxxiywltp0uawzw
parent: john at arbash-meinel.com-20070210165429-xbz7zv9ehhi6fspj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Sat 2007-02-10 11:02:18 -0600
message:
Add some tests that generate_ids.get_revision_id() generates ascii revision ids
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.13
merged: john at arbash-meinel.com-20070210165429-xbz7zv9ehhi6fspj
parent: john at arbash-meinel.com-20070210024843-oz2ed16luwjca48h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Sat 2007-02-10 10:54:29 -0600
message:
Finish auditing Repository, and fix generate_ids to always generate utf8 ids.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.12
merged: john at arbash-meinel.com-20070210024843-oz2ed16luwjca48h
parent: john at arbash-meinel.com-20070209233924-k7qbjpta67k3ry2h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 20:48:43 -0600
message:
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
Get tests to pass again.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.11
merged: john at arbash-meinel.com-20070209233924-k7qbjpta67k3ry2h
parent: john at arbash-meinel.com-20070209231553-9ywoxs2t3dsx667s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 17:39:24 -0600
message:
Audit Branch to ensure utf8 revision ids.
Requires a small update to lockable_files to allow us to directly
write byte strings, without needing to wrap in a StringIO
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.10
merged: john at arbash-meinel.com-20070209231553-9ywoxs2t3dsx667s
parent: john at arbash-meinel.com-20070209181144-3cxnt3e4jre3e317
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 17:15:53 -0600
message:
Make sure xml5 can handle unicode or utf8 strings
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.9
merged: john at arbash-meinel.com-20070209181144-3cxnt3e4jre3e317
parent: john at arbash-meinel.com-20070209175018-pv9ok1ocbchn4wly
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 12:11:44 -0600
message:
Update WorkingTree to use safe_revision_id when appropriate
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.8
merged: john at arbash-meinel.com-20070209175018-pv9ok1ocbchn4wly
parent: john at arbash-meinel.com-20070209172423-xu5e0b12sf71m0pj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:50:18 -0600
message:
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.7
merged: john at arbash-meinel.com-20070209172423-xu5e0b12sf71m0pj
parent: john at arbash-meinel.com-20070209171626-x3gg6hgainzs91sj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:24:23 -0600
message:
Make sure WorkingTree revision_ids are also returned as utf8 strings
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.6
merged: john at arbash-meinel.com-20070209171626-x3gg6hgainzs91sj
parent: john at arbash-meinel.com-20070209171556-sxv0wiwdubivwmnn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:16:26 -0600
message:
Make sure Branch.revision_history() also works in utf-8 revision ids.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.5
merged: john at arbash-meinel.com-20070209171556-sxv0wiwdubivwmnn
parent: john at arbash-meinel.com-20070209164831-w5kk2hhyoprze3fb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 11:15:56 -0600
message:
better comment for why we are decoding
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.4
merged: john at arbash-meinel.com-20070209164831-w5kk2hhyoprze3fb
parent: john at arbash-meinel.com-20070209164100-t9t1760kq6y5qgwn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 10:48:31 -0600
message:
When reading XML, always return utf-8 revision ids.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.3
merged: john at arbash-meinel.com-20070209164100-t9t1760kq6y5qgwn
parent: john at arbash-meinel.com-20070208231037-xzuzlh339rmgfhk6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Fri 2007-02-09 10:41:00 -0600
message:
Add get_cached_ascii for dealing with how cElementTree handles ascii strings
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.2
merged: john at arbash-meinel.com-20070208231037-xzuzlh339rmgfhk6
parent: john at arbash-meinel.com-20070208215253-4x90cx3ybnyixo5y
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Thu 2007-02-08 17:10:37 -0600
message:
Add a get_cached_utf8, which will ensure it is really utf8, and cache the strings
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.5.1
merged: john at arbash-meinel.com-20070208215253-4x90cx3ybnyixo5y
parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_utf8_revision_ids
timestamp: Thu 2007-02-08 15:52:53 -0600
message:
Leave revision-ids in utf-8 when reading.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.14
merged: pqm at pqm.ubuntu.com-20070216064835-76166d68f1750e11
parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
parent: mbp at sourcefrog.net-20070216060614-4xtp9d9nq3146xue
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-02-16 06:48:35 +0000
message:
(mbp,r=john,r=aaron) use os._exit from bzr script to quit faster and avoid thread kibble
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.9.1.3
merged: mbp at sourcefrog.net-20070216060614-4xtp9d9nq3146xue
parent: mbp at sourcefrog.net-20070215100953-94yv7skrymohnnbi
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Fri 2007-02-16 17:06:14 +1100
message:
update copyright
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.9.1.2
merged: mbp at sourcefrog.net-20070215100953-94yv7skrymohnnbi
parent: mbp at sourcefrog.net-20070215061543-yzyvx2fuidks9l7i
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2007-02-15 21:09:53 +1100
message:
not necessary to explicitly flush stderr (spiv)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.9.1.1
merged: mbp at sourcefrog.net-20070215061543-yzyvx2fuidks9l7i
parent: pqm at pqm.ubuntu.com-20070215023751-277626e9357e8a6c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2007-02-15 17:15:43 +1100
message:
os._exit rather than sys.exit at top level
somewhat faster through avoiding shutdown
and avoids bg threads whining about modules going away
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.13
merged: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
parent: pqm at pqm.ubuntu.com-20070215175417-99e71dd9b0b8fef7
parent: john at arbash-meinel.com-20070215180121-ar7e34iaqclvq16o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 18:14:16 +0000
message:
(John Arbash Meinel) make 'bzr remove-tree' a non-hidden command.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.11.1.1
merged: john at arbash-meinel.com-20070215180121-ar7e34iaqclvq16o
parent: pqm at pqm.ubuntu.com-20070215151131-1f2ce67d76e40200
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-02-15 12:01:21 -0600
message:
Promote 'remove-tree' to a public command.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.12
merged: pqm at pqm.ubuntu.com-20070215175417-99e71dd9b0b8fef7
parent: pqm at pqm.ubuntu.com-20070215151131-1f2ce67d76e40200
parent: abentley at panoramicfeedback.com-20070215160031-a2tj0ie8u9v30ob9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 17:54:17 +0000
message:
Selftest handles wacky plugin behavior
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.20
merged: abentley at panoramicfeedback.com-20070215160031-a2tj0ie8u9v30ob9
parent: abentley at panoramicfeedback.com-20070212155720-7stn0gx0renqojuk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-02-15 11:00:31 -0500
message:
Selftest handles wacky plugin behavior
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.11
merged: pqm at pqm.ubuntu.com-20070215151131-1f2ce67d76e40200
parent: pqm at pqm.ubuntu.com-20070215124016-39cb7bf4759aeede
parent: abentley at panoramicfeedback.com-20070215140823-xaqpzdqb5bmox2ak
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 15:11:31 +0000
message:
Provide new branch6 format
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.55
merged: abentley at panoramicfeedback.com-20070215140823-xaqpzdqb5bmox2ak
parent: abentley at panoramicfeedback.com-20070214202801-ur4lw9vhwey5fn2z
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Thu 2007-02-15 09:08:23 -0500
message:
Updates from review
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.54
merged: abentley at panoramicfeedback.com-20070214202801-ur4lw9vhwey5fn2z
parent: abentley at panoramicfeedback.com-20070214193430-kj7xcd004yn1ju4h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 15:28:01 -0500
message:
Move reverse history iteration to repository
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.53
merged: abentley at panoramicfeedback.com-20070214193430-kj7xcd004yn1ju4h
parent: abentley at panoramicfeedback.com-20070214192049-rxv227cpbmti8y1q
parent: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 14:34:30 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.52
merged: abentley at panoramicfeedback.com-20070214192049-rxv227cpbmti8y1q
parent: abentley at panoramicfeedback.com-20070214182219-w5d2wep3j7rb5h7r
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 14:20:49 -0500
message:
Remove metaweave test
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.51
merged: abentley at panoramicfeedback.com-20070214182219-w5d2wep3j7rb5h7r
parent: abentley at panoramicfeedback.com-20070214181633-bdp5phbvnwobnr7b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 13:22:19 -0500
message:
Store revno for Branch6, set_last_revision -> set_last_revision_info
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.50
merged: abentley at panoramicfeedback.com-20070214181633-bdp5phbvnwobnr7b
parent: abentley at panoramicfeedback.com-20070214150906-lqdoxdz1y9zpq4ut
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 13:16:33 -0500
message:
Fix broken error
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.49
merged: abentley at panoramicfeedback.com-20070214150906-lqdoxdz1y9zpq4ut
parent: abentley at panoramicfeedback.com-20070214145743-m1zbowokgrd9tk30
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 10:09:06 -0500
message:
Fix cache updating
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.48
merged: abentley at panoramicfeedback.com-20070214145743-m1zbowokgrd9tk30
parent: abentley at panoramicfeedback.com-20070214141157-7xm97jrjf9c9r6xk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 09:57:43 -0500
message:
Update blackbox test to handle new error message
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.47
merged: abentley at panoramicfeedback.com-20070214141157-7xm97jrjf9c9r6xk
parent: abentley at panoramicfeedback.com-20070213223457-1sp639tq2ln141on
parent: aaron.bentley at utoronto.ca-20070214130143-ducyb0e9jl8xa5l3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-02-14 09:11:57 -0500
message:
Merge speedups
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.45.1.1
merged: aaron.bentley at utoronto.ca-20070214130143-ducyb0e9jl8xa5l3
parent: abentley at panoramicfeedback.com-20070213222910-sgihqr7v4uiey6l7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Wed 2007-02-14 08:01:43 -0500
message:
Get log as fast branch5
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.46
merged: abentley at panoramicfeedback.com-20070213223457-1sp639tq2ln141on
parent: abentley at panoramicfeedback.com-20070213222910-sgihqr7v4uiey6l7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 17:34:57 -0500
message:
tweak config docs
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.45
merged: abentley at panoramicfeedback.com-20070213222910-sgihqr7v4uiey6l7
parent: abentley at panoramicfeedback.com-20070213222526-ztxquwl9cax22cbf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 17:29:10 -0500
message:
Change error message (mpool)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.44
merged: abentley at panoramicfeedback.com-20070213222526-ztxquwl9cax22cbf
parent: abentley at panoramicfeedback.com-20070213214922-gfk43l8ulp9sqvcj
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 17:25:26 -0500
message:
Change asserts to specific errors for left-hand history violations
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.43
merged: abentley at panoramicfeedback.com-20070213214922-gfk43l8ulp9sqvcj
parent: abentley at panoramicfeedback.com-20070213192247-3p6173awqxcd7nae
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 16:49:22 -0500
message:
Update docs
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.42
merged: abentley at panoramicfeedback.com-20070213192247-3p6173awqxcd7nae
parent: abentley at panoramicfeedback.com-20070213185839-9cc540a30gtrgq1g
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 14:22:47 -0500
message:
add --append-revisions-only option to init
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.41
merged: abentley at panoramicfeedback.com-20070213185839-9cc540a30gtrgq1g
parent: abentley at panoramicfeedback.com-20070212230149-cdoq27bpnuilvljc
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-02-13 13:58:39 -0500
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.40
merged: abentley at panoramicfeedback.com-20070212230149-cdoq27bpnuilvljc
parent: abentley at panoramicfeedback.com-20070212192005-2eupzrc1iz5cwc89
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 18:01:49 -0500
message:
Rename strict_revision_history to append_revisions_only
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.39
merged: abentley at panoramicfeedback.com-20070212192005-2eupzrc1iz5cwc89
parent: abentley at panoramicfeedback.com-20070212174148-f7w2am2wcoj71i7c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 14:20:05 -0500
message:
Improve history violation message
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.38
merged: abentley at panoramicfeedback.com-20070212174148-f7w2am2wcoj71i7c
parent: abentley at panoramicfeedback.com-20070212174104-hr82l8n7ttb0ys0a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 12:41:48 -0500
message:
Update docs per Martin's suggestion
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.37
merged: abentley at panoramicfeedback.com-20070212174104-hr82l8n7ttb0ys0a
parent: abentley at panoramicfeedback.com-20070212170925-bvvyl6v6v35lxwja
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 12:41:04 -0500
message:
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.36
merged: abentley at panoramicfeedback.com-20070212170925-bvvyl6v6v35lxwja
parent: abentley at panoramicfeedback.com-20070212170811-95deo6opqd6usoki
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 12:09:25 -0500
message:
Refactor getting/setting locations with config
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.35
merged: abentley at panoramicfeedback.com-20070212170811-95deo6opqd6usoki
parent: aaron.bentley at utoronto.ca-20070211204718-5leozw99ke6i0fne
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Mon 2007-02-12 12:08:11 -0500
message:
Add documentation for synchonize_history
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.34
merged: aaron.bentley at utoronto.ca-20070211204718-5leozw99ke6i0fne
parent: aaron.bentley at utoronto.ca-20070211204048-dy6f1rgib2x9yzk9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sun 2007-02-11 15:47:18 -0500
message:
cleanup
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.33
merged: aaron.bentley at utoronto.ca-20070211204048-dy6f1rgib2x9yzk9
parent: aaron.bentley at utoronto.ca-20070211201925-k72id2073qhbor31
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sun 2007-02-11 15:40:48 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.32
merged: aaron.bentley at utoronto.ca-20070211201925-k72id2073qhbor31
parent: aaron.bentley at utoronto.ca-20070211192640-d7zioevyig0w2r2u
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sun 2007-02-11 15:19:25 -0500
message:
Implement strict history policy
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.31
merged: aaron.bentley at utoronto.ca-20070211192640-d7zioevyig0w2r2u
parent: aaron.bentley at utoronto.ca-20070211174858-809xa5k3qi1aktdv
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sun 2007-02-11 14:26:40 -0500
message:
Implement re-binding previously-bound branches
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.30
merged: aaron.bentley at utoronto.ca-20070211174858-809xa5k3qi1aktdv
parent: abentley at panoramicfeedback.com-20070209225951-c4n8dhvdabsag0zq
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sun 2007-02-11 12:48:58 -0500
message:
Fix whitespace issues
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.29
merged: abentley at panoramicfeedback.com-20070209225951-c4n8dhvdabsag0zq
parent: abentley at panoramicfeedback.com-20070209211003-5l4u4pdev6bmrzn5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 17:59:51 -0500
message:
Implement conversion to branch 6
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.28
merged: abentley at panoramicfeedback.com-20070209211003-5l4u4pdev6bmrzn5
parent: abentley at panoramicfeedback.com-20070209204911-gx2q0xovtexz896t
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 16:10:03 -0500
message:
Restore default formats
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.27
merged: abentley at panoramicfeedback.com-20070209204911-gx2q0xovtexz896t
parent: abentley at panoramicfeedback.com-20070209203515-ipqlp95njxj6xwwx
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 15:49:11 -0500
message:
Skip arbitrary revision-history test for Branch6
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.26
merged: abentley at panoramicfeedback.com-20070209203515-ipqlp95njxj6xwwx
parent: abentley at panoramicfeedback.com-20070209203225-9a6m4aoq5v2c7f5l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 15:35:15 -0500
message:
Switch testament tests to knit2
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.25
merged: abentley at panoramicfeedback.com-20070209203225-9a6m4aoq5v2c7f5l
parent: abentley at panoramicfeedback.com-20070209202140-gv9pkiad28lqciz7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 15:32:25 -0500
message:
Use knit1 for experimental-branch6 repo
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.24
merged: abentley at panoramicfeedback.com-20070209202140-gv9pkiad28lqciz7
parent: abentley at panoramicfeedback.com-20070209200502-c35orp0m00y27foc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 15:21:40 -0500
message:
Remove format-on-open code
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.23
merged: abentley at panoramicfeedback.com-20070209200502-c35orp0m00y27foc
parent: abentley at panoramicfeedback.com-20070209193838-t4ww0tn3xfo2b0wp
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 15:05:02 -0500
message:
Make checkouts imitate parent format
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.22
merged: abentley at panoramicfeedback.com-20070209193838-t4ww0tn3xfo2b0wp
parent: aaron.bentley at utoronto.ca-20070209030224-mv2h60u6xzxbtxrw
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-02-09 14:38:38 -0500
message:
Make test suite use format registry default, not BzrDir default
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.21
merged: aaron.bentley at utoronto.ca-20070209030224-mv2h60u6xzxbtxrw
parent: aaron.bentley at utoronto.ca-20070209022819-a5god4wdjhxotz91
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-02-08 22:02:24 -0500
message:
Set up format on BzrDir construction
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.20
merged: aaron.bentley at utoronto.ca-20070209022819-a5god4wdjhxotz91
parent: aaron.bentley at utoronto.ca-20070209013719-s0zwp18cz4718zcw
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-02-08 21:28:19 -0500
message:
Add hooking for set_revision_history
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.19
merged: aaron.bentley at utoronto.ca-20070209013719-s0zwp18cz4718zcw
parent: aaron.bentley at utoronto.ca-20070209011656-iwhz4egfe3mxggu1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-02-08 20:37:19 -0500
message:
Fix testament tests
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.18
merged: aaron.bentley at utoronto.ca-20070209011656-iwhz4egfe3mxggu1
parent: aaron.bentley at utoronto.ca-20070209011510-ta7b7x7w6bagd2gk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-02-08 20:16:56 -0500
message:
Handle history sync as a special operation
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.17
merged: aaron.bentley at utoronto.ca-20070209011510-ta7b7x7w6bagd2gk
parent: abentley at panoramicfeedback.com-20070208161238-zx0nibynsq71twmo
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-02-08 20:15:10 -0500
message:
Set default serializer to 0.9
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.16
merged: abentley at panoramicfeedback.com-20070208161238-zx0nibynsq71twmo
parent: aaron.bentley at utoronto.ca-20070125054738-p4pw3z2eyd3hl0te
parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Thu 2007-02-08 11:12:38 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.15
merged: aaron.bentley at utoronto.ca-20070125054738-p4pw3z2eyd3hl0te
parent: aaron.bentley at utoronto.ca-20070118021644-m0xr38i6zbt0zknn
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Thu 2007-01-25 00:47:38 -0500
message:
assertDirectoriesEqual detects missing source, tests handle Branch6
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.14
merged: aaron.bentley at utoronto.ca-20070118021644-m0xr38i6zbt0zknn
parent: aaron.bentley at utoronto.ca-20070118015839-3371x5v069dynsex
parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Wed 2007-01-17 21:16:44 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.13
merged: aaron.bentley at utoronto.ca-20070118015839-3371x5v069dynsex
parent: abentley at panoramicfeedback.com-20070117200245-u8oq0ulvmuxbrga5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Wed 2007-01-17 20:58:39 -0500
message:
Fix most info tests (but some depend on odd cloning behavior)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.12
merged: abentley at panoramicfeedback.com-20070117200245-u8oq0ulvmuxbrga5
parent: abentley at panoramicfeedback.com-20070116155845-y4316unaqpfml64y
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Wed 2007-01-17 15:02:45 -0500
message:
Clean up trailing whitespace
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.11
merged: abentley at panoramicfeedback.com-20070116155845-y4316unaqpfml64y
parent: abentley at panoramicfeedback.com-20070116151615-da9xjamfwwfpsoo8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-01-16 10:58:45 -0500
message:
Fix line endings
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.10
merged: abentley at panoramicfeedback.com-20070116151615-da9xjamfwwfpsoo8
parent: abentley at panoramicfeedback.com-20070116151052-nkdqmfvcqyjy6u8b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-01-16 10:16:15 -0500
message:
Genericised test_fetch to handle branch 6 retrieval patterns
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.9
merged: abentley at panoramicfeedback.com-20070116151052-nkdqmfvcqyjy6u8b
parent: abentley at panoramicfeedback.com-20070116142641-eg8mp6nj7wvkq00h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-01-16 10:10:52 -0500
message:
Fix most fetch tests
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.8
merged: abentley at panoramicfeedback.com-20070116142641-eg8mp6nj7wvkq00h
parent: abentley at panoramicfeedback.com-20070116140541-74mmdzqm20losg0n
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-01-16 09:26:41 -0500
message:
Abstract mechanism from policy getting/setting parents
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.7
merged: abentley at panoramicfeedback.com-20070116140541-74mmdzqm20losg0n
parent: aaron.bentley at utoronto.ca-20070116131254-sjruli93timappd4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Tue 2007-01-16 09:05:41 -0500
message:
Fix binding return values
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.6
merged: aaron.bentley at utoronto.ca-20070116131254-sjruli93timappd4
parent: aaron.bentley at utoronto.ca-20070116125940-h86sv9sqcp8pk46d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Tue 2007-01-16 08:12:54 -0500
message:
work in progress bind stuff
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.5
merged: aaron.bentley at utoronto.ca-20070116125940-h86sv9sqcp8pk46d
parent: aaron.bentley at utoronto.ca-20070113054724-l2aykpvy3k0ug8ok
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Tue 2007-01-16 07:59:40 -0500
message:
implement set_last revision and clone
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.4
merged: aaron.bentley at utoronto.ca-20070113054724-l2aykpvy3k0ug8ok
parent: abentley at panoramicfeedback.com-20070112213924-t9fm7x7foi5uqa83
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: branch6
timestamp: Sat 2007-01-13 00:47:24 -0500
message:
Follow get_parent API more closely
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.3
merged: abentley at panoramicfeedback.com-20070112213924-t9fm7x7foi5uqa83
parent: abentley at panoramicfeedback.com-20070112194957-pi4z29jxzl6who0c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-01-12 16:39:24 -0500
message:
Add more config testing
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.2
merged: abentley at panoramicfeedback.com-20070112194957-pi4z29jxzl6who0c
parent: abentley at panoramicfeedback.com-20070112181841-94zoz6cv72clmsft
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-01-12 14:49:57 -0500
message:
Get all branch tests passing
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.80.3.1
merged: abentley at panoramicfeedback.com-20070112181841-94zoz6cv72clmsft
parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: branch6
timestamp: Fri 2007-01-12 13:18:41 -0500
message:
Get branch6 creation working
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.10
merged: pqm at pqm.ubuntu.com-20070215124016-39cb7bf4759aeede
parent: pqm at pqm.ubuntu.com-20070215023751-277626e9357e8a6c
parent: bialix at ukr.net-20070214110051-4b8bp7bo74aoc83v
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 12:40:16 +0000
message:
(bialix) custom reimplementation of abspath in Python for Windows
98 (#84278)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.5.4
merged: bialix at ukr.net-20070214110051-4b8bp7bo74aoc83v
parent: bialix at ukr.net-20070214102753-7ihuxer38uanf3d5
parent: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 13:00:51 +0200
message:
merge bzr.dev; NEWS entry
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.5.3
merged: bialix at ukr.net-20070214102753-7ihuxer38uanf3d5
parent: bialix at ukr.net-20070214101112-bhyewz9ye89za73e
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 12:27:53 +0200
message:
win98_abspath: support for running in POSIX environment: cwd path has not drive letter
so we need to be careful about result of _win98_abspath('/path')
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.5.2
merged: bialix at ukr.net-20070214101112-bhyewz9ye89za73e
parent: bialix at ukr.net-20070214100900-i4rygckilzdjc1tz
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 12:11:12 +0200
message:
Don't do normpath after abspath, because this function is called inside abspath
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.5.1
merged: bialix at ukr.net-20070214100900-i4rygckilzdjc1tz
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win98.support
timestamp: Wed 2007-02-14 12:09:00 +0200
message:
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.9
merged: pqm at pqm.ubuntu.com-20070215023751-277626e9357e8a6c
parent: pqm at pqm.ubuntu.com-20070215000418-497ae3e1b4def622
parent: abentley at panoramicfeedback.com-20070214215740-qehopznuc8to99oy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 02:37:51 +0000
message:
Generate iter_changes output from TreeTransform, use in merge, revert, etc.
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.13
merged: abentley at panoramicfeedback.com-20070214215740-qehopznuc8to99oy
parent: abentley at panoramicfeedback.com-20070214214053-8n2v072t516l832t
parent: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Wed 2007-02-14 16:57:40 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.12
merged: abentley at panoramicfeedback.com-20070214214053-8n2v072t516l832t
parent: abentley at panoramicfeedback.com-20070209170947-dnalqph1nyfqfy1z
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Wed 2007-02-14 16:40:53 -0500
message:
Changes from review
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.11
merged: abentley at panoramicfeedback.com-20070209170947-dnalqph1nyfqfy1z
parent: abentley at panoramicfeedback.com-20070209162622-mczvdmtgxwwi91mq
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 12:09:47 -0500
message:
Get tests passing
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.10
merged: abentley at panoramicfeedback.com-20070209162622-mczvdmtgxwwi91mq
parent: abentley at panoramicfeedback.com-20070209155649-qxg6cqptrwyd4xof
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 11:26:22 -0500
message:
Add change reporting to pull
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.9
merged: abentley at panoramicfeedback.com-20070209155649-qxg6cqptrwyd4xof
parent: abentley at panoramicfeedback.com-20070209153710-m6fu3erfqstab4fb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:56:49 -0500
message:
Apply change reporting to merge
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.8
merged: abentley at panoramicfeedback.com-20070209153710-m6fu3erfqstab4fb
parent: abentley at panoramicfeedback.com-20070209152812-eq7fxk7cjwl8sxdp
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:37:10 -0500
message:
Clarify what conflicts may not be present
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.7
merged: abentley at panoramicfeedback.com-20070209152812-eq7fxk7cjwl8sxdp
parent: abentley at panoramicfeedback.com-20070209150523-n4x3ipdf6d65fbxh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:28:12 -0500
message:
Stop modified flag bleeding into later changes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.6
merged: abentley at panoramicfeedback.com-20070209150523-n4x3ipdf6d65fbxh
parent: abentley at panoramicfeedback.com-20070209150223-881f6f36q96cgv6v
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:05:23 -0500
message:
Emit change listings before conflict warnings
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.5
merged: abentley at panoramicfeedback.com-20070209150223-881f6f36q96cgv6v
parent: abentley at panoramicfeedback.com-20070209141035-fq6bi6d6xeikl4fd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 10:02:23 -0500
message:
cleanup
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.4
merged: abentley at panoramicfeedback.com-20070209141035-fq6bi6d6xeikl4fd
parent: abentley at panoramicfeedback.com-20070208224245-fyktmyk673mcl83t
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Fri 2007-02-09 09:10:35 -0500
message:
Sort output of Transform.iter_changes by path
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.3
merged: abentley at panoramicfeedback.com-20070208224245-fyktmyk673mcl83t
parent: abentley at panoramicfeedback.com-20070208221850-zkmikxazj7n8suc6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 17:42:45 -0500
message:
Use tree transform to emit upcoming change list
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.2
merged: abentley at panoramicfeedback.com-20070208221850-zkmikxazj7n8suc6
parent: abentley at panoramicfeedback.com-20070208200737-2st6vnlue348aa1p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 17:18:50 -0500
message:
Get kind change detection working for iter_changes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16.1.1
merged: abentley at panoramicfeedback.com-20070208200737-2st6vnlue348aa1p
parent: abentley at panoramicfeedback.com-20070208150047-li7efd5nxn6bi4ew
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: transform-translation
timestamp: Thu 2007-02-08 15:07:37 -0500
message:
Initial work on converting TreeTransform to iter_changes format
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.8
merged: pqm at pqm.ubuntu.com-20070215000418-497ae3e1b4def622
parent: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
parent: john at arbash-meinel.com-20070213223316-dlowmy4as5xhe921
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-15 00:04:18 +0000
message:
(John Arbash Meinel, r=robert) Avoid an extra inventory deserialization during commit.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.4.2.1
merged: john at arbash-meinel.com-20070213223316-dlowmy4as5xhe921
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: avoid_extra_deserialization
timestamp: Tue 2007-02-13 16:33:16 -0600
message:
Avoid deserializing an inventory we have already parsed.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.7
merged: pqm at pqm.ubuntu.com-20070214095120-13e5c64a9d83e718
parent: pqm at pqm.ubuntu.com-20070214074046-ab02dfb9d0f0640d
parent: mbp at sourcefrog.net-20070213092108-i27nldyjijw0cqsq
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-14 09:51:20 +0000
message:
(mbp) add -d option to push, pull, merge (r=aaron)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.4.1
merged: mbp at sourcefrog.net-20070213092108-i27nldyjijw0cqsq
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: mbp at sourcefrog.net
branch nick: dashd
timestamp: Tue 2007-02-13 20:21:08 +1100
message:
Add a -d option to push, pull, merge (ported from tags branch)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.6
merged: pqm at pqm.ubuntu.com-20070214074046-ab02dfb9d0f0640d
parent: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
parent: mbp at sourcefrog.net-20070214071027-0fh0mtcte2kuc86o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-02-14 07:40:46 +0000
message:
(mbp,aaron) Change register_metadir to take fully-qualified repository class name.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.21
merged: mbp at sourcefrog.net-20070214071027-0fh0mtcte2kuc86o
parent: mbp at sourcefrog.net-20070213072810-ofxj46bg7en5tx4e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-14 18:10:27 +1100
message:
Change register_metadir to take fully-qualified repository class name.
(Review suggestion from Aaron.)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.5
merged: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
parent: john at arbash-meinel.com-20070213161227-neb9gdl0o9z90s0f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-13 18:02:51 +0000
message:
(John Arbash Meinel) (trivial) remove unused and incorrect code.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.4.1.1
merged: john at arbash-meinel.com-20070213161227-neb9gdl0o9z90s0f
parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-02-13 10:12:27 -0600
message:
(John Arbash Meinel) (trivial) remove unused and incorrect code.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.4
merged: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
parent: pqm at pqm.ubuntu.com-20070213100658-2d02fdea9b5ac1d5
parent: mbp at sourcefrog.net-20070213072810-ofxj46bg7en5tx4e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-13 11:48:14 +0000
message:
(mbp) split repository formats into repofmt (r=john)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.20
merged: mbp at sourcefrog.net-20070213072810-ofxj46bg7en5tx4e
parent: mbp at sourcefrog.net-20070213052239-09atqsahwth6zdm1
committer: mbp at sourcefrog.net
branch nick: repoformats
timestamp: Tue 2007-02-13 18:28:10 +1100
message:
update tests for new locations of weave repos
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.19
merged: mbp at sourcefrog.net-20070213052239-09atqsahwth6zdm1
parent: mbp at sourcefrog.net-20070213014725-i3ocm09caz2y15b5
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: mbp at sourcefrog.net
branch nick: repoformats
timestamp: Tue 2007-02-13 16:22:39 +1100
message:
(merge) trunk
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.18
merged: mbp at sourcefrog.net-20070213014725-i3ocm09caz2y15b5
parent: mbp at sourcefrog.net-20070212071448-0jvjfcc44wlaraw8
committer: mbp at sourcefrog.net
branch nick: repoformats
timestamp: Tue 2007-02-13 12:47:25 +1100
message:
Restore use of deprecating delegator for old formats in bzrlib.repository.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.17
merged: mbp at sourcefrog.net-20070212071448-0jvjfcc44wlaraw8
parent: mbp at sourcefrog.net-20070212065850-6i7a2btsua2b86tw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 18:14:48 +1100
message:
Restore old InterWeave tests
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.16
merged: mbp at sourcefrog.net-20070212065850-6i7a2btsua2b86tw
parent: mbp at sourcefrog.net-20070212063546-h2ku6z7fixzin6ur
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 17:58:50 +1100
message:
Just import repository formats into repository.py, rather than using special delegate
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.15
merged: mbp at sourcefrog.net-20070212063546-h2ku6z7fixzin6ur
parent: mbp at sourcefrog.net-20070212061214-ff5rahaaqxz4jbtu
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 17:35:46 +1100
message:
doc
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.14
merged: mbp at sourcefrog.net-20070212061214-ff5rahaaqxz4jbtu
parent: mbp at sourcefrog.net-20070212050955-ctczxopwvmco8rv0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 17:12:14 +1100
message:
Add deprecated forwarders for old formats from repository.py
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.13
merged: mbp at sourcefrog.net-20070212050955-ctczxopwvmco8rv0
parent: mbp at sourcefrog.net-20070212042128-tad5xv28x4zubo5s
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 16:09:55 +1100
message:
Re-register InterWeaveRepo, fix test integration, add test for it
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.12
merged: mbp at sourcefrog.net-20070212042128-tad5xv28x4zubo5s
parent: mbp at sourcefrog.net-20070207124145-qufbufe41sm6fqrf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Mon 2007-02-12 15:21:28 +1100
message:
Restore InterWeaveRepo
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.11
merged: mbp at sourcefrog.net-20070207124145-qufbufe41sm6fqrf
parent: mbp at sourcefrog.net-20070207120941-gd7ow6jzt5b4ughi
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 23:41:45 +1100
message:
Get rid of RepositoryFormat*_instance objects. Instead the format
registry can hold either format objects or factories that create them, and
its get() method calls that if needed.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.10
merged: mbp at sourcefrog.net-20070207120941-gd7ow6jzt5b4ughi
parent: mbp at sourcefrog.net-20070207092559-yqv8864d88qnrlez
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 23:09:41 +1100
message:
Remove more references to weaves from the repository.py file
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.9
merged: mbp at sourcefrog.net-20070207092559-yqv8864d88qnrlez
parent: mbp at sourcefrog.net-20070207092247-pww6djejoiu1av67
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 20:25:59 +1100
message:
Clean up some imports
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.8
merged: mbp at sourcefrog.net-20070207092247-pww6djejoiu1av67
parent: mbp at sourcefrog.net-20070207091549-zfl9ws3ne5ysg4e8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 20:22:47 +1100
message:
Set the repository's serializer in the places it's needed, not in the base class
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.7
merged: mbp at sourcefrog.net-20070207091549-zfl9ws3ne5ysg4e8
parent: mbp at sourcefrog.net-20070207091131-458fw18bgytvaz7t
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 20:15:49 +1100
message:
rename method
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.6
merged: mbp at sourcefrog.net-20070207091131-458fw18bgytvaz7t
parent: mbp at sourcefrog.net-20070206081613-dxop566k13bll6j0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Wed 2007-02-07 20:11:31 +1100
message:
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
lazily load from the registry.
InterRepo._matching_repo_format is now a method not a class field so that
it can load repositories when we need them.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.5
merged: mbp at sourcefrog.net-20070206081613-dxop566k13bll6j0
parent: mbp at sourcefrog.net-20070206062724-a5uo1u27jxsal2t0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Tue 2007-02-06 19:16:13 +1100
message:
Move KnitFormat2 into repofmt
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.91.1.4
merged: mbp at sourcefrog.net-20070206062724-a5uo1u27jxsal2t0
parent: mbp at sourcefrog.net-20070125003522-27pc5240qbqtzfy3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: repoformats
timestamp: Tue 2007-02-06 17:27:24 +1100
message:
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
Change help for --format to just say 'see help formats'
RepositoryFormat.register_metadir gains an optional parameter for the
module name containing the repository format, and lazily loads from there.
Disable test_interrepository_get_returns_correct_optimiser, because it
seems too brittle.
Remove InterWeaveRepo, these should now just be upgraded.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.3
merged: pqm at pqm.ubuntu.com-20070213100658-2d02fdea9b5ac1d5
parent: pqm at pqm.ubuntu.com-20070213074608-337e1db89805f74d
parent: mbp at sourcefrog.net-20070213014053-2nb9jeb21vfuoxsi
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-13 10:06:58 +0000
message:
(mbp,trivial) fix option display in shell-complete
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.3.1
merged: mbp at sourcefrog.net-20070213014053-2nb9jeb21vfuoxsi
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: mbp at sourcefrog.net
branch nick: trivial
timestamp: Tue 2007-02-13 12:40:53 +1100
message:
(trivial) fix short_name() call in shellcomplete
(thanks to Matthias Ralf) #84826
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.2
merged: pqm at pqm.ubuntu.com-20070213074608-337e1db89805f74d
parent: pqm at pqm.ubuntu.com-20070213040413-6b9f8b8ba554fcd5
parent: john at arbash-meinel.com-20070212225848-lxl29d1xugdid79d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-13 07:46:08 +0000
message:
(John Arbash Meinel) Fix pushing branches within the same repository by using a read lock on the source.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.2.3
merged: john at arbash-meinel.com-20070212225848-lxl29d1xugdid79d
parent: john at arbash-meinel.com-20070212224239-8tbgpw9qhooqitk1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: push_readonly
timestamp: Mon 2007-02-12 16:58:48 -0600
message:
Switch the test to being a branch_implementation test.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.2.2
merged: john at arbash-meinel.com-20070212224239-8tbgpw9qhooqitk1
parent: john at arbash-meinel.com-20070212223618-7cboppunmrb86n3b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: push_readonly
timestamp: Mon 2007-02-12 16:42:39 -0600
message:
Actually make the test a blackbox test.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.2.1
merged: john at arbash-meinel.com-20070212223618-7cboppunmrb86n3b
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: push_readonly
timestamp: Mon 2007-02-12 16:36:18 -0600
message:
Branch.push() only needs a read lock.
By avoiding a write lock, we avoid deadlock when pushing within
a single repository.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.1
merged: pqm at pqm.ubuntu.com-20070213040413-6b9f8b8ba554fcd5
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
parent: abentley at panoramicfeedback.com-20070212155720-7stn0gx0renqojuk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-02-13 04:04:13 +0000
message:
bzr log works in local treeless branches (#84247)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.19
merged: abentley at panoramicfeedback.com-20070212155720-7stn0gx0renqojuk
parent: abentley at panoramicfeedback.com-20070209182321-b4tw6uhxfx1o4xqi
parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-02-12 10:57:20 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.18
merged: abentley at panoramicfeedback.com-20070209182321-b4tw6uhxfx1o4xqi
parent: abentley at panoramicfeedback.com-20070209180308-5k3im1mhn2wa8bg0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-02-09 13:23:21 -0500
message:
Log works in local treeless branches (#84247)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.17
merged: abentley at panoramicfeedback.com-20070209180308-5k3im1mhn2wa8bg0
parent: abentley at panoramicfeedback.com-20070208150047-li7efd5nxn6bi4ew
parent: pqm at pqm.ubuntu.com-20070209011702-1aa0d624613e8953
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-02-09 13:03:08 -0500
message:
Merge from bzr.dev
Diff too large for email (11377 lines, the limit is 1000).
More information about the bazaar-commits
mailing list