Rev 2493: Merge trunk in http://sourcefrog.net/bzr/test-cleanup
Martin Pool
mbp at sourcefrog.net
Fri Jun 15 08:01:32 BST 2007
At http://sourcefrog.net/bzr/test-cleanup
------------------------------------------------------------
revno: 2493
revision-id: mbp at sourcefrog.net-20070615070124-clpwqh5gxc4wbf9l
parent: mbp at sourcefrog.net-20070615070005-zazxgg6r00wivdlm
parent: pqm at pqm.ubuntu.com-20070614060745-ywfqw6rm1sgtfx6i
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Fri 2007-06-15 17:01:24 +1000
message:
Merge trunk
added:
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
doc/developers/add.txt add.txt-20070515094933-xhgz3xjc7o0edok0-2
doc/developers/annotate.txt annotate.txt-20070515142136-rq51c4kqhwrjsh8k-1
doc/developers/bundle-creation.txt bundlecreation.rst-20070527173558-rqaqxn1al7vzgcto-1
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
doc/developers/gc.txt gc.txt-20070515102609-90x5kzjokrurfbke-1
doc/developers/initial-push-pull.txt initialpushpull.rst-20070527184539-wodba32mi5dehhct-1
doc/developers/merge-scaling.txt mergescaling.rst-20070527173558-rqaqxn1al7vzgcto-2
doc/developers/performance-commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
doc/developers/revert.txt revert.txt-20070515111013-grc9hgp21zxqbwbl-1
modified:
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/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
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_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_treebuilder.py test_treebuilder.py-20060907214856-4omn6hf1u7fvrart-2
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
contrib/bash/bzr.simple bzr-20050503074841-dfc41af1e02111f9
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
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
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2485.1.43
merged: pqm at pqm.ubuntu.com-20070614060745-ywfqw6rm1sgtfx6i
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
parent: aaron.bentley at utoronto.ca-20070614045948-vcnbho5rhycxiqfy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-14 07:07:45 +0100
message:
'bzr info' gives terse info by default
------------------------------------------------------------
revno: 2363.5.26
merged: aaron.bentley at utoronto.ca-20070614045948-vcnbho5rhycxiqfy
parent: aaron.bentley at utoronto.ca-20070614044335-y0hekgh2n5cjl71q
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Thu 2007-06-14 00:59:48 -0400
message:
fix symbol spelling
------------------------------------------------------------
revno: 2363.5.25
merged: aaron.bentley at utoronto.ca-20070614044335-y0hekgh2n5cjl71q
parent: aaron.bentley at utoronto.ca-20070614043650-q2yb3mo03kcr8l2p
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Thu 2007-06-14 00:43:35 -0400
message:
Update deprecations to 0.18.0
------------------------------------------------------------
revno: 2363.5.24
merged: aaron.bentley at utoronto.ca-20070614043650-q2yb3mo03kcr8l2p
parent: aaron.bentley at utoronto.ca-20070614043127-47fn7yuob130fah4
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Thu 2007-06-14 00:36:50 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2363.5.23
merged: aaron.bentley at utoronto.ca-20070614043127-47fn7yuob130fah4
parent: aaron.bentley at utoronto.ca-20070614041146-p210fux4dby1m2w0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Thu 2007-06-14 00:31:27 -0400
message:
Output 2-tuples from gather_locations
------------------------------------------------------------
revno: 2363.5.22
merged: aaron.bentley at utoronto.ca-20070614041146-p210fux4dby1m2w0
parent: aaron.bentley at utoronto.ca-20070607020329-3pfhv6ftdilrg4k1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Thu 2007-06-14 00:11:46 -0400
message:
Restructure tests
------------------------------------------------------------
revno: 2363.5.21
merged: aaron.bentley at utoronto.ca-20070607020329-3pfhv6ftdilrg4k1
parent: aaron.bentley at utoronto.ca-20070607013651-1l4x30qn3682p5qa
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Wed 2007-06-06 22:03:29 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 2363.5.20
merged: aaron.bentley at utoronto.ca-20070607013651-1l4x30qn3682p5qa
parent: aaron.bentley at utoronto.ca-20070607013358-k4pcjrovznnphsej
parent: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Wed 2007-06-06 21:36:51 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2363.5.19
merged: aaron.bentley at utoronto.ca-20070607013358-k4pcjrovznnphsej
parent: aaron.bentley at utoronto.ca-20070607011620-if7ko3f86lwsmw3j
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Wed 2007-06-06 21:33:58 -0400
message:
Add support for bound branches
------------------------------------------------------------
revno: 2363.5.18
merged: aaron.bentley at utoronto.ca-20070607011620-if7ko3f86lwsmw3j
parent: aaron.bentley at utoronto.ca-20070518183214-b7qfkw9z0ou5egmi
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Wed 2007-06-06 21:16:20 -0400
message:
Get all tests passing
------------------------------------------------------------
revno: 2363.5.17
merged: aaron.bentley at utoronto.ca-20070518183214-b7qfkw9z0ou5egmi
parent: aaron.bentley at utoronto.ca-20070518122206-5h5ys0uva3vh923s
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 19:32:14 +0100
message:
Change separator from '/' to 'or'
------------------------------------------------------------
revno: 2363.5.16
merged: aaron.bentley at utoronto.ca-20070518122206-5h5ys0uva3vh923s
parent: aaron.bentley at utoronto.ca-20070518115653-j8c55wztz4osur1c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 13:22:06 +0100
message:
remove spurious change
------------------------------------------------------------
revno: 2363.5.15
merged: aaron.bentley at utoronto.ca-20070518115653-j8c55wztz4osur1c
parent: aaron.bentley at utoronto.ca-20070518114233-dhywq002d3fi9cti
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 12:56:53 +0100
message:
Update deprecation warnings to 0.17
------------------------------------------------------------
revno: 2363.5.14
merged: aaron.bentley at utoronto.ca-20070518114233-dhywq002d3fi9cti
parent: aaron.bentley at utoronto.ca-20070518100015-o1f5hsghgbsmyf0g
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 12:42:33 +0100
message:
Prevent repository.get_set_default_format from corrupting inventory
------------------------------------------------------------
revno: 2363.5.13
merged: aaron.bentley at utoronto.ca-20070518100015-o1f5hsghgbsmyf0g
parent: aaron.bentley at utoronto.ca-20070518070422-q6va41lpoplqlq5d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 11:00:15 +0100
message:
Fix environment pollution with assertCheckoutDescription
------------------------------------------------------------
revno: 2363.5.12
merged: aaron.bentley at utoronto.ca-20070518070422-q6va41lpoplqlq5d
parent: aaron.bentley at utoronto.ca-20070517232812-9hrv69amzey4g1jh
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 08:04:22 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2363.5.11
merged: aaron.bentley at utoronto.ca-20070517232812-9hrv69amzey4g1jh
parent: aaron.bentley at utoronto.ca-20070514172102-byyl4ldjxhfxvryy
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Fri 2007-05-18 00:28:12 +0100
message:
All info tests pass
------------------------------------------------------------
revno: 2363.5.10
merged: aaron.bentley at utoronto.ca-20070514172102-byyl4ldjxhfxvryy
parent: abentley at panoramicfeedback.com-20070501161136-f5ekbaooom4jhvcv
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: terse-info
timestamp: Mon 2007-05-14 18:21:02 +0100
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2363.5.9
merged: abentley at panoramicfeedback.com-20070501161136-f5ekbaooom4jhvcv
parent: abentley at panoramicfeedback.com-20070321163859-fvqsyhdo6a1d2rws
parent: pqm at pqm.ubuntu.com-20070430223205-x4uyrteryh0230fp
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-05-01 12:11:36 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2363.5.8
merged: abentley at panoramicfeedback.com-20070321163859-fvqsyhdo6a1d2rws
parent: abentley at panoramicfeedback.com-20070320182248-vesy3708ewvcbtln
parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Wed 2007-03-21 12:38:59 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2363.5.7
merged: abentley at panoramicfeedback.com-20070320182248-vesy3708ewvcbtln
parent: abentley at panoramicfeedback.com-20070320181559-gdtotm3er7a0zr0b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 14:22:48 -0400
message:
Make verbose mean what I want
------------------------------------------------------------
revno: 2363.5.6
merged: abentley at panoramicfeedback.com-20070320181559-gdtotm3er7a0zr0b
parent: abentley at panoramicfeedback.com-20070320170416-52zj2nquxn9gea88
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 14:15:59 -0400
message:
Add short format description
------------------------------------------------------------
revno: 2363.5.5
merged: abentley at panoramicfeedback.com-20070320170416-52zj2nquxn9gea88
parent: abentley at panoramicfeedback.com-20070320154925-9bkujrsexgohdxah
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 13:04:16 -0400
message:
add info.describe_format
------------------------------------------------------------
revno: 2363.5.4
merged: abentley at panoramicfeedback.com-20070320154925-9bkujrsexgohdxah
parent: abentley at panoramicfeedback.com-20070320154306-1ipv0q65w7iml1ej
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 11:49:25 -0400
message:
Eliminate the concept of a 'repository lightweight checkout'
------------------------------------------------------------
revno: 2363.5.3
merged: abentley at panoramicfeedback.com-20070320154306-1ipv0q65w7iml1ej
parent: abentley at panoramicfeedback.com-20070320150949-ng8lv3yxi3lkzj7p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 11:43:06 -0400
message:
Add layout description to info output
------------------------------------------------------------
revno: 2363.5.2
merged: abentley at panoramicfeedback.com-20070320150949-ng8lv3yxi3lkzj7p
parent: abentley at panoramicfeedback.com-20070320134949-e3qzzgn391slskml
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 11:09:49 -0400
message:
Implement layout description
------------------------------------------------------------
revno: 2363.5.1
merged: abentley at panoramicfeedback.com-20070320134949-e3qzzgn391slskml
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: terse-info
timestamp: Tue 2007-03-20 09:49:49 -0400
message:
Unify info display into show_component_info
------------------------------------------------------------
revno: 2485.1.42
merged: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
parent: pqm at pqm.ubuntu.com-20070613035912-pvm3sni5chbome9j
parent: aaron.bentley at utoronto.ca-20070613054325-3sma3rfutgyj9ktm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-13 07:16:27 +0100
message:
make profiling information easier to view and better documented (Clatworthy)
------------------------------------------------------------
revno: 2485.1.8.2.11
merged: aaron.bentley at utoronto.ca-20070613054325-3sma3rfutgyj9ktm
parent: abentley at panoramicfeedback.com-20070612181006-kinkxenc2dmgb4lp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-13 01:43:25 -0400
message:
Compensate for brittle requireFeature behavior
------------------------------------------------------------
revno: 2485.1.8.2.10
merged: abentley at panoramicfeedback.com-20070612181006-kinkxenc2dmgb4lp
parent: abentley at panoramicfeedback.com-20070612145707-6ul10rmeln23my4f
parent: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 14:10:06 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2485.1.8.2.9
merged: abentley at panoramicfeedback.com-20070612145707-6ul10rmeln23my4f
parent: abentley at panoramicfeedback.com-20070612145111-yuwn0kkaj0j2csar
parent: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:57:07 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2485.1.8.2.8
merged: abentley at panoramicfeedback.com-20070612145111-yuwn0kkaj0j2csar
parent: abentley at panoramicfeedback.com-20070612144646-li182vnwwb2utpjx
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:51:11 -0400
message:
Convert old lsprof tests to require new LSProf Feature instead of skipping
------------------------------------------------------------
revno: 2485.1.8.2.7
merged: abentley at panoramicfeedback.com-20070612144646-li182vnwwb2utpjx
parent: abentley at panoramicfeedback.com-20070612141350-nk6niovgz6ne2vit
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:46:46 -0400
message:
Add info to --lsprof-file entry in global options
------------------------------------------------------------
revno: 2485.1.8.2.6
merged: abentley at panoramicfeedback.com-20070612141350-nk6niovgz6ne2vit
parent: ian.clatworthy at internode.on.net-20070606115137-iq6sk13d8p356bo8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:13:50 -0400
message:
Make LSProf into a Feature required by the appropriate tests
------------------------------------------------------------
revno: 2485.1.8.2.5
merged: ian.clatworthy at internode.on.net-20070606115137-iq6sk13d8p356bo8
parent: ian.clatworthy at internode.on.net-20070606110604-ou544q3egg7tko88
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-06 21:51:37 +1000
message:
explicit format saving test
------------------------------------------------------------
revno: 2485.1.8.2.4
merged: ian.clatworthy at internode.on.net-20070606110604-ou544q3egg7tko88
parent: ian.clatworthy at internode.on.net-20070606104508-q2i41r4r23xkaebs
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-06 21:06:04 +1000
message:
removed old profiling data saving code from UI layer
------------------------------------------------------------
revno: 2485.1.8.2.3
merged: ian.clatworthy at internode.on.net-20070606104508-q2i41r4r23xkaebs
parent: ian.clatworthy at internode.on.net-20070531045925-jdx7px85ktqxxzox
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-06 20:45:08 +1000
message:
changes requested in jameinel's review incorporated
------------------------------------------------------------
revno: 2485.1.8.2.2
merged: ian.clatworthy at internode.on.net-20070531045925-jdx7px85ktqxxzox
parent: ian.clatworthy at internode.on.net-20070528020825-ytop085jnocvmx3q
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Thu 2007-05-31 14:59:25 +1000
message:
Incorporate feedback from Robert Collins
------------------------------------------------------------
revno: 2485.1.8.2.1
merged: ian.clatworthy at internode.on.net-20070528020825-ytop085jnocvmx3q
parent: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Mon 2007-05-28 12:08:25 +1000
message:
make profiling information easier to view and better documented
------------------------------------------------------------
revno: 2485.1.41
merged: pqm at pqm.ubuntu.com-20070613035912-pvm3sni5chbome9j
parent: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
parent: aaron.bentley at utoronto.ca-20070613030239-yrkk8z0m5me87fpp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-13 04:59:12 +0100
message:
Submitting empty commit
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.23
merged: aaron.bentley at utoronto.ca-20070613030239-yrkk8z0m5me87fpp
parent: abentley at panoramicfeedback.com-20070612162423-vm2vm5kzla75m4a9
parent: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 23:02:39 -0400
message:
Empty commit
------------------------------------------------------------
revno: 2485.1.40
merged: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
parent: pqm at pqm.ubuntu.com-20070612155157-j1juioefu5w946ph
parent: abentley at panoramicfeedback.com-20070612162423-vm2vm5kzla75m4a9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 18:28:39 +0100
message:
Fix botched merge
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.22
merged: abentley at panoramicfeedback.com-20070612162423-vm2vm5kzla75m4a9
parent: abentley at panoramicfeedback.com-20070612162245-uotkgkgozzf5bp9w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 12:24:23 -0400
message:
Redo test skip
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.21
merged: abentley at panoramicfeedback.com-20070612162245-uotkgkgozzf5bp9w
parent: abentley at panoramicfeedback.com-20070612145249-1izjczqhnfp71s9k
parent: abentley at panoramicfeedback.com-20070612162140-vea2zg1sbw6kckic
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 12:22:45 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2485.1.39.1.1
merged: abentley at panoramicfeedback.com-20070612162140-vea2zg1sbw6kckic
parent: pqm at pqm.ubuntu.com-20070612155157-j1juioefu5w946ph
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.dev
timestamp: Tue 2007-06-12 12:21:40 -0400
message:
Revert broken changes
------------------------------------------------------------
revno: 2485.1.39
merged: pqm at pqm.ubuntu.com-20070612155157-j1juioefu5w946ph
parent: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
parent: abentley at panoramicfeedback.com-20070612145249-1izjczqhnfp71s9k
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 16:51:57 +0100
message:
Skip intermittently failing test
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.20
merged: abentley at panoramicfeedback.com-20070612145249-1izjczqhnfp71s9k
parent: abentley at panoramicfeedback.com-20070612134001-7flc9ah94fjd1c0i
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 10:52:49 -0400
message:
Fix skip
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.19
merged: abentley at panoramicfeedback.com-20070612134001-7flc9ah94fjd1c0i
parent: abentley at panoramicfeedback.com-20070607153137-4z29jxet3cgdtokg
parent: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 09:40:01 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.18
merged: abentley at panoramicfeedback.com-20070607153137-4z29jxet3cgdtokg
parent: abentley at panoramicfeedback.com-20070605164300-h5psuzw7j8px7zua
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-06-07 11:31:37 -0400
message:
Skip itermittently-failing test instead of deleting it
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.17
merged: abentley at panoramicfeedback.com-20070605164300-h5psuzw7j8px7zua
parent: abentley at panoramicfeedback.com-20070604185921-xbnqxwypl1junwy3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 12:43:00 -0400
message:
Remove broken test
------------------------------------------------------------
revno: 2485.1.38
merged: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
parent: ian.clatworthy at internode.on.net-20070612043421-jysoks4ytany6l45
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 07:07:27 +0100
message:
prepare for 0.18 development
------------------------------------------------------------
revno: 2485.1.37.1.1
merged: ian.clatworthy at internode.on.net-20070612043421-jysoks4ytany6l45
parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.dev
timestamp: Tue 2007-06-12 14:34:21 +1000
message:
prepare for 0.18 development
------------------------------------------------------------
revno: 2485.1.37
merged: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
parent: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
parent: mbp at sourcefrog.net-20070612014420-kie1j69sqjn8cig0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 03:17:42 +0100
message:
merge init --create-prefix
------------------------------------------------------------
revno: 2485.1.36.1.1
merged: mbp at sourcefrog.net-20070612014420-kie1j69sqjn8cig0
parent: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
parent: d.m.watkins at warwick.ac.uk-20070603214150-uqxz0emixszcj6cz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 56322
timestamp: Tue 2007-06-12 11:44:20 +1000
message:
merge init --create-prefix
------------------------------------------------------------
revno: 2485.1.19.1.4
merged: d.m.watkins at warwick.ac.uk-20070603214150-uqxz0emixszcj6cz
parent: d.m.watkins at warwick.ac.uk-20070603214016-y449vw1v37bv6oxt
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 22:41:50 +0100
message:
Removed TODO relating to create-prefix.
------------------------------------------------------------
revno: 2485.1.19.1.3
merged: d.m.watkins at warwick.ac.uk-20070603214016-y449vw1v37bv6oxt
parent: d.m.watkins at warwick.ac.uk-20070603213950-3e81fuyuxpb9abcc
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 22:40:16 +0100
message:
Implemented --create-prefix for 'init'.
------------------------------------------------------------
revno: 2485.1.19.1.2
merged: d.m.watkins at warwick.ac.uk-20070603213950-3e81fuyuxpb9abcc
parent: d.m.watkins at warwick.ac.uk-20070603204524-no0cjahivzp0txv4
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 22:39:50 +0100
message:
Created tests for adding --create-prefix to 'init'.
------------------------------------------------------------
revno: 2485.1.19.1.1
merged: d.m.watkins at warwick.ac.uk-20070603204524-no0cjahivzp0txv4
parent: pqm at pqm.ubuntu.com-20070602184854-kwqaduxs0b19r76n
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 21:45:24 +0100
message:
Abstracted create_prefix code from the class 'cmd_push' to the function '_create_prefix' (both in builtins.py).
------------------------------------------------------------
revno: 2485.1.36
merged: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
parent: john at arbash-meinel.com-20070611232340-paq4xaycao04vkcd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 01:09:24 +0100
message:
(John Arbash Meinel, Aaron Bentley) Fix bug #115343 allowing 'bzr branch' to sprout any revision in the repository.
------------------------------------------------------------
revno: 2485.1.2.2.7
merged: john at arbash-meinel.com-20070611232340-paq4xaycao04vkcd
parent: aaron.bentley at utoronto.ca-20070611010812-u55krk2l4pnv86fs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-06-11 18:23:40 -0500
message:
Fix NEWS to put _iter_changes fixes in right location.
------------------------------------------------------------
revno: 2485.1.2.2.6
merged: aaron.bentley at utoronto.ca-20070611010812-u55krk2l4pnv86fs
parent: aaron.bentley at utoronto.ca-20070611010616-23ypxhz3zekrck7y
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fix-115343
timestamp: Sun 2007-06-10 21:08:12 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2485.1.2.2.5
merged: aaron.bentley at utoronto.ca-20070611010616-23ypxhz3zekrck7y
parent: aaron.bentley at utoronto.ca-20070611010119-8aayeoi2l6d0si36
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fix-115343
timestamp: Sun 2007-06-10 21:06:16 -0400
message:
Tweak NEWS
------------------------------------------------------------
revno: 2485.1.2.2.4
merged: aaron.bentley at utoronto.ca-20070611010119-8aayeoi2l6d0si36
parent: john at arbash-meinel.com-20070521170258-206ck4nmijfode31
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fix-115343
timestamp: Sun 2007-06-10 21:01:19 -0400
message:
Add test to ensure we can branch from repository revisions
------------------------------------------------------------
revno: 2485.1.2.2.3
merged: john at arbash-meinel.com-20070521170258-206ck4nmijfode31
parent: john at arbash-meinel.com-20070521164413-tp0zcdi51i5dxkv2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_from_merged_115343
timestamp: Mon 2007-05-21 19:02:58 +0200
message:
Fix bug #115343, Add a test that we can branch any revision in our ancestry.
And update Branch6 to support this properly.
------------------------------------------------------------
revno: 2485.1.2.2.2
merged: john at arbash-meinel.com-20070521164413-tp0zcdi51i5dxkv2
parent: john at arbash-meinel.com-20070521151804-dgnr0rfe2j9brq1m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_from_merged_115343
timestamp: Mon 2007-05-21 18:44:13 +0200
message:
Adding a simple sprout test to make sure it creates the target branch with the right format
------------------------------------------------------------
revno: 2485.1.2.2.1
merged: john at arbash-meinel.com-20070521151804-dgnr0rfe2j9brq1m
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_from_merged_115343
timestamp: Mon 2007-05-21 17:18:04 +0200
message:
Move the Branch.sprout tests into their own folder.
------------------------------------------------------------
revno: 2485.1.35
merged: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
parent: pqm at pqm.ubuntu.com-20070608032544-x774g5cn0yh8a42p
parent: ian.clatworthy at internode.on.net-20070606140614-yp66v5i1gm5kruqp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-08 14:43:40 +0100
message:
(Ian Clatworthy, r=john) 'branch lp:projname' now creates ./projname as expected
------------------------------------------------------------
revno: 2485.1.27.4.1
merged: ian.clatworthy at internode.on.net-20070606140614-yp66v5i1gm5kruqp
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.branch-lp-ui
timestamp: Thu 2007-06-07 00:06:14 +1000
message:
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
------------------------------------------------------------
revno: 2485.1.34
merged: pqm at pqm.ubuntu.com-20070608032544-x774g5cn0yh8a42p
parent: pqm at pqm.ubuntu.com-20070607233523-rrkkcg7n2ks0zi18
parent: andrew.bennetts at canonical.com-20070608024719-g3ewkke9l20ts0g9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-08 04:25:44 +0100
message:
(Andrew Bennetts) Developer documentation for the propsed container format.
------------------------------------------------------------
revno: 2485.1.14.4.4
merged: andrew.bennetts at canonical.com-20070608024719-g3ewkke9l20ts0g9
parent: andrew.bennetts at canonical.com-20070607064153-z6sap26og3pbxxrl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Fri 2007-06-08 12:47:19 +1000
message:
Typos and clarfications thanks to Aaron.
------------------------------------------------------------
revno: 2485.1.14.4.3
merged: andrew.bennetts at canonical.com-20070607064153-z6sap26og3pbxxrl
parent: andrew.bennetts at canonical.com-20070607040810-7aeblrfw0sl41mun
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Thu 2007-06-07 16:41:53 +1000
message:
Updates in response to feedback on mailing list and in person.
------------------------------------------------------------
revno: 2485.1.14.4.2
merged: andrew.bennetts at canonical.com-20070607040810-7aeblrfw0sl41mun
parent: andrew.bennetts at canonical.com-20070601074703-5z2fps5c8c7c6bjp
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Thu 2007-06-07 14:08:10 +1000
message:
Use standard heading markers.
------------------------------------------------------------
revno: 2485.1.14.4.1
merged: andrew.bennetts at canonical.com-20070601074703-5z2fps5c8c7c6bjp
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Fri 2007-06-01 17:47:03 +1000
message:
First draft of container format developer doc, based on discussion with Robert.
------------------------------------------------------------
revno: 2485.1.33
merged: pqm at pqm.ubuntu.com-20070607233523-rrkkcg7n2ks0zi18
parent: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
parent: john at arbash-meinel.com-20070607223144-u4oljlajcvq6by2n
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-08 00:35:23 +0100
message:
(John Arbash Meinel) Fix bug #115947, set_state_from_inventory needs to watch out for certain paths.
------------------------------------------------------------
revno: 2485.1.2.1.3
merged: john at arbash-meinel.com-20070607223144-u4oljlajcvq6by2n
parent: john at arbash-meinel.com-20070521113638-3gnfdxspxklyv8bb
parent: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_set_state_from_inv_115947
timestamp: Thu 2007-06-07 17:31:44 -0500
message:
[merge] bzr.dev 2517
------------------------------------------------------------
revno: 2485.1.2.1.2
merged: john at arbash-meinel.com-20070521113638-3gnfdxspxklyv8bb
parent: john at arbash-meinel.com-20070521112814-156v4tp2oyya2oqb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_set_state_from_inv_115947
timestamp: Mon 2007-05-21 13:36:38 +0200
message:
Fix bug #115947, DirState.set_state_from_inventory() needs to iterate in
the correct order when there are common prefixes.
------------------------------------------------------------
revno: 2485.1.2.1.1
merged: john at arbash-meinel.com-20070521112814-156v4tp2oyya2oqb
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_set_state_from_inv_115947
timestamp: Mon 2007-05-21 13:28:14 +0200
message:
Adding a (broken) test that set_state_from_inventory works
when a record is deleted from a directory which has a sibling directory with a common prefix.
------------------------------------------------------------
revno: 2485.1.32
merged: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
parent: pqm at pqm.ubuntu.com-20070607132155-dn02612f4o14a1no
parent: abentley at panoramicfeedback.com-20070607125547-hm8sfjmq69p1e8s8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-07 14:50:16 +0100
message:
Update tutorial text (Matthew Fuller)
------------------------------------------------------------
revno: 2485.1.10.2.5
merged: abentley at panoramicfeedback.com-20070607125547-hm8sfjmq69p1e8s8
parent: abentley at panoramicfeedback.com-20070607125251-hd7pueyh1exfvu4b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.docs
timestamp: Thu 2007-06-07 08:55:47 -0400
message:
Zap trailing whitespace
------------------------------------------------------------
revno: 2485.1.10.2.4
merged: abentley at panoramicfeedback.com-20070607125251-hd7pueyh1exfvu4b
parent: abentley at panoramicfeedback.com-20070607125207-8ss1ncu3m88fgfqm
parent: fullermd at over-yonder.net-20070606095255-zogzpvrnhh5su387
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.docs
timestamp: Thu 2007-06-07 08:52:51 -0400
message:
Update tutorial text (Matthew Fuller)
------------------------------------------------------------
revno: 2485.1.10.4.14
merged: fullermd at over-yonder.net-20070606095255-zogzpvrnhh5su387
parent: fullermd at over-yonder.net-20070606094841-btejyqo11l309q1j
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:52:55 -0500
message:
Be more consistent about using `` around options and filenames.
------------------------------------------------------------
revno: 2485.1.10.4.13
merged: fullermd at over-yonder.net-20070606094841-btejyqo11l309q1j
parent: fullermd at over-yonder.net-20070606094702-k1ney72w3wktv3ev
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:48:41 -0500
message:
$BZREMAIL has been spelt $BZR_EMAIL for almost a year now, so it's
probably time to tell the tutorial about it...
------------------------------------------------------------
revno: 2485.1.10.4.12
merged: fullermd at over-yonder.net-20070606094702-k1ney72w3wktv3ev
parent: fullermd at over-yonder.net-20070606093909-stozkguj77gorg94
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:47:02 -0500
message:
Adjust some stuff on the Introducing Yourself section so that it
literal's and blockquote's properly.
------------------------------------------------------------
revno: 2485.1.10.4.11
merged: fullermd at over-yonder.net-20070606093909-stozkguj77gorg94
parent: fullermd at over-yonder.net-20070606093102-icchoupo52p6eiyq
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:39:09 -0500
message:
Use `` instead of ` around a bunch of options and env variable namings
when talking about editor settings.
------------------------------------------------------------
revno: 2485.1.10.4.10
merged: fullermd at over-yonder.net-20070606093102-icchoupo52p6eiyq
parent: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:31:02 -0500
message:
Be consistent about using `` instead of ** around commands.
There are some places that command _names_ are left in **'s, on the
theory that they're really describing concepts rather than commands.
------------------------------------------------------------
revno: 2485.1.10.2.3
merged: abentley at panoramicfeedback.com-20070607125207-8ss1ncu3m88fgfqm
parent: aaron.bentley at utoronto.ca-20070527184754-p0w83p0v54ejks8s
parent: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.docs
timestamp: Thu 2007-06-07 08:52:07 -0400
message:
merge from bzr.dev
------------------------------------------------------------
revno: 2485.1.31
merged: pqm at pqm.ubuntu.com-20070607132155-dn02612f4o14a1no
parent: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
parent: abentley at panoramicfeedback.com-20070607124900-fs2sa702jkh7mgoo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-07 14:21:55 +0100
message:
Tests don't fail when BZR_REMOTE_PATH is set. (Daniel Watkins, #111958)
------------------------------------------------------------
revno: 2485.1.30.1.1
merged: abentley at panoramicfeedback.com-20070607124900-fs2sa702jkh7mgoo
parent: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
parent: d.m.watkins at warwick.ac.uk-20070606232052-rnhuzphraoztizol
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2007-06-07 08:49:00 -0400
message:
Tests don't fail when BZR_REMOTE_PATH is set. (Daniel Watkins, #111958)
------------------------------------------------------------
revno: 2485.1.27.3.2
merged: d.m.watkins at warwick.ac.uk-20070606232052-rnhuzphraoztizol
parent: d.m.watkins at warwick.ac.uk-20070606231655-d3ou86x6bjan2g5j
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111958
timestamp: Thu 2007-06-07 00:20:52 +0100
message:
Updated NEWS to reflect bug fix.
------------------------------------------------------------
revno: 2485.1.27.3.1
merged: d.m.watkins at warwick.ac.uk-20070606231655-d3ou86x6bjan2g5j
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111958
timestamp: Thu 2007-06-07 00:16:55 +0100
message:
Added BZR_REMOTE_PATH to the list of environment variables cleaned before running tests, fixing bug #111958.
------------------------------------------------------------
revno: 2485.1.30
merged: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
parent: pqm at pqm.ubuntu.com-20070606201738-u5pu5rxhdoyehimv
parent: aaron.bentley at utoronto.ca-20070606235207-3pu0d9xsweqlxt55
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-07 01:21:24 +0100
message:
Various fixes for revision-info (Metthew Fuller)
------------------------------------------------------------
revno: 2485.1.29.1.1
merged: aaron.bentley at utoronto.ca-20070606235207-3pu0d9xsweqlxt55
parent: pqm at pqm.ubuntu.com-20070606201738-u5pu5rxhdoyehimv
parent: fullermd at over-yonder.net-20070606113402-gyuk793gumqrfjrm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Wed 2007-06-06 19:52:07 -0400
message:
Various fixes for revision-info (Metthew Fuller)
------------------------------------------------------------
revno: 2485.1.27.2.4
merged: fullermd at over-yonder.net-20070606113402-gyuk793gumqrfjrm
parent: fullermd at over-yonder.net-20070606105410-b7gb18p3qw8vrzk8
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 06:34:02 -0500
message:
Rewrite revision-info blackbox tests to test:
- Support for dotted revnos
- Defaulting to head of branch if no rev given
- Functioning without working tree
------------------------------------------------------------
revno: 2485.1.27.2.3
merged: fullermd at over-yonder.net-20070606105410-b7gb18p3qw8vrzk8
parent: fullermd at over-yonder.net-20070606104510-75dot0o1k4n396ju
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 05:54:10 -0500
message:
Default revision-info to the head of the branch when no revision is
given.
------------------------------------------------------------
revno: 2485.1.27.2.2
merged: fullermd at over-yonder.net-20070606104510-75dot0o1k4n396ju
parent: fullermd at over-yonder.net-20070606102332-i7n2yh30rh8noob7
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 05:45:10 -0500
message:
Update revision-info to show dotted revnos.
------------------------------------------------------------
revno: 2485.1.27.2.1
merged: fullermd at over-yonder.net-20070606102332-i7n2yh30rh8noob7
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 05:23:32 -0500
message:
revision-info has no call to need a WorkingTree, so don't demand one.
------------------------------------------------------------
revno: 2485.1.29
merged: pqm at pqm.ubuntu.com-20070606201738-u5pu5rxhdoyehimv
parent: pqm at pqm.ubuntu.com-20070606144200-rmsd3gyelimh8kal
parent: john at arbash-meinel.com-20070606194439-q12591hd09d4cv1g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 21:17:38 +0100
message:
(Antonin 'gree' Komenda) simple update for bash completion.
------------------------------------------------------------
revno: 2485.1.27.1.1
merged: john at arbash-meinel.com-20070606194439-q12591hd09d4cv1g
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
parent: gree at grees.net-20070514122826-9ble6v16x6ni6rzz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-06-06 14:44:39 -0500
message:
(Antonin 'gree' Komenda) simple update for bash completion.
------------------------------------------------------------
revno: 2485.6.1
merged: gree at grees.net-20070514122826-9ble6v16x6ni6rzz
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: gree <gree at grees.net>
branch nick: bzr.grees
timestamp: Mon 2007-05-14 14:28:26 +0200
message:
bash completion - fixed simple completion (don't include textual info about command into completion)
------------------------------------------------------------
revno: 2485.1.28
merged: pqm at pqm.ubuntu.com-20070606144200-rmsd3gyelimh8kal
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
parent: ian.clatworthy at internode.on.net-20070606061745-e5zl32uwku409wca
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 15:42:00 +0100
message:
(Ian Clatworthy) Improve 'bzr commit' time by removing some lock and dirstate._validate() calls
------------------------------------------------------------
revno: 2485.1.26.1.4
merged: ian.clatworthy at internode.on.net-20070606061745-e5zl32uwku409wca
parent: ian.clatworthy at internode.on.net-20070606061158-zbwatmjd2m1p474g
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 16:17:45 +1000
message:
updated NEWS and added commit performance notes to doc/developers
------------------------------------------------------------
revno: 2485.1.26.1.3
merged: ian.clatworthy at internode.on.net-20070606061158-zbwatmjd2m1p474g
parent: ian.clatworthy at internode.on.net-20070606060745-xchfmk7d9vckgy3r
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 16:11:58 +1000
message:
remove implicit read locks for kind() and is_executable() in wt4
------------------------------------------------------------
revno: 2485.1.26.1.2
merged: ian.clatworthy at internode.on.net-20070606060745-xchfmk7d9vckgy3r
parent: ian.clatworthy at internode.on.net-20070606055603-monl116zotkbqn2y
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 16:07:45 +1000
message:
remove calls to dirstate._validate() that shouldn't be on production code
------------------------------------------------------------
revno: 2485.1.26.1.1
merged: ian.clatworthy at internode.on.net-20070606055603-monl116zotkbqn2y
parent: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 15:56:03 +1000
message:
commit.py clean-up including logging just to stderr, not bzr.log
------------------------------------------------------------
revno: 2485.1.27
merged: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
parent: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
parent: bialix at ukr.net-20070606075700-fefq7kluy10inv0m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 09:37:14 +0100
message:
(bialix,r=john,r=aaron) sanitize dev docs (performance-roadmap) &
win32 installers improvements
------------------------------------------------------------
revno: 2485.1.21.1.4
merged: bialix at ukr.net-20070606075700-fefq7kluy10inv0m
parent: bialix at ukr.net-20070606074514-qq7bxr0x2uj8c5c2
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Wed 2007-06-06 10:57:00 +0300
message:
pack developers docs to windows installers
------------------------------------------------------------
revno: 2485.1.21.1.3
merged: bialix at ukr.net-20070606074514-qq7bxr0x2uj8c5c2
parent: bialix at ukr.net-20070606071152-a2jaa16xqvu92teg
parent: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Wed 2007-06-06 10:45:14 +0300
message:
merge bzr.dev; fix ReST formatting in planned-performance-changes.txt
------------------------------------------------------------
revno: 2485.1.21.1.2
merged: bialix at ukr.net-20070606071152-a2jaa16xqvu92teg
parent: bialix at ukr.net-20070605080204-hvhqw69njlpxcscb
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Wed 2007-06-06 10:11:52 +0300
message:
better wording suggested by John Meinel
------------------------------------------------------------
revno: 2485.1.21.1.1
merged: bialix at ukr.net-20070605080204-hvhqw69njlpxcscb
parent: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Tue 2007-06-05 11:02:04 +0300
message:
sanitize developers docs
------------------------------------------------------------
revno: 2485.1.26
merged: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
parent: pqm at pqm.ubuntu.com-20070606043217-jlt8hu49sk54tsag
parent: aaron.bentley at utoronto.ca-20070606041017-c8wds05ilv5jokkz
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 06:00:06 +0100
message:
Update style of TreeTransform._rename_in_limbo
------------------------------------------------------------
revno: 2485.1.17.1.14
merged: aaron.bentley at utoronto.ca-20070606041017-c8wds05ilv5jokkz
parent: aaron.bentley at utoronto.ca-20070606012818-ubf8cmaj1imntttb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Wed 2007-06-06 00:10:17 -0400
message:
Style update suggested by Robert
------------------------------------------------------------
revno: 2485.1.25
merged: pqm at pqm.ubuntu.com-20070606043217-jlt8hu49sk54tsag
parent: pqm at pqm.ubuntu.com-20070606022703-i49zqzf2wa4kq7fr
parent: aaron.bentley at utoronto.ca-20070606015055-h01xm6jeddm630up
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 05:32:17 +0100
message:
Don't crash on merging renames of deleted files (#110279)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.15.1.3
merged: aaron.bentley at utoronto.ca-20070606015055-h01xm6jeddm630up
parent: aaron.bentley at utoronto.ca-20070606010725-cusa72npg70khhkk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 21:50:55 -0400
message:
Rename test case
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.15.1.2
merged: aaron.bentley at utoronto.ca-20070606010725-cusa72npg70khhkk
parent: aaron.bentley at utoronto.ca-20070606010518-kmhq36e8pomuzio7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 21:07:25 -0400
message:
Don't crash on merging renamed deleted files (#110279)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.15.1.1
merged: aaron.bentley at utoronto.ca-20070606010518-kmhq36e8pomuzio7
parent: abentley at panoramicfeedback.com-20070524153619-o4ici00lpcmbshiw
parent: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 21:05:18 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2485.1.24
merged: pqm at pqm.ubuntu.com-20070606022703-i49zqzf2wa4kq7fr
parent: pqm at pqm.ubuntu.com-20070606015859-rwlz810cte7l1row
parent: aaron.bentley at utoronto.ca-20070606012818-ubf8cmaj1imntttb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 03:27:03 +0100
message:
Cancelling directories with cancelled children works correctly
------------------------------------------------------------
revno: 2485.1.17.1.13
merged: aaron.bentley at utoronto.ca-20070606012818-ubf8cmaj1imntttb
parent: aaron.bentley at utoronto.ca-20070605223321-69qk2lxdg9d554at
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 21:28:18 -0400
message:
Updates from review
------------------------------------------------------------
revno: 2485.1.17.1.12
merged: aaron.bentley at utoronto.ca-20070605223321-69qk2lxdg9d554at
parent: abentley at panoramicfeedback.com-20070605161922-0j7x00tazfnh5zf1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 18:33:21 -0400
message:
Avoid renaming children with no content
------------------------------------------------------------
revno: 2485.1.23
merged: pqm at pqm.ubuntu.com-20070606015859-rwlz810cte7l1row
parent: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
parent: robertc at robertcollins.net-20070606010722-21uhn0868sm5m2he
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 02:58:59 +0100
message:
(robertc) Create the top level changes-list from the London sprint for reference.
------------------------------------------------------------
revno: 2485.1.22.1.1
merged: robertc at robertcollins.net-20070606010722-21uhn0868sm5m2he
parent: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
parent: robertc at robertcollins.net-20070606010158-aqtdldnzo5bj5z74
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-06-06 11:07:22 +1000
message:
(robertc) Create the top level changes-list from the London sprint for reference.
------------------------------------------------------------
revno: 2485.5.10
merged: robertc at robertcollins.net-20070606010158-aqtdldnzo5bj5z74
parent: robertc at robertcollins.net-20070604053802-cx9toxyasgfip83n
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Wed 2007-06-06 11:01:58 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2485.5.9
merged: robertc at robertcollins.net-20070604053802-cx9toxyasgfip83n
parent: robertc at robertcollins.net-20070604040720-c5ti0k49w0ye8zcl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Mon 2007-06-04 15:38:02 +1000
message:
Create the top level changes-list from the London sprint for reference.
------------------------------------------------------------
revno: 2485.1.22
merged: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
parent: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
parent: abentley at panoramicfeedback.com-20070605161922-0j7x00tazfnh5zf1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-05 17:48:10 +0100
message:
Optimize TreeTransform to avoid renames where possible
------------------------------------------------------------
revno: 2485.1.17.1.11
merged: abentley at panoramicfeedback.com-20070605161922-0j7x00tazfnh5zf1
parent: abentley at panoramicfeedback.com-20070605161828-5spb276vsp8fxjx8
parent: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 12:19:22 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2485.1.17.1.10
merged: abentley at panoramicfeedback.com-20070605161828-5spb276vsp8fxjx8
parent: abentley at panoramicfeedback.com-20070605154520-kw4foazx2ayumzpr
parent: aaron.bentley at utoronto.ca-20070603220035-p9mqj3zzus8ew1bz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 12:18:28 -0400
message:
Merge NEWS
------------------------------------------------------------
revno: 2485.1.17.1.5.1.2
merged: aaron.bentley at utoronto.ca-20070603220035-p9mqj3zzus8ew1bz
parent: aaron.bentley at utoronto.ca-20070603215101-oljwf5m6fen1s6q1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 18:00:35 -0400
message:
Fix NEWS
------------------------------------------------------------
revno: 2485.1.17.1.5.1.1
merged: aaron.bentley at utoronto.ca-20070603215101-oljwf5m6fen1s6q1
parent: aaron.bentley at utoronto.ca-20070603163308-r6el1wy9cvj9h6h2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 17:51:01 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 2485.1.17.1.9
merged: abentley at panoramicfeedback.com-20070605154520-kw4foazx2ayumzpr
parent: abentley at panoramicfeedback.com-20070605141443-wb5xay9e02lnzk76
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 11:45:20 -0400
message:
Add additional test for no-name contents
------------------------------------------------------------
revno: 2485.1.17.1.8
merged: abentley at panoramicfeedback.com-20070605141443-wb5xay9e02lnzk76
parent: abentley at panoramicfeedback.com-20070604170453-eo9440menna0peju
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 10:14:43 -0400
message:
Updates from review comments
------------------------------------------------------------
revno: 2485.1.17.1.7
merged: abentley at panoramicfeedback.com-20070604170453-eo9440menna0peju
parent: abentley at panoramicfeedback.com-20070604165336-ehy5ckbw9dtbpb78
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Mon 2007-06-04 13:04:53 -0400
message:
Fix finalize deletion ordering
------------------------------------------------------------
revno: 2485.1.17.1.6
merged: abentley at panoramicfeedback.com-20070604165336-ehy5ckbw9dtbpb78
parent: aaron.bentley at utoronto.ca-20070603163308-r6el1wy9cvj9h6h2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Mon 2007-06-04 12:53:36 -0400
message:
Update from review comments
------------------------------------------------------------
revno: 2485.1.17.1.5
merged: aaron.bentley at utoronto.ca-20070603163308-r6el1wy9cvj9h6h2
parent: aaron.bentley at utoronto.ca-20070603155659-rimfmfeyw7zgbgzm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 12:33:08 -0400
message:
Cleanup
------------------------------------------------------------
revno: 2485.1.17.1.4
merged: aaron.bentley at utoronto.ca-20070603155659-rimfmfeyw7zgbgzm
parent: aaron.bentley at utoronto.ca-20070603041408-j30fz6nncfm9vgtr
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 11:56:59 -0400
message:
Ensure we only reuse limbo names appropriately
------------------------------------------------------------
revno: 2485.1.17.1.3
merged: aaron.bentley at utoronto.ca-20070603041408-j30fz6nncfm9vgtr
parent: aaron.bentley at utoronto.ca-20070602154854-dxx6c0hbjm2h1jel
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 00:14:08 -0400
message:
Don't cause errors when creating contents for trans_ids with no parent/name
------------------------------------------------------------
revno: 2485.1.17.1.2
merged: aaron.bentley at utoronto.ca-20070602154854-dxx6c0hbjm2h1jel
parent: aaron.bentley at utoronto.ca-20070602000645-51h5g95v86g8305g
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sat 2007-06-02 11:48:54 -0400
message:
Make the limited-renames functionality safer in the general case
------------------------------------------------------------
revno: 2485.1.17.1.1
merged: aaron.bentley at utoronto.ca-20070602000645-51h5g95v86g8305g
parent: pqm at pqm.ubuntu.com-20070601221655-eeiryluirj5h73hp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Fri 2007-06-01 20:06:45 -0400
message:
Ensure renames only root children are renamed when building trees
------------------------------------------------------------
revno: 2485.1.21
merged: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
parent: pqm at pqm.ubuntu.com-20070604062925-0a2e6fvr3qpfngzo
parent: abentley at panoramicfeedback.com-20070604185921-xbnqxwypl1junwy3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-04 20:45:35 +0100
message:
Fix workingtree.remove with tree references
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.16
merged: abentley at panoramicfeedback.com-20070604185921-xbnqxwypl1junwy3
parent: abentley at panoramicfeedback.com-20070524153619-o4ici00lpcmbshiw
parent: pqm at pqm.ubuntu.com-20070604062925-0a2e6fvr3qpfngzo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-06-04 14:59:21 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.15
merged: abentley at panoramicfeedback.com-20070524153619-o4ici00lpcmbshiw
parent: abentley at panoramicfeedback.com-20070524150452-sifbv1wlrjnlw1zx
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-05-24 11:36:19 -0400
message:
Remove redundant listdir
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.14
merged: abentley at panoramicfeedback.com-20070524150452-sifbv1wlrjnlw1zx
parent: abentley at panoramicfeedback.com-20070524150356-218vhkzsxubtzikd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-05-24 11:04:52 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.13
merged: abentley at panoramicfeedback.com-20070524150356-218vhkzsxubtzikd
parent: abentley at panoramicfeedback.com-20070524150109-is07n3xarwa63736
parent: pqm at pqm.ubuntu.com-20070524130959-7zpl03vgx35bezhf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-05-24 11:03:56 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.12
merged: abentley at panoramicfeedback.com-20070524150109-is07n3xarwa63736
parent: aaron.bentley at utoronto.ca-20070524121941-p1ch5bu1bvm6qn72
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-05-24 11:01:09 -0400
message:
Stop using inventory directly in WorkingTree.remove
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.11
merged: aaron.bentley at utoronto.ca-20070524121941-p1ch5bu1bvm6qn72
parent: aaron.bentley at utoronto.ca-20070523113246-8z2a83w2qxnhxxr8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-05-24 08:19:41 -0400
message:
Bugfix WorkingTree.remove to handle subtrees, and non-cwd trees
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.10
merged: aaron.bentley at utoronto.ca-20070523113246-8z2a83w2qxnhxxr8
parent: aaron.bentley at utoronto.ca-20070521141436-x3aw0x8tksw2yu0e
parent: pqm at pqm.ubuntu.com-20070523095110-bqaodkh3q7v0fime
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-05-23 07:32:46 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2485.1.20
merged: pqm at pqm.ubuntu.com-20070604062925-0a2e6fvr3qpfngzo
parent: pqm at pqm.ubuntu.com-20070602184854-kwqaduxs0b19r76n
parent: robertc at robertcollins.net-20070604040720-c5ti0k49w0ye8zcl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-06-04 07:29:25 +0100
message:
(robertc) More London sprint documentation
------------------------------------------------------------
revno: 2485.5.8
merged: robertc at robertcollins.net-20070604040720-c5ti0k49w0ye8zcl
parent: robertc at robertcollins.net-20070604033948-erld0bugxcbo62gf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Mon 2007-06-04 14:07:20 +1000
message:
Note that multiparent deltas affect merge to, from the mailing list review discussion.
------------------------------------------------------------
revno: 2485.5.7
merged: robertc at robertcollins.net-20070604033948-erld0bugxcbo62gf
parent: robertc at robertcollins.net-20070604005154-yvx2q8jnwiprw6du
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Mon 2007-06-04 13:39:48 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2485.5.6
merged: robertc at robertcollins.net-20070604005154-yvx2q8jnwiprw6du
parent: robertc at robertcollins.net-20070518181212-acujb9ai3r3ds8s3
parent: pqm at pqm.ubuntu.com-20070602184854-kwqaduxs0b19r76n
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Mon 2007-06-04 10:51:54 +1000
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2485.5.5
merged: robertc at robertcollins.net-20070518181212-acujb9ai3r3ds8s3
parent: robertc at robertcollins.net-20070515143142-1u0xo65hyhewgkyw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Sat 2007-05-19 04:12:12 +1000
message:
Incremental push-pull notes.
------------------------------------------------------------
revno: 2485.5.4
merged: robertc at robertcollins.net-20070515143142-1u0xo65hyhewgkyw
parent: robertc at robertcollins.net-20070515112623-rb3uq4tern5lsn6l
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Wed 2007-05-16 00:31:42 +1000
message:
Add annotate roadmap.
------------------------------------------------------------
revno: 2485.5.3
merged: robertc at robertcollins.net-20070515112623-rb3uq4tern5lsn6l
parent: robertc at robertcollins.net-20070515102628-j2e0lgz5k42ckyzh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-15 21:26:23 +1000
message:
Add revert analysis.
------------------------------------------------------------
revno: 2485.5.2
merged: robertc at robertcollins.net-20070515102628-j2e0lgz5k42ckyzh
parent: robertc at robertcollins.net-20070515094946-9nrohtlybz2i5jt9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-15 20:26:28 +1000
message:
Add gc analysis
------------------------------------------------------------
revno: 2485.5.1
merged: robertc at robertcollins.net-20070515094946-9nrohtlybz2i5jt9
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Tue 2007-05-15 19:49:46 +1000
message:
add analysis
------------------------------------------------------------
revno: 2485.1.19
merged: pqm at pqm.ubuntu.com-20070602184854-kwqaduxs0b19r76n
parent: pqm at pqm.ubuntu.com-20070601231018-i374u1n4yt6rpg7x
parent: john at arbash-meinel.com-20070530184026-h7b0okqaito0oquy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-06-02 19:48:54 +0100
message:
(Andrew Bennetts) 'make check' builds docs as well
------------------------------------------------------------
revno: 2485.1.10.5.1
merged: john at arbash-meinel.com-20070530184026-h7b0okqaito0oquy
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
parent: andrew.bennetts at canonical.com-20070412130325-56c9kdg18lvpj02g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: check-docs
timestamp: Wed 2007-05-30 13:40:26 -0500
message:
(Andrew Bennetts) 'make check' builds docs as well
------------------------------------------------------------
revno: 2411.1.1
merged: andrew.bennetts at canonical.com-20070412130325-56c9kdg18lvpj02g
parent: pqm at pqm.ubuntu.com-20070412095902-nen3rbeeppe9yrz0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: check-makes-docs
timestamp: Thu 2007-04-12 23:03:25 +1000
message:
Make 'make check' depend on docs building without error.
------------------------------------------------------------
revno: 2485.1.18
merged: pqm at pqm.ubuntu.com-20070601231018-i374u1n4yt6rpg7x
parent: pqm at pqm.ubuntu.com-20070601221655-eeiryluirj5h73hp
parent: john at arbash-meinel.com-20070601214045-zalht5mx39yg11l6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-06-02 00:10:18 +0100
message:
(John Arbash Meinel) add [merge] for short log messages
------------------------------------------------------------
revno: 2483.2.5
merged: john at arbash-meinel.com-20070601214045-zalht5mx39yg11l6
parent: john at arbash-meinel.com-20070508220459-wvpmol3nkg91j5e6
parent: pqm at pqm.ubuntu.com-20070601212622-4hy742yfww9270dw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Fri 2007-06-01 16:40:45 -0500
message:
[merge] bzr.dev 2501
------------------------------------------------------------
revno: 2483.2.4
merged: john at arbash-meinel.com-20070508220459-wvpmol3nkg91j5e6
parent: john at arbash-meinel.com-20070508220207-yvs5og03igv48k5g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Tue 2007-05-08 17:04:59 -0500
message:
Update NEWS to include a reference to bug #83887
(which is actually a minor feature request)
------------------------------------------------------------
revno: 2483.2.3
merged: john at arbash-meinel.com-20070508220207-yvs5og03igv48k5g
parent: john at arbash-meinel.com-20070508201017-w968czcnrzvjttze
parent: pqm at pqm.ubuntu.com-20070508203256-wcxwdphd1y2psezh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Tue 2007-05-08 17:02:07 -0500
message:
[merge] bzr.dev 2484
------------------------------------------------------------
revno: 2483.2.2
merged: john at arbash-meinel.com-20070508201017-w968czcnrzvjttze
parent: john at arbash-meinel.com-20070508193100-64xg2gv8oc40tiri
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Tue 2007-05-08 15:10:17 -0500
message:
Add [merge] after the timestamp for revisions with merges.
------------------------------------------------------------
revno: 2483.2.1
merged: john at arbash-meinel.com-20070508193100-64xg2gv8oc40tiri
parent: pqm at pqm.ubuntu.com-20070507175017-mvwcdqzq0w4z36lr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_short_merges_83887
timestamp: Tue 2007-05-08 14:31:00 -0500
message:
Add a test with a merged revision
now we need to figure out what it should look like :)
------------------------------------------------------------
revno: 2485.1.17
merged: pqm at pqm.ubuntu.com-20070601221655-eeiryluirj5h73hp
parent: pqm at pqm.ubuntu.com-20070601212622-4hy742yfww9270dw
parent: abentley at panoramicfeedback.com-20070601134202-xesyeah3z22v56b4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-01 23:16:55 +0100
message:
Fix Workingtree4.get_file_sha1 on missing files (#118186)
------------------------------------------------------------
revno: 2485.1.14.3.1
merged: abentley at panoramicfeedback.com-20070601134202-xesyeah3z22v56b4
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fix-118186
timestamp: Fri 2007-06-01 09:42:02 -0400
message:
Fix Workingtree4.get_file_sha1 on missing files
------------------------------------------------------------
revno: 2485.1.16
merged: pqm at pqm.ubuntu.com-20070601212622-4hy742yfww9270dw
parent: pqm at pqm.ubuntu.com-20070601195039-ew4306n3v38agaoq
parent: john at arbash-meinel.com-20070601193523-n91zctoxflcm88h9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-01 22:26:22 +0100
message:
(Matthew Fuller) Updates to the tutorial
------------------------------------------------------------
revno: 2485.1.14.2.1
merged: john at arbash-meinel.com-20070601193523-n91zctoxflcm88h9
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
parent: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-06-01 14:35:23 -0500
message:
(Matthew Fuller) Updates to the tutorial
------------------------------------------------------------
revno: 2485.1.10.4.9
merged: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
parent: fullermd at over-yonder.net-20070530035512-5wygby6ekqi9uxc2
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-05-30 09:52:53 -0500
message:
Don't point people at the nonexistent 'status --all'.
------------------------------------------------------------
revno: 2485.1.10.4.8
merged: fullermd at over-yonder.net-20070530035512-5wygby6ekqi9uxc2
parent: fullermd at over-yonder.net-20070530035408-mpzp6fj1cp3k4c70
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:55:12 -0500
message:
Bump document version from 0.8 to 0.16.
------------------------------------------------------------
revno: 2485.1.10.4.7
merged: fullermd at over-yonder.net-20070530035408-mpzp6fj1cp3k4c70
parent: fullermd at over-yonder.net-20070530034609-o0yzwdqtu8fpj468
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:54:08 -0500
message:
De-emphasize the heck out of manually rsync'ing for 'push', and
emphasize the builtin 'push'.
------------------------------------------------------------
revno: 2485.1.10.4.6
merged: fullermd at over-yonder.net-20070530034609-o0yzwdqtu8fpj468
parent: fullermd at over-yonder.net-20070530034330-iog9fm92mph4zyy9
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:46:09 -0500
message:
Reorganize some text to emphasize 'bzr branch' over grabbing a tarball
or rsync'ing.
------------------------------------------------------------
revno: 2485.1.10.4.5
merged: fullermd at over-yonder.net-20070530034330-iog9fm92mph4zyy9
parent: fullermd at over-yonder.net-20070530033244-r70yfpy0rbswxnt9
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:43:30 -0500
message:
Another place where we need to clarify that 'rm' may or may not delete
the file.
------------------------------------------------------------
revno: 2485.1.10.4.4
merged: fullermd at over-yonder.net-20070530033244-r70yfpy0rbswxnt9
parent: fullermd at over-yonder.net-20070530032834-bp98yu8tjheuvdpy
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:32:44 -0500
message:
Adjust diff output to look like diff output looks.
------------------------------------------------------------
revno: 2485.1.10.4.3
merged: fullermd at over-yonder.net-20070530032834-bp98yu8tjheuvdpy
parent: fullermd at over-yonder.net-20070530032249-tww05uv09iomg7sw
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:28:34 -0500
message:
X-ref "Publishing your branch" section from the discussion of branch
locations. A question was posed on IRC suggesting a need for this.
------------------------------------------------------------
revno: 2485.1.10.4.2
merged: fullermd at over-yonder.net-20070530032249-tww05uv09iomg7sw
parent: fullermd at over-yonder.net-20070530031550-fipr8tf74ni89fyg
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:22:49 -0500
message:
rm does sometimes remove the file now. Try and make that a little
more correct, without being hopelessly complicated.
------------------------------------------------------------
revno: 2485.1.10.4.1
merged: fullermd at over-yonder.net-20070530031550-fipr8tf74ni89fyg
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Tue 2007-05-29 22:15:50 -0500
message:
Get rid of references to 'bzr unknowns'.
------------------------------------------------------------
revno: 2485.1.15
merged: pqm at pqm.ubuntu.com-20070601195039-ew4306n3v38agaoq
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
parent: aaron.bentley at utoronto.ca-20070601054311-15wtrjil1onbuea3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-01 20:50:39 +0100
message:
Revert does not try to preserve file contents produced by revert
------------------------------------------------------------
revno: 2485.1.14.1.1
merged: aaron.bentley at utoronto.ca-20070601054311-15wtrjil1onbuea3
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab2
timestamp: Fri 2007-06-01 01:43:11 -0400
message:
Revert does not try to preserve file contents produced by revert
------------------------------------------------------------
revno: 2485.1.14
merged: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
parent: pqm at pqm.ubuntu.com-20070530152720-qdjd3zs950nindfs
parent: john at arbash-meinel.com-20070531202904-34h7ygudo7qq9ha1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-05-31 22:08:33 +0100
message:
(John Arbash Meinel, r=robert) Tweak _iter_changes and update_entry to make bzr status and bzr diff much faster
------------------------------------------------------------
revno: 2485.4.14
merged: john at arbash-meinel.com-20070531202904-34h7ygudo7qq9ha1
parent: john at arbash-meinel.com-20070531141758-i5f7gqddjm497ij8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-31 15:29:04 -0500
message:
Update the code so that symlinks aren't cached at incorrect times
and fix the tests so that they don't assume files and symlinks
get cached even when the timestamp doesn't declare them 'safe'.
------------------------------------------------------------
revno: 2485.4.13
merged: john at arbash-meinel.com-20070531141758-i5f7gqddjm497ij8
parent: john at arbash-meinel.com-20070517182306-dhc0cf38l5fhv2dj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-31 09:17:58 -0500
message:
NEWS
------------------------------------------------------------
revno: 2485.4.12
merged: john at arbash-meinel.com-20070517182306-dhc0cf38l5fhv2dj
parent: john at arbash-meinel.com-20070517182243-3844dyynbautwcwu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-17 19:23:06 +0100
message:
Delay joining the path until we are actually going to be using it.
------------------------------------------------------------
revno: 2485.4.11
merged: john at arbash-meinel.com-20070517182243-3844dyynbautwcwu
parent: john at arbash-meinel.com-20070517175221-edsgtdww5ogxhmqv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-17 19:22:43 +0100
message:
Correct DirState.update_entry to check when caching the sha1
not when returning it.
------------------------------------------------------------
revno: 2485.4.10
merged: john at arbash-meinel.com-20070517175221-edsgtdww5ogxhmqv
parent: john at arbash-meinel.com-20070517171133-l0rfa3x4j2zef8jf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-17 18:52:21 +0100
message:
Remove some extra comments.
------------------------------------------------------------
revno: 2485.4.9
merged: john at arbash-meinel.com-20070517171133-l0rfa3x4j2zef8jf
parent: john at arbash-meinel.com-20070517170734-munw3o4jwwey6jpe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-17 18:11:33 +0100
message:
Now that we know when tuples will be yielded
go ahead and spend the effort to make them *nice* tuples.
------------------------------------------------------------
revno: 2485.4.8
merged: john at arbash-meinel.com-20070517170734-munw3o4jwwey6jpe
parent: john at arbash-meinel.com-20070516062651-rb6kuunel56yh0dj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_2
timestamp: Thu 2007-05-17 18:07:34 +0100
message:
Keep track of directories that you have seen.
Only fall back to _get_entry if that misses.
------------------------------------------------------------
revno: 2485.4.7
merged: john at arbash-meinel.com-20070516062651-rb6kuunel56yh0dj
parent: john at arbash-meinel.com-20070516061855-zj7l63ffzw822ztg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Wed 2007-05-16 07:26:51 +0100
message:
Comment on some alternative 'pack_stat'
------------------------------------------------------------
revno: 2485.4.6
merged: john at arbash-meinel.com-20070516061855-zj7l63ffzw822ztg
parent: john at arbash-meinel.com-20070516055758-4qmxk53j07k6lnzz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Wed 2007-05-16 07:18:55 +0100
message:
Delay calling pathjoin() until we've figured out we're going to use it
(this is only a small win)
------------------------------------------------------------
revno: 2485.4.5
merged: john at arbash-meinel.com-20070516055758-4qmxk53j07k6lnzz
parent: john at arbash-meinel.com-20070516054627-kv3otbqzd1bi22yx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Wed 2007-05-16 06:57:58 +0100
message:
switching to a single returned object from _process_entry is not faster
using result = _process_entry, if result is not ... is not strictly
faster than for result in _process_entry. I'm not sure why.
I think it is a little cleaner, though.
------------------------------------------------------------
revno: 2485.4.4
merged: john at arbash-meinel.com-20070516054627-kv3otbqzd1bi22yx
parent: john at arbash-meinel.com-20070515232720-4alrtd5q4p4m3q1r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Wed 2007-05-16 06:46:27 +0100
message:
Change _process_entry to detect when we don't care about something.
This lets us do the standard check on local variables
and handles the *very* common case of nothing being changed.
------------------------------------------------------------
revno: 2485.4.3
merged: john at arbash-meinel.com-20070515232720-4alrtd5q4p4m3q1r
parent: john at arbash-meinel.com-20070515224039-h6arou8igzv9k34l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Wed 2007-05-16 00:27:20 +0100
message:
Avoid extra work in inner 'DirState.update_entry' code.
Use local vars for most functinos, directly lookup in local dict rather
than going through osutils.stat_to_file_kind.
Require the stat to be passed in, rather than being optional.
change pack_stat to use binascii.b2a_base64 (the underlying function)
Move pack_stat to top of code, so it can be saved as local variable.
This cuts the time spent in update_entry to 1/2.
Avoiding pack_stat is also a potentially large win. (5% or so)
------------------------------------------------------------
revno: 2485.4.2
merged: john at arbash-meinel.com-20070515224039-h6arou8igzv9k34l
parent: john at arbash-meinel.com-20070515221632-xphatel2dqh29ya7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Tue 2007-05-15 23:40:39 +0100
message:
Handle the case when getfilesystemencoding() is lowercase.
------------------------------------------------------------
revno: 2485.4.1
merged: john at arbash-meinel.com-20070515221632-xphatel2dqh29ya7
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_optim_1
timestamp: Tue 2007-05-15 23:16:32 +0100
message:
Fix DirState handling of dir records.
We were comparing stat_value.st_size against the recorded directory size
which is always 0.
------------------------------------------------------------
revno: 2485.1.13
merged: pqm at pqm.ubuntu.com-20070530152720-qdjd3zs950nindfs
parent: pqm at pqm.ubuntu.com-20070527193804-znv53vjd04u6es6x
parent: john at arbash-meinel.com-20070530124825-5bnsdms150iy8q0b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-05-30 16:27:20 +0100
message:
(Robert Collins) Add a BranchBuilder API for use by the test suite.
------------------------------------------------------------
revno: 2485.1.10.3.2
merged: john at arbash-meinel.com-20070530124825-5bnsdms150iy8q0b
parent: john at arbash-meinel.com-20070530124523-gxsp1617s70fhwqc
parent: robertc at robertcollins.net-20070427034250-8gie8hxmx3e2cgc3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-05-30 07:48:25 -0500
message:
(Robert Collins) Use BranchBuilder in test_ancestry.
------------------------------------------------------------
revno: 2466.7.9.1.1
merged: robertc at robertcollins.net-20070427034250-8gie8hxmx3e2cgc3
parent: robertc at robertcollins.net-20070427033909-bsuz8ogd7r75dbfl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: use-build-branch
timestamp: Fri 2007-04-27 13:42:50 +1000
message:
Use BranchBuilder in test_ancestry.
------------------------------------------------------------
revno: 2485.1.10.3.1
merged: john at arbash-meinel.com-20070530124523-gxsp1617s70fhwqc
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
parent: robertc at robertcollins.net-20070427061629-hqnq6rocm9dgljhx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-05-30 07:45:23 -0500
message:
(Robert Collins) Add a BranchBuilder API for use by the test suite.
------------------------------------------------------------
revno: 2466.7.10
merged: robertc at robertcollins.net-20070427061629-hqnq6rocm9dgljhx
parent: robertc at robertcollins.net-20070427033909-bsuz8ogd7r75dbfl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 16:16:29 +1000
message:
Add a format parameter to BranchBuilder.
------------------------------------------------------------
revno: 2466.7.9
merged: robertc at robertcollins.net-20070427033909-bsuz8ogd7r75dbfl
parent: robertc at robertcollins.net-20070427031822-1ga7jck9yw5ivsfr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 13:39:09 +1000
message:
Return the commited revision id from BranchBuilder.build_commit to save later instrospection.
------------------------------------------------------------
revno: 2466.7.8
merged: robertc at robertcollins.net-20070427031822-1ga7jck9yw5ivsfr
parent: robertc at robertcollins.net-20070427031300-wqxk6eo04pxn6trg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 13:18:22 +1000
message:
NEWS too.
------------------------------------------------------------
revno: 2466.7.7
merged: robertc at robertcollins.net-20070427031300-wqxk6eo04pxn6trg
parent: robertc at robertcollins.net-20070427030205-ll4s3d57mf0dcaqk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 13:13:00 +1000
message:
Document basic usage.
------------------------------------------------------------
revno: 2466.7.6
merged: robertc at robertcollins.net-20070427030205-ll4s3d57mf0dcaqk
parent: robertc at robertcollins.net-20070427023229-0a72vfyt4forz2c5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 13:02:05 +1000
message:
Add BranchBuilder.build_commit.
------------------------------------------------------------
revno: 2466.7.5
merged: robertc at robertcollins.net-20070427023229-0a72vfyt4forz2c5
parent: robertc at robertcollins.net-20070427023143-na837vjyw8y7ulns
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 12:32:29 +1000
message:
Better docstring for BranchBuilder.__init__.
------------------------------------------------------------
revno: 2466.7.4
merged: robertc at robertcollins.net-20070427023143-na837vjyw8y7ulns
parent: robertc at robertcollins.net-20070427022014-gw8g0qi639fquuba
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 12:31:43 +1000
message:
Add BranchBuilder.get_branch().
------------------------------------------------------------
revno: 2466.7.3
merged: robertc at robertcollins.net-20070427022014-gw8g0qi639fquuba
parent: robertc at robertcollins.net-20070427003620-6fjf8dbiblgt5am7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: build-branch
timestamp: Fri 2007-04-27 12:20:14 +1000
message:
Create bzrlib.branchbuilder.
------------------------------------------------------------
revno: 2485.1.12
merged: pqm at pqm.ubuntu.com-20070527193804-znv53vjd04u6es6x
parent: pqm at pqm.ubuntu.com-20070526160035-utugnd3he5zvo60s
parent: aaron.bentley at utoronto.ca-20070527184754-p0w83p0v54ejks8s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-05-27 20:38:04 +0100
message:
Add performance analysis docs
------------------------------------------------------------
revno: 2485.1.10.2.2
merged: aaron.bentley at utoronto.ca-20070527184754-p0w83p0v54ejks8s
parent: aaron.bentley at utoronto.ca-20070527174550-3su5c5701pi9vv1y
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.docs
timestamp: Sun 2007-05-27 14:47:54 -0400
message:
Add initial push/pull analysis
------------------------------------------------------------
revno: 2485.1.10.2.1
merged: aaron.bentley at utoronto.ca-20070527174550-3su5c5701pi9vv1y
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.docs
timestamp: Sun 2007-05-27 13:45:50 -0400
message:
Add bundle creation and merge scaling analysis
------------------------------------------------------------
revno: 2485.1.11
merged: pqm at pqm.ubuntu.com-20070526160035-utugnd3he5zvo60s
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
parent: aaron.bentley at utoronto.ca-20070526153055-gdl80ttx0j7wwwmu
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-05-26 17:00:35 +0100
message:
Fix PyCurl single-range bug (Vincent Ladeuil, #112719)
------------------------------------------------------------
revno: 2485.1.10.1.1
merged: aaron.bentley at utoronto.ca-20070526153055-gdl80ttx0j7wwwmu
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
parent: v.ladeuil+lp at free.fr-20070506065957-4jdlek9i5at2qb36
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sat 2007-05-26 11:30:55 -0400
message:
Merge PyCurl single-range bug
------------------------------------------------------------
revno: 2481.3.1
merged: v.ladeuil+lp at free.fr-20070506065957-4jdlek9i5at2qb36
parent: pqm at pqm.ubuntu.com-20070504034556-wzcw478l7qkppkq0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 112719
timestamp: Sun 2007-05-06 08:59:57 +0200
message:
Fix bug #112719 by using the right range header.
* HTTPTestUtil.py:
(SingleOnlyRangeRequestHandler): Noisily refuses mutliple range
requests.
* test_http.py:
(TestSingleOnlyRangeRequestServer): Test the retry mechanism when
a server refuses to handle a mutiple range request without
silently replying with a single range or full file response.
* _pycurl.py:
(PyCurlTransport._get_ranged): The header have been built taken
into account the range hint, don't rebuilt it *ignoring* that
hint.
------------------------------------------------------------
revno: 2485.1.10
merged: 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: 2481.2.1
merged: 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: 2485.1.9
merged: 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: 2485.1.8.1.1
merged: 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
merged: 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: 2485.1.8
merged: 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: 2485.1.7.1.2
merged: 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: 2485.1.7.1.1
merged: 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: 2485.3.1
merged: 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: 2485.1.7
merged: 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: 2485.1.6.1.1
merged: 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: 2485.2.3
merged: 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: 2485.2.2
merged: 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: 2485.2.1
merged: 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
merged: 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
merged: 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: 2485.1.6
merged: 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: 2485.1.5.1.4
merged: 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: 2485.1.5.1.3
merged: 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: 2485.1.5.1.2
merged: 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: 2485.1.5.1.1
merged: 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
merged: 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
merged: 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: 2485.1.5
merged: 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: 2485.1.3.1.2
merged: 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
merged: 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
merged: 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: 2485.1.4
merged: 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: 2485.1.3.1.1
merged: 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
merged: 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
merged: 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: 2485.1.3
merged: 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
merged: 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
merged: 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: 2485.1.2
merged: 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: 2485.1.1.1.1
merged: 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: 2485.1.1.2.1
merged: 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: 2485.1.1
merged: 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
merged: 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
Diff too large for email (8192 lines, the limit is 1000).
More information about the bazaar-commits
mailing list