Rev 2489: merge bzr.dev at 2495 in file:///v/home/vila/src/bugs/111702/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Tue May 29 14:17:45 BST 2007
At file:///v/home/vila/src/bugs/111702/
------------------------------------------------------------
revno: 2489
revision-id: v.ladeuil+lp at free.fr-20070529131741-df4zd9ko5y1w1g6d
parent: v.ladeuil+lp at free.fr-20070504103507-cm0woizea22taavd
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Tue 2007-05-29 15:17:41 +0200
message:
merge bzr.dev at 2495
added:
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
doc/developers/ docdevelopers-20070507164002-62r0es2b29myxges-1
doc/developers/incremental-push-pull.txt incrementalpushpull.-20070508045640-zneiu1yzbci574c6-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap-rationale.txt performanceroadmapra-20070507174912-mwv3xv517cs4sisd-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
renamed:
HACKING => doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_treebuilder.py test_treebuilder.py-20060907214856-4omn6hf1u7fvrart-2
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
doc/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2476.1.19
revision-id: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
parent: pqm at pqm.ubuntu.com-20070525043332-aw7j04dvjy6ua1v9
parent: bialix at ukr.net-20070504110241-bgormskp9ihlft2r
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-05-25 06:00:23 +0100
message:
(bialix,r=john) don't bundle into standalone bzr.exe site.py (with
their depends), and tools/doc_generate
------------------------------------------------------------
revno: 2476.1.5.2.1
revision-id: bialix at ukr.net-20070504110241-bgormskp9ihlft2r
parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Fri 2007-05-04 14:02:41 +0300
message:
don't bundle into standalone bzr.exe site.py (with their depends), and tools/doc_generate
------------------------------------------------------------
revno: 2476.1.18
revision-id: pqm at pqm.ubuntu.com-20070525043332-aw7j04dvjy6ua1v9
parent: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
parent: aaron.bentley at utoronto.ca-20070525040047-w4ymt5gvi3gecx1g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-05-25 05:33:32 +0100
message:
Merge log --limit (Kent Gibson)
------------------------------------------------------------
revno: 2476.1.17.1.1
revision-id: aaron.bentley at utoronto.ca-20070525040047-w4ymt5gvi3gecx1g
parent: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
parent: warthog618 at gmail.com-20070505023239-2yrekc2wwgkpu6br
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Fri 2007-05-25 00:00:47 -0400
message:
Merge log --limit (Kent Gibson)
------------------------------------------------------------
revno: 2466.8.1.1.1
revision-id: warthog618 at gmail.com-20070505023239-2yrekc2wwgkpu6br
parent: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: log_limit
timestamp: Sat 2007-05-05 10:32:39 +0800
message:
add bzr log --limit
------------------------------------------------------------
revno: 2476.1.17
revision-id: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
parent: pqm at pqm.ubuntu.com-20070524160700-3mu8f24yc5ej88m1
parent: john at arbash-meinel.com-20070524161253-rhy5ajcwxxfqk3sr
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-24 17:57:38 +0100
message:
(Marien Zwart) Update test_selftest.test_elapsed_time_with... to be more forgiving
------------------------------------------------------------
revno: 2476.1.16.1.2
revision-id: john at arbash-meinel.com-20070524161253-rhy5ajcwxxfqk3sr
parent: john at arbash-meinel.com-20070524161045-t2dtfewkpnxeqlnp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 11:12:53 -0500
message:
Tweak the regex a bit more
------------------------------------------------------------
revno: 2476.1.16.1.1
revision-id: john at arbash-meinel.com-20070524161045-t2dtfewkpnxeqlnp
parent: pqm at pqm.ubuntu.com-20070524160700-3mu8f24yc5ej88m1
parent: marienz at gentoo.org-20070511003934-5v54sk8ejgxgghst
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 11:10:45 -0500
message:
[merge] Marien Zwart: make test_elapsed_time more forgiving.
------------------------------------------------------------
revno: 2476.1.9.2.1
revision-id: marienz at gentoo.org-20070511003934-5v54sk8ejgxgghst
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: Marien Zwart <marienz at gentoo.org>
branch nick: fix-timed-tests
timestamp: Fri 2007-05-11 02:39:34 +0200
message:
Make test_elapsed_time_with_benchmarking pass on a slow cpu.
------------------------------------------------------------
revno: 2476.1.16
revision-id: pqm at pqm.ubuntu.com-20070524160700-3mu8f24yc5ej88m1
parent: pqm at pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
parent: john at arbash-meinel.com-20070524152641-2vq63484l18cy4e8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-24 17:07:00 +0100
message:
(James Westby) Add a help topic for working trees and repositories.
------------------------------------------------------------
revno: 2476.1.15.1.1
revision-id: john at arbash-meinel.com-20070524152641-2vq63484l18cy4e8
parent: pqm at pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
parent: jw+debian at jameswestby.net-20070514204516-6bnkhae4x3cx3z1k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 10:26:41 -0500
message:
(James Westby) Add a help topic for working trees and repositories.
------------------------------------------------------------
revno: 2476.1.9.1.3
revision-id: jw+debian at jameswestby.net-20070514204516-6bnkhae4x3cx3z1k
parent: jw+debian at jameswestby.net-20070514204247-mcxwep2on9g5p30w
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.repohelp
timestamp: Mon 2007-05-14 21:45:16 +0100
message:
Add a NEWS entry for the changes.
------------------------------------------------------------
revno: 2476.1.9.1.2
revision-id: jw+debian at jameswestby.net-20070514204247-mcxwep2on9g5p30w
parent: jw+debian at jameswestby.net-20070514193026-3itaozap05k3vuxp
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.repohelp
timestamp: Mon 2007-05-14 21:42:47 +0100
message:
Update with comments from review, thanks to John and Aaron.
------------------------------------------------------------
revno: 2476.1.9.1.1
revision-id: jw+debian at jameswestby.net-20070514193026-3itaozap05k3vuxp
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
parent: jw+debian at jameswestby.net-20070414025144-qv17v6rkq1tfu6v8
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.repohelp
timestamp: Mon 2007-05-14 20:30:26 +0100
message:
Update the help topics to the latest bzr.dev.
------------------------------------------------------------
revno: 2401.2.2
revision-id: jw+debian at jameswestby.net-20070414025144-qv17v6rkq1tfu6v8
parent: jw+debian at jameswestby.net-20070414010244-4qvkerl2bztwchn1
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.repos
timestamp: Sat 2007-04-14 03:51:44 +0100
message:
Add a working-trees help topic.
Has both some general information and specifics about dealing with remote
working trees. Because of that change the remote tree warning message to point
to it. Hopefully that will give users a starting point for deciding how to
cope with that situation.
------------------------------------------------------------
revno: 2401.2.1
revision-id: jw+debian at jameswestby.net-20070414010244-4qvkerl2bztwchn1
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.repos
timestamp: Sat 2007-04-14 02:02:44 +0100
message:
Add a help topic for repositories.
------------------------------------------------------------
revno: 2476.1.15
revision-id: pqm at pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
parent: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
parent: john at arbash-meinel.com-20070524124224-0yyi4laqtngw6lf6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-24 14:09:59 +0100
message:
(Kent Gibson) Update the LogFormatter API to use a LogRevision object.
------------------------------------------------------------
revno: 2476.1.14.1.4
revision-id: john at arbash-meinel.com-20070524124224-0yyi4laqtngw6lf6
parent: john at arbash-meinel.com-20070524121925-jf60fhqgvtcy6n0g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 07:42:24 -0500
message:
Update bzrlib.log.show_changed_revisions to use the new api
------------------------------------------------------------
revno: 2476.1.14.1.3
revision-id: john at arbash-meinel.com-20070524121925-jf60fhqgvtcy6n0g
parent: john at arbash-meinel.com-20070524121306-jlb942ezpitxujud
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 07:19:25 -0500
message:
Restore the test for iter_log_data as a deprecated function.
------------------------------------------------------------
revno: 2476.1.14.1.2
revision-id: john at arbash-meinel.com-20070524121306-jlb942ezpitxujud
parent: john at arbash-meinel.com-20070524115407-lcnak713swd59lvk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 07:13:06 -0500
message:
Cleanup according to PEP8 and some other small whitespace fixes
------------------------------------------------------------
revno: 2476.1.14.1.1
revision-id: john at arbash-meinel.com-20070524115407-lcnak713swd59lvk
parent: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
parent: warthog618 at gmail.com-20070507115128-myp6wjqauc85kr4p
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 06:54:07 -0500
message:
[merge] Kent Gibson: Rework LogFormatter API
------------------------------------------------------------
revno: 2466.8.2
revision-id: warthog618 at gmail.com-20070507115128-myp6wjqauc85kr4p
parent: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: lf_rework
timestamp: Mon 2007-05-07 19:51:28 +0800
message:
Move begin/end calls from _show_log to show_log. Fix long line.
------------------------------------------------------------
revno: 2466.8.1
revision-id: warthog618 at gmail.com-20070429034630-p3xbitz2xyl6pbie
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Sun 2007-04-29 11:46:30 +0800
message:
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
Fixed minor inconsistency between display of revids in mainline and merge revisions in long log format. Both now labelled "revision-id:" and are only displayed when --show-ids is specified.
------------------------------------------------------------
revno: 2476.1.14
revision-id: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
parent: pqm at pqm.ubuntu.com-20070523092220-d1hkaakjej39827x
parent: john at arbash-meinel.com-20070523090735-3uf48sdb33qh79g4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-05-23 10:51:10 +0100
message:
(Robert Collins) Document TreeBuilder, and do some cleanup.
------------------------------------------------------------
revno: 2476.1.12.1.2
revision-id: john at arbash-meinel.com-20070523090735-3uf48sdb33qh79g4
parent: john at arbash-meinel.com-20070523085414-8o53d2txzpn4ni9y
parent: robertc at robertcollins.net-20070427003620-6fjf8dbiblgt5am7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-05-23 04:07:35 -0500
message:
(Robert Collins) Document TreeBuilder, and do some cleanup.
------------------------------------------------------------
revno: 2466.7.2
revision-id: robertc at robertcollins.net-20070427003620-6fjf8dbiblgt5am7
parent: robertc at robertcollins.net-20070427001815-3m1u2fk695um4oyb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 10:36:20 +1000
message:
Document the user of TreeBuilder somewhat.
------------------------------------------------------------
revno: 2466.7.1
revision-id: robertc at robertcollins.net-20070427001815-3m1u2fk695um4oyb
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 10:18:15 +1000
message:
Tree builder tests do not need a working dir.
------------------------------------------------------------
revno: 2476.1.13
revision-id: pqm at pqm.ubuntu.com-20070523092220-d1hkaakjej39827x
parent: pqm at pqm.ubuntu.com-20070521152446-1v1dk0m7c705cdlx
parent: john at arbash-meinel.com-20070523085414-8o53d2txzpn4ni9y
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-05-23 10:22:20 +0100
message:
(Vincent Ladeuil) Fix bug #110204 allowing proper password prompt encoding
------------------------------------------------------------
revno: 2476.1.12.1.1
revision-id: john at arbash-meinel.com-20070523085414-8o53d2txzpn4ni9y
parent: pqm at pqm.ubuntu.com-20070521152446-1v1dk0m7c705cdlx
parent: v.ladeuil+lp at free.fr-20070426205243-gwo5c2xhd75tezxz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-05-23 03:54:14 -0500
message:
(Vincent Ladeuil) Fix bug #110204 allowing proper password prompt encoding
------------------------------------------------------------
revno: 2461.1.2
revision-id: v.ladeuil+lp at free.fr-20070426205243-gwo5c2xhd75tezxz
parent: v.ladeuil+lp at free.fr-20070426081629-g0rsiqfszpxz2tto
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 110204
timestamp: Thu 2007-04-26 22:52:43 +0200
message:
Take jam's remark into account.
* bzrlib/ui/__init__.py:
(CLIUIFactory.get_non_echoed_password): Better to use
osutils.get_terminal_encoding() !
------------------------------------------------------------
revno: 2461.1.1
revision-id: v.ladeuil+lp at free.fr-20070426081629-g0rsiqfszpxz2tto
parent: pqm at pqm.ubuntu.com-20070426070825-6xw10b1el98su02i
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 110204
timestamp: Thu 2007-04-26 10:16:29 +0200
message:
Fix 110204 by letting TestUIFactory encode password prompt.
* bzrlib/ui/__init__.py:
(CLIUIFactory.get_non_echoed_password): Encode prompt with
sys.stdout.
(CLIUIFactory.get_password): Delegate prompt encoding to
get_non_echoed_password.
* bzrlib/tests/__init__.py:
(TestUIFactory.get_non_echoed_password): Encode prompt with
self.stdout.
------------------------------------------------------------
revno: 2476.1.12
revision-id: pqm at pqm.ubuntu.com-20070521152446-1v1dk0m7c705cdlx
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
parent: aaron.bentley at utoronto.ca-20070521141436-x3aw0x8tksw2yu0e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-05-21 16:24:46 +0100
message:
Better error for selected-file commit of merges
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.9
revision-id: aaron.bentley at utoronto.ca-20070521141436-x3aw0x8tksw2yu0e
parent: aaron.bentley at utoronto.ca-20070521140910-ugock53or9q2ki8g
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-05-21 10:14:36 -0400
message:
Better error for selected-file commit of merges
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.8
revision-id: aaron.bentley at utoronto.ca-20070521140910-ugock53or9q2ki8g
parent: aaron.bentley at utoronto.ca-20070420114824-jd5kfyku8qeyv844
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-05-21 10:09:10 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2476.1.11
revision-id: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
parent: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
parent: john at arbash-meinel.com-20070517165510-nua3t85svfqt89x2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-17 18:42:05 +0100
message:
(Klaus Hartke) Remove duplicate line in commit.py
------------------------------------------------------------
revno: 2476.1.10.1.1
revision-id: john at arbash-meinel.com-20070517165510-nua3t85svfqt89x2
parent: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
parent: klaus.hartke at googlemail.com-20070517150749-l1jbjftc4sgoe5lk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-17 17:55:10 +0100
message:
(Klaus Hartke) Remove duplicate line in commit.py
------------------------------------------------------------
revno: 2476.1.10.2.1
revision-id: klaus.hartke at googlemail.com-20070517150749-l1jbjftc4sgoe5lk
parent: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
committer: Klaus Hartke <klaus.hartke at googlemail.com>
branch nick: bzr.klaus
timestamp: Thu 2007-05-17 17:07:49 +0200
message:
Removed duplicate line.
------------------------------------------------------------
revno: 2476.1.10
revision-id: pqm at pqm.ubuntu.com-20070516183055-codor2wzlo96i996
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
parent: mbp at sourcefrog.net-20070502140053-50hm0ihm249u627n
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-05-16 19:30:55 +0100
message:
(mbp,r=john) add CountedLock class
------------------------------------------------------------
revno: 2475.4.1
revision-id: mbp at sourcefrog.net-20070502140053-50hm0ihm249u627n
parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: counted-lock
timestamp: Thu 2007-05-03 00:00:53 +1000
message:
Start adding CountedLock class to partially replace LockableFiles
------------------------------------------------------------
revno: 2476.1.9
revision-id: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
parent: pqm at pqm.ubuntu.com-20070508203256-wcxwdphd1y2psezh
parent: robertc at robertcollins.net-20070509153606-m556z2rb3d76b2f3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-10 06:55:01 +0100
message:
(robertc) Move HACKING to doc/developers/HACKING and start on performance analysis documentation. (Robert Collins)
------------------------------------------------------------
revno: 2476.1.5.1.5
revision-id: robertc at robertcollins.net-20070509153606-m556z2rb3d76b2f3
parent: robertc at robertcollins.net-20070508041401-rreosr07ptz41d6c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-05-10 01:36:06 +1000
message:
Incremental push-pull performance anlysis draft.
------------------------------------------------------------
revno: 2476.1.5.1.4
revision-id: robertc at robertcollins.net-20070508041401-rreosr07ptz41d6c
parent: robertc at robertcollins.net-20070507174930-gksqv90l5emjrcyq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-08 14:14:01 +1000
message:
Fix the developer documentation to use the right style sheet and give it its own index. (Robert Collins, Alexander Belchenko)
------------------------------------------------------------
revno: 2476.1.5.1.3
revision-id: robertc at robertcollins.net-20070507174930-gksqv90l5emjrcyq
parent: robertc at robertcollins.net-20070507170412-91hbpdaem8bvel4s
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-08 03:49:30 +1000
message:
Add the performance roadmap rationale.
------------------------------------------------------------
revno: 2476.1.5.1.2
revision-id: robertc at robertcollins.net-20070507170412-91hbpdaem8bvel4s
parent: robertc at robertcollins.net-20070507164814-wpagonutf4b5cf8s
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-08 03:04:12 +1000
message:
NEWS entry for HACKING relocation.
------------------------------------------------------------
revno: 2476.1.5.1.1
revision-id: robertc at robertcollins.net-20070507164814-wpagonutf4b5cf8s
parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-08 02:48:14 +1000
message:
Move HACKING to docs/developers/HACKING and adjust Makefile to accomodate this.
------------------------------------------------------------
revno: 2476.1.8
revision-id: pqm at pqm.ubuntu.com-20070508203256-wcxwdphd1y2psezh
parent: pqm at pqm.ubuntu.com-20070507175017-mvwcdqzq0w4z36lr
parent: john at arbash-meinel.com-20070508200344-p77ycd72josdljry
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-05-08 21:32:56 +0100
message:
(John Arbash Meinel) Merge fixes from 0.16 into bzr.dev and update for 0.17 development
------------------------------------------------------------
revno: 2476.1.7.1.2
revision-id: john at arbash-meinel.com-20070508200344-p77ycd72josdljry
parent: john at arbash-meinel.com-20070508200050-4imwmtzep8fx5v7w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-05-08 15:03:44 -0500
message:
Updates for bzr-0.17-dev
------------------------------------------------------------
revno: 2476.1.7.1.1
revision-id: john at arbash-meinel.com-20070508200050-4imwmtzep8fx5v7w
parent: pqm at pqm.ubuntu.com-20070507175017-mvwcdqzq0w4z36lr
parent: mbp at sourcefrog.net-20070507131140-iajs5she7cy0pbst
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-05-08 15:00:50 -0500
message:
Merge the 0.16 release fixes back into bzr.dev
------------------------------------------------------------
revno: 2476.1.1.1.13
revision-id: mbp at sourcefrog.net-20070507131140-iajs5she7cy0pbst
parent: mbp at sourcefrog.net-20070507131058-7yoc6xajos30hjt0
parent: andrew.bennetts at canonical.com-20070430064224-hagj8m0855p1sxn7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.16-release
timestamp: Mon 2007-05-07 23:11:40 +1000
message:
merge hpss compatibility fix
------------------------------------------------------------
revno: 2476.1.1.1.12
revision-id: mbp at sourcefrog.net-20070507131058-7yoc6xajos30hjt0
parent: mbp at sourcefrog.net-20070507122424-floh4b3kgzg5vgo3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.16-release
timestamp: Mon 2007-05-07 23:10:58 +1000
message:
Preparing 0.16 release
------------------------------------------------------------
revno: 2476.1.1.1.11
revision-id: mbp at sourcefrog.net-20070507122424-floh4b3kgzg5vgo3
parent: mbp at sourcefrog.net-20070507120459-ihx998ls87g6qqon
parent: pqm at pqm.ubuntu.com-20070430073311-say1rwtz3bk8a3rt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Mon 2007-05-07 22:24:24 +1000
message:
Resolve NEWS against 0.16 branch
------------------------------------------------------------
revno: 2463.1.2
revision-id: pqm at pqm.ubuntu.com-20070430073311-say1rwtz3bk8a3rt
parent: mbp at sourcefrog.net-20070426105838-f54z8279m88bl6ea
parent: robertc at robertcollins.net-20070430065822-v91uqhvvn071teqo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.16
timestamp: Mon 2007-04-30 08:33:11 +0100
message:
(robertc) bzr 0.16rc: incorporate the relatively trivial fixes from bzr.dev.
------------------------------------------------------------
revno: 2463.1.1.1.1
revision-id: robertc at robertcollins.net-20070430065822-v91uqhvvn071teqo
parent: mbp at sourcefrog.net-20070426105838-f54z8279m88bl6ea
parent: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.16
timestamp: Mon 2007-04-30 16:58:22 +1000
message:
Merge incremental improvements from bzr.dev to create bzr 0.16rc2
------------------------------------------------------------
revno: 2463.1.1
revision-id: mbp at sourcefrog.net-20070426105838-f54z8279m88bl6ea
parent: pqm at pqm.ubuntu.com-20070426104148-4l5wq2zemlzv0shg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.16-release
timestamp: Thu 2007-04-26 20:58:38 +1000
message:
Prepare 0.16rc1
------------------------------------------------------------
revno: 2476.1.1.1.10
revision-id: mbp at sourcefrog.net-20070507120459-ihx998ls87g6qqon
parent: mbp at sourcefrog.net-20070507120314-a2h78bjezemwyl17
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Mon 2007-05-07 22:04:59 +1000
message:
Note about fixing bug 111968
------------------------------------------------------------
revno: 2476.1.1.1.9
revision-id: mbp at sourcefrog.net-20070507120314-a2h78bjezemwyl17
parent: mbp at sourcefrog.net-20070504105649-fv0fqgrnq5ojvjdl
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Mon 2007-05-07 22:03:14 +1000
message:
Review cleanups from John, mostly docs
------------------------------------------------------------
revno: 2476.1.1.1.8
revision-id: mbp at sourcefrog.net-20070504105649-fv0fqgrnq5ojvjdl
parent: mbp at sourcefrog.net-20070504104131-9zq53xhbxtri3jl3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 20:56:49 +1000
message:
Remove dead parameter
------------------------------------------------------------
revno: 2476.1.1.1.7
revision-id: mbp at sourcefrog.net-20070504104131-9zq53xhbxtri3jl3
parent: mbp at sourcefrog.net-20070504101317-n1h3roy8lv7e06ng
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 20:41:31 +1000
message:
test_transport must provide get_test_permutations
------------------------------------------------------------
revno: 2476.1.1.1.6
revision-id: mbp at sourcefrog.net-20070504101317-n1h3roy8lv7e06ng
parent: mbp at sourcefrog.net-20070504100117-p3bksdrvjjnoz6qi
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 20:13:17 +1000
message:
doc
------------------------------------------------------------
revno: 2476.1.1.1.5
revision-id: mbp at sourcefrog.net-20070504100117-p3bksdrvjjnoz6qi
parent: mbp at sourcefrog.net-20070504095119-sxlhgb1tmxjflj09
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 20:01:17 +1000
message:
More cleanups of Branch.push to get the right behaviour with RemoteBranches
Pass in an _override_hook_source_branch
------------------------------------------------------------
revno: 2476.1.1.1.4
revision-id: mbp at sourcefrog.net-20070504095119-sxlhgb1tmxjflj09
parent: mbp at sourcefrog.net-20070504093112-f1z86tjzulf1lz95
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 19:51:19 +1000
message:
fix up indenting in pformat of inequalities displayed by test suite
------------------------------------------------------------
revno: 2476.1.1.1.3
revision-id: mbp at sourcefrog.net-20070504093112-f1z86tjzulf1lz95
parent: mbp at sourcefrog.net-20070504084639-8v8mzetmr1y74xer
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 19:31:12 +1000
message:
More refactoring of Branch.push into smaller bits
------------------------------------------------------------
revno: 2476.1.1.1.2
revision-id: mbp at sourcefrog.net-20070504084639-8v8mzetmr1y74xer
parent: mbp at sourcefrog.net-20070503080000-joirold1vv0dndgs
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Fri 2007-05-04 18:46:39 +1000
message:
Rename push/pull back to 'run_hooks' (jameinel)
Reorganize Branch.push into some template methods: public push,
_push_with_bound_branches, and _basic_push. This fixes the case
where the destination of push is bound, but the source branch
format doesn't support binding.
Run push and pull hook tests with a local branch that does support binding,
rather than skipping if the branch can't be bound to another of the same
format.
(broken) because the hooks are given the wrong parameters when
pushing into something bound to a remote branch.
------------------------------------------------------------
revno: 2476.1.1.1.1
revision-id: mbp at sourcefrog.net-20070503080000-joirold1vv0dndgs
parent: pqm at pqm.ubuntu.com-20070503064943-wh3ls1tw3q2awye0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: run-hooks
timestamp: Thu 2007-05-03 18:00:00 +1000
message:
Add RemoteBranch repr
------------------------------------------------------------
revno: 2476.1.7
revision-id: pqm at pqm.ubuntu.com-20070507175017-mvwcdqzq0w4z36lr
parent: pqm at pqm.ubuntu.com-20070507134218-nk6vem1ok21xv3yt
parent: robertc at robertcollins.net-20070507165517-xbsjn40to6rw3w5e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-05-07 18:50:17 +0100
message:
(robertc) Trivially update the location of bzrtools in doc/centralized_workflow.txt
------------------------------------------------------------
revno: 2476.1.6.1.1
revision-id: robertc at robertcollins.net-20070507165517-xbsjn40to6rw3w5e
parent: pqm at pqm.ubuntu.com-20070507134218-nk6vem1ok21xv3yt
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2007-05-08 02:55:17 +1000
message:
(robertc) Trivially update the location of bzrtools in doc/centralized_workflow.txt
------------------------------------------------------------
revno: 2476.1.6
revision-id: pqm at pqm.ubuntu.com-20070507134218-nk6vem1ok21xv3yt
parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
parent: andrew.bennetts at canonical.com-20070430064224-hagj8m0855p1sxn7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-05-07 14:42:18 +0100
message:
(robertc) Fix trivial incompatibility with bzr 0.11 servers, which give a slightly different error to bzr 0.15 servers. (Andrew Bennetts)
------------------------------------------------------------
revno: 2471.2.1
revision-id: andrew.bennetts at canonical.com-20070430064224-hagj8m0855p1sxn7
parent: pqm at pqm.ubuntu.com-20070430054416-kl8x12cim7g45lap
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-0.11-compat
timestamp: Mon 2007-04-30 16:42:24 +1000
message:
Fix trivial incompatibility with bzr 0.11 servers, which give a slightly different error to bzr 0.15 servers.
------------------------------------------------------------
revno: 2476.1.5
revision-id: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
parent: pqm at pqm.ubuntu.com-20070503194912-pzlcms91kk2uqfdo
parent: john at arbash-meinel.com-20070503164230-y0411liq6w3bphj0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-05-04 04:45:56 +0100
message:
(John Arbash Meinel) make 'install_bundle' significantly faster by only validating the revisions 1 time, rather than validating all revisions n times.
------------------------------------------------------------
revno: 2476.3.1
revision-id: john at arbash-meinel.com-20070503164230-y0411liq6w3bphj0
parent: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: install_bundle_performance
timestamp: Thu 2007-05-03 11:42:30 -0500
message:
Vastly improve bundle install performance by only validating the bundle one time
-------------- next part --------------
Diff too large for email (2795 lines, the limit is 1000).
More information about the bazaar-commits
mailing list