Robert Collins
robertc at robertcollins.net
Fri Nov 4 10:54:10 CST 2005
------------------------------------------------------------
revno: 1463
revision-id: robertc at robertcollins.net-20051104165404-61dfbc093c768448
parent: robertc at robertcollins.net-20051021040258-84a5db1be67b30b9
parent: robertc at robertcollins.net-20051104150539-c99884403b7b9e3f
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-04 11:54:04 -0500
message:
Merge from integration.
added:
INSTALL INSTALL-20051019070340-4b27f2fb240c7943
bzrlib/gpg.py gpg.py-20051017065112-8654536d415dacc6
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/selftest/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/selftest/test_command.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/selftest/testapi.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/selftest/testgpg.py testgpg.py-20051017042228-9276cd40a784c93c
bzrlib/selftest/testhttp.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/selftest/testnonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/selftest/testoptions.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/selftest/testreweave.py testreweave.py-20051025042437-a2a02abae3551489
bzrlib/selftest/testsftp.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/selftest/testtsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/util/configobj/ configobj-20051018184548-18c76a60384b575a
bzrlib/util/configobj/__init__.py __init__.py-20051018184548-f715e1ce433801ee
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/ docs-20051018184548-5eb1575f28e645ab
bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/util/configobj/validate.py validate.py-20051018184548-e700c5f98afa9389
bzrlib/win32console.py win32console.py-20051021033308-123c6c929d04973d
renamed:
bzr-man.py => bzr_man.py bzrman.py-20050601153041-0ff7f74de456d15e
bzrlib/selftest/plugins.py => bzrlib/selftest/testplugins.py plugins.py-20050622075746-32002b55e5e943e9
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
TODO TODO-20050426050852-44d2ad9048dafbe9
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/clone.py clone.py-20050929121333-bc726d1ddd8042bc
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_core.py merge_core.py-20050513021216-eda88728698d4401
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/revfile.py* revfile.py-20050409024839-f50e8777febf943eac029aeb
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/selftest/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/selftest/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/selftest/blackbox.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/selftest/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/selftest/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/selftest/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/selftest/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/selftest/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/selftest/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/selftest/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/selftest/testannotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/selftest/testbranch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/selftest/testconfig.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/selftest/testdiff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/selftest/testfetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/selftest/testgraph.py testgraph.py-20050905070950-42e6c958106610fd
bzrlib/selftest/testinv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/selftest/testmerge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/selftest/testmerge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/selftest/testrevision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/selftest/teststatus.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/selftest/teststore.py teststore.py-20050826022702-f6caadb647395769
bzrlib/selftest/testtestament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/selftest/testtransport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/selftest/testworkingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/selftest/treeshape.py treeshape.py-20051004094628-312a98f0194306a8
bzrlib/selftest/versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/selftest/whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/shellcomplete.py shellcomplete.py-20050822153127-3be115ff5e70fc39
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/compressed_text.py compressed_text_store.py-20050915193447-e643128846816ac1
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/store/weave.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/weave.py* knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml.py xml.py-20050309040759-57d51586fdec365d
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
contrib/zsh/_bzr _bzr-20050503074841-b2f107964e03958e
setup.py* setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
merged: robertc at robertcollins.net-20051104150539-c99884403b7b9e3f
parent: robertc at robertcollins.net-20051104143748-03c6d6bf9dddabce
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-04 10:05:39 -0500
message:
Move revert from Branch to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051104143748-03c6d6bf9dddabce
parent: robertc at robertcollins.net-20051104143319-5293770efa92f56d
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-04 09:37:48 -0500
message:
Remove unneeded shebang from upgrade.py and mark revfile as executable.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051104143319-5293770efa92f56d
parent: robertc at robertcollins.net-20051103160817-ce8f8dbaafab2a22
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-04 09:33:19 -0500
message:
Remove some unneeded shebangs.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051103160817-ce8f8dbaafab2a22
parent: robertc at robertcollins.net-20051030235846-fda8b626748cce52
parent: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-03 11:08:17 -0500
message:
Merge from Martin.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031205250-b0c7f1d9ece522f5
parent: mbp at sourcefrog.net-20051031204026-5ccf0105c365b913
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 15:52:50 -0500
message:
Fix up assert with sideeffects in CompressedTextStore._copy_one
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031204026-5ccf0105c365b913
parent: mbp at sourcefrog.net-20051031172115-86efd5e038c8777d
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 15:40:26 -0500
message:
Remove all assert statements from test cases.
Tests should always be evaluated even when run with 'python -O', and so should
use TestCase.assert_ etc.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031172115-86efd5e038c8777d
parent: mbp at sourcefrog.net-20051031172011-b7cecd0b3435944a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 12:21:15 -0500
message:
Bump version to 0.7pre
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031172011-b7cecd0b3435944a
parent: mbp at sourcefrog.net-20051031171704-4e16f11e8135aeff
parent: larstiq at larstiq.dyndns.org-20051028203032-94a016293d15f207
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 12:20:11 -0500
message:
[merge] build and install manpage
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028203032-94a016293d15f207
parent: larstiq at larstiq.dyndns.org-20051028202320-9664a5530b91b23c
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 22:30:32 +0200
message:
Add reinvocation code to ensure setup.py is run by python2.4
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028202320-9664a5530b91b23c
parent: larstiq at larstiq.dyndns.org-20051028201251-d3015a1cf8ec0420
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 22:23:20 +0200
message:
bump version to 0.6
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028201251-d3015a1cf8ec0420
parent: larstiq at larstiq.dyndns.org-20051028193513-4e2c5316dba6c217
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 22:12:51 +0200
message:
Create bzr.1 manpage from setup.py
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028193513-4e2c5316dba6c217
parent: larstiq at larstiq.dyndns.org-20051028192845-2ca20eec675cddb8
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 21:35:13 +0200
message:
Kill the python reinvocation, it doesn't work for me, and
it's moving to be imported from setup.py
------------------------------------------------------------
merged: larstiq at larstiq.dyndns.org-20051028192845-2ca20eec675cddb8
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
timestamp: Fri 2005-10-28 21:28:45 +0200
message:
Eliminate double whitespace lines in manpage, reported by liw
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
parent: mbp at sourcefrog.net-20051028054949-98b4a70546cb7129
parent: john at arbash-meinel.com-20051027205644-deb2019ab9deebd9
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 15:53:02 +1000
message:
[merge] fixes for ls
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027205644-deb2019ab9deebd9
parent: john at arbash-meinel.com-20051027204409-98cc537ee55a9f2e
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-27 15:56:44 -0500
message:
Added more tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051027204409-98cc537ee55a9f2e
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
committer: John Arbash Meinel <john at arbash-meinel.com>
timestamp: Thu 2005-10-27 15:44:09 -0500
message:
Made ls work again, and take extra arguments.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
parent: mbp at sourcefrog.net-20051027034323-31ce572c5cdcbc45
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:44:57 +1000
message:
Fix tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027034323-31ce572c5cdcbc45
parent: mbp at sourcefrog.net-20051027033618-0ea59d3acff2b408
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:43:23 +1000
message:
Add check that the bzr program and bzrlib version match.
This may trap installation errors where bin/bzr is upgraded but not
bzrlib, or vice versa.
Change new variable to bzrlib.version_info to be consistent with
sys.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027033618-0ea59d3acff2b408
parent: mbp at sourcefrog.net-20051027032848-5edee386ede10b21
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:36:18 +1000
message:
Expose library API version in bzrlib.bzr_version_info
similar to sys.version_info.
Add tests for this.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027032848-5edee386ede10b21
parent: mbp at sourcefrog.net-20051027032619-323471e9b77bd69a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:28:48 +1000
message:
[patch] paramiko sftp tests (robey)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027032619-323471e9b77bd69a
parent: mbp at sourcefrog.net-20051027022612-a259d9eacbe71552
parent: michael at ellerman.id.au-20051026100630-64c305951927e02a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:26:19 +1000
message:
[merge] Fixes and tests for strict commits (mpe)
------------------------------------------------------------
merged: michael at ellerman.id.au-20051026100630-64c305951927e02a
parent: michael at ellerman.id.au-20051026100347-bb0b2bd42f7953f2
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 20:06:30 +1000
message:
Fix error in run_bzr_captured() doco
------------------------------------------------------------
merged: michael at ellerman.id.au-20051026100347-bb0b2bd42f7953f2
parent: michael at ellerman.id.au-20051019054013-518c59352d12019a
parent: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 20:03:47 +1000
message:
Merge mainline.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
parent: mbp at sourcefrog.net-20051026055204-425ddb6e1457aac2
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 16:20:15 +1000
message:
Move weave errors into bzrlib.errors and make consistent with new system.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026055204-425ddb6e1457aac2
parent: mbp at sourcefrog.net-20051026054906-9a5608902d33bf8f
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 15:52:04 +1000
message:
Another topo_sort test
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026054906-9a5608902d33bf8f
parent: mbp at sourcefrog.net-20051026023628-4fa68e04f44f5a13
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 15:49:06 +1000
message:
Improved topological sort
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026023628-4fa68e04f44f5a13
parent: mbp at sourcefrog.net-20051025232907-7c14ff3affd08906
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 12:36:28 +1000
message:
Add topo_sort utility function
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025232907-7c14ff3affd08906
parent: mbp at sourcefrog.net-20051025232422-babcb3f6fda554c3
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 09:29:07 +1000
message:
todo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025232422-babcb3f6fda554c3
parent: mbp at sourcefrog.net-20051025071214-df55048f97f01917
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 09:24:22 +1000
message:
Add .sconsign* to default ignore list
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025071214-df55048f97f01917
parent: mbp at sourcefrog.net-20051025070730-af93bccefc008d4e
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 17:12:14 +1000
message:
Refactor test setup/teardown into cleanup callbacks
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025070730-af93bccefc008d4e
parent: mbp at sourcefrog.net-20051025064159-10e7a898748bbf42
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 17:07:30 +1000
message:
Clean up test log files when tests complete.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025064159-10e7a898748bbf42
parent: mbp at sourcefrog.net-20051025050430-a0d658f0767aa56f
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 16:41:59 +1000
message:
Add TestCase.addCleanup method.
This is an alternative to overriding the tearDown() method, which tends to
cause confusion when subclasses want different cleanups, or cleanups that
should be done in only particular cases.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025050430-a0d658f0767aa56f
parent: mbp at sourcefrog.net-20051025044352-c562c69359d344d8
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 15:04:30 +1000
message:
Test for correct annotations after simple reweave
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025044352-c562c69359d344d8
parent: mbp at sourcefrog.net-20051025044326-48a847b93274442e
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 14:43:52 +1000
message:
Split reweave tests into new file and add one more.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025044326-48a847b93274442e
parent: mbp at sourcefrog.net-20051025015221-007dbda9872fa88b
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 14:43:26 +1000
message:
- fix Weave.names()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051025015221-007dbda9872fa88b
parent: mbp at sourcefrog.net-20051024235941-9a2711dfaa8a522d
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 11:52:21 +1000
message:
Add Weave.names()
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024235941-9a2711dfaa8a522d
parent: mbp at sourcefrog.net-20051024235401-7f76b82a94d55621
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 09:59:41 +1000
message:
Fix up all calls to InvalidRevisionId() to specify parameters.
Pointed out by Jelmer.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024235401-7f76b82a94d55621
parent: mbp at sourcefrog.net-20051024121950-8d8cbc53f5a7da0b
parent: jelmer at samba.org-20051019234501-02d07eb6d5a0510e
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-25 09:54:01 +1000
message:
[merge] small fixes from Jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20051019234501-02d07eb6d5a0510e
parent: jelmer at samba.org-20051019105209-55ff676b4f3b0efe
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Thu 2005-10-20 01:45:01 +0200
message:
Fix typo
------------------------------------------------------------
merged: jelmer at samba.org-20051019105209-55ff676b4f3b0efe
parent: jelmer at samba.org-20051019093439-e1d8e3508d1ba46b
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Wed 2005-10-19 12:52:09 +0200
message:
InvalidRevisionId lost its argument
------------------------------------------------------------
merged: jelmer at samba.org-20051019093439-e1d8e3508d1ba46b
parent: jelmer at samba.org-20051018181306-96bd114e1f43f112
parent: mbp at sourcefrog.net-20051019061131-6489a7f68564588e
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Wed 2005-10-19 11:34:39 +0200
message:
Merge from Martin
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019061131-6489a7f68564588e
parent: mbp at sourcefrog.net-20051019050345-3632317811c8ce93
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 16:11:31 +1000
message:
- load paramiko sftp transport by default
(will break if paramiko isn't installed)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019050345-3632317811c8ce93
parent: mbp at sourcefrog.net-20051019050312-d5791b27e7926a28
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 15:03:45 +1000
message:
- import sftp transport from robey
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019050312-d5791b27e7926a28
parent: mbp at sourcefrog.net-20051019024912-cd8806cde41991f6
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 15:03:12 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019024912-cd8806cde41991f6
parent: mbp at sourcefrog.net-20051018114741-569e2fada4aa2c1d
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 12:49:12 +1000
message:
- improved eta estimation for progress bar
(patch from John Arbash Meinel)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018114741-569e2fada4aa2c1d
parent: mbp at sourcefrog.net-20051018064730-700a03dca884a488
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 21:47:41 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018064730-700a03dca884a488
parent: mbp at sourcefrog.net-20051018063047-13fc3067d2f579a3
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 16:47:30 +1000
message:
- in error messages, show cwd as repr in case it's in unicode
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018063047-13fc3067d2f579a3
parent: mbp at sourcefrog.net-20051018023349-45ebeadb7e105db5
parent: robertc at robertcollins.net-20051017233518-6746654be564edde
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 16:30:47 +1000
message:
[merge] from robert and fix up tests
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017233518-6746654be564edde
parent: robertc at robertcollins.net-20051017203812-7f01cc90974d01ca
parent: robertc at robertcollins.net-20051017233206-cbd6059e27bd4e39
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 09:35:18 +1000
message:
Merge in more GPG work, and more Branch-api-shrinkage.
* Branch.remove has been moved to WorkingTree, which has also gained
lock_read, lock_write and unlock methods for convenience. (Robert
Collins)
* Two decorators, needs_read_lock and needs_write_lock have been added
to the branch module. Use these to cause a function to run in a
read or write lock respectively. (Robert Collins)
* Branch.open_containing now returns a tuple (Branch, relative-path),
which allows direct access to the common case of 'get me this file
from its branch'. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017233206-cbd6059e27bd4e39
parent: robertc at robertcollins.net-20051017231300-e1c9e931bcfacd6a
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 09:32:06 +1000
message:
Branch.remove has been moved to WorkingTree.
Part of this is providing WorkingTree with locking primitives,
to allow the use of the needs_write_lock decorator.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017231300-e1c9e931bcfacd6a
parent: robertc at robertcollins.net-20051017223139-63e850d7069466d6
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 09:13:00 +1000
message:
Branch.open_containing now returns a tuple (Branch, relative-path).
This allows direct access to the common case of 'get me this file
from its branch'. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017223139-63e850d7069466d6
parent: robertc at robertcollins.net-20051017215732-08f487800e726748
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 08:31:39 +1000
message:
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
Two decorators, needs_read_lock and needs_write_lock have been added
to the branch module. Use these to cause a function to run in a
read or write lock respectively.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017215732-08f487800e726748
parent: robertc at robertcollins.net-20051017212018-5e2a78c67f36a026
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 07:57:32 +1000
message:
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017212018-5e2a78c67f36a026
parent: robertc at lifelesslap.robertcollins.net-20051017113105-76c3855778da1baa
parent: robertc at robertcollins.net-20051017203812-7f01cc90974d01ca
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 07:20:18 +1000
message:
merge from integration
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017203812-7f01cc90974d01ca
parent: robertc at robertcollins.net-20051017115654-662239e1587524a8
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 06:38:12 +1000
message:
Typo in config.py (Thanks Fabbione)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017115654-662239e1587524a8
parent: robertc at robertcollins.net-20051017114107-f5586285d825c105
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-17 21:56:54 +1000
message:
merge from martin.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
parent: mbp at sourcefrog.net-20051017062803-317b7d176b212e64
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-17 16:57:11 +1000
message:
- store revprops in testaments
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017062803-317b7d176b212e64
parent: mbp at sourcefrog.net-20051017051820-092df2c2ec42a426
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-17 16:28:03 +1000
message:
- run all selftests by default
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017051820-092df2c2ec42a426
parent: mbp at sourcefrog.net-20051017045742-1dbebef480c5ac5d
parent: abentley at lappy-20051016235625-f2e4f5d4ff1e889c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 15:18:20 +1000
message:
[merge] from aaron
------------------------------------------------------------
merged: abentley at lappy-20051016235625-f2e4f5d4ff1e889c
parent: abentley at lappy-20051016234726-c7699fd0b77457d2
committer: abentley <abentley at lappy>
timestamp: Sun 2005-10-16 19:56:25 -0400
message:
Cleanups for pull
------------------------------------------------------------
merged: abentley at lappy-20051016234726-c7699fd0b77457d2
parent: abentley at lappy-20051016051558-502eb6c3601ceb90
committer: abentley <abentley at lappy>
timestamp: Sun 2005-10-16 19:47:26 -0400
message:
Restored branch convergence to bzr pull
------------------------------------------------------------
merged: abentley at lappy-20051016051558-502eb6c3601ceb90
parent: abentley at lappy-20051015010702-0b7a58668e447397
parent: robertc at lifelesslap.robertcollins.net-20051016002327-3181e7214d4e132f
committer: abentley <abentley at lappy>
timestamp: Sun 2005-10-16 01:15:58 -0400
message:
Merged Robert's latest
------------------------------------------------------------
merged: abentley at lappy-20051015010702-0b7a58668e447397
parent: abentley at lappy-20051014052143-2368d04b9caaab2b
parent: mbp at sourcefrog.net-20051014043241-381a202478a6f17b
committer: abentley <abentley at lappy>
timestamp: Fri 2005-10-14 21:07:02 -0400
message:
Merge from Martin
------------------------------------------------------------
merged: abentley at lappy-20051014052143-2368d04b9caaab2b
parent: abentley at lappy-20051014045326-97313b563161422e
committer: abentley <abentley at lappy>
timestamp: Fri 2005-10-14 01:21:43 -0400
message:
Got rid of MergeAdapterTree
------------------------------------------------------------
merged: abentley at lappy-20051014045326-97313b563161422e
parent: abentley at lappy-20051014043224-347635f0e1fbc673
committer: abentley <abentley at lappy>
timestamp: Fri 2005-10-14 00:53:26 -0400
message:
Got even closer to standard Tree interface
------------------------------------------------------------
merged: abentley at lappy-20051014043224-347635f0e1fbc673
parent: abentley at lappy-20051014035050-d779472ccb599a51
committer: abentley <abentley at lappy>
timestamp: Fri 2005-10-14 00:32:24 -0400
message:
Propogated has_or_had_id to Tree
------------------------------------------------------------
merged: abentley at lappy-20051014035050-d779472ccb599a51
parent: abentley at lappy-20051014023846-276686141002cfa1
committer: abentley <abentley at lappy>
timestamp: Thu 2005-10-13 23:50:50 -0400
message:
semi-broke merge
------------------------------------------------------------
merged: abentley at lappy-20051014023846-276686141002cfa1
parent: abentley at lappy-20051014023455-a86628f6fdc2e6d1
committer: abentley <abentley at lappy>
timestamp: Thu 2005-10-13 22:38:46 -0400
message:
remove method definition
------------------------------------------------------------
merged: abentley at lappy-20051014023455-a86628f6fdc2e6d1
parent: abentley at lappy-20051014015307-8b917f78d9f61b99
committer: abentley <abentley at lappy>
timestamp: Thu 2005-10-13 22:34:55 -0400
message:
Removed all remaining use of readonly_path
------------------------------------------------------------
merged: abentley at lappy-20051014015307-8b917f78d9f61b99
parent: abentley at troll-20051013225139-e96a8ebd8f4b54da
committer: abentley <abentley at lappy>
timestamp: Thu 2005-10-13 21:53:07 -0400
message:
Avoided readonly_path in ApplyDiff3
------------------------------------------------------------
merged: abentley at troll-20051013225139-e96a8ebd8f4b54da
parent: abentley at troll-20051013215818-0900f030e3923901
committer: Aaron Bentley <abentley at troll>
timestamp: Thu 2005-10-13 18:51:39 -0400
message:
Added symlink three-way tests
------------------------------------------------------------
merged: abentley at troll-20051013215818-0900f030e3923901
parent: abentley at troll-20051013212909-cfde7d2d05ccd47e
parent: robertc at lifelesslap.robertcollins.net-20051012002452-64068f25c8656f66
committer: Aaron Bentley <abentley at troll>
timestamp: Thu 2005-10-13 17:58:18 -0400
message:
Fixed symlink reverting
------------------------------------------------------------
merged: abentley at troll-20051013212909-cfde7d2d05ccd47e
parent: abentley at panoramicfeedback.com-20051013211011-7aeccd5c452e31ee
parent: robertc at lifelesslap.robertcollins.net-20051013014405-1f230a49790d25fb
committer: Aaron Bentley <abentley at troll>
timestamp: Thu 2005-10-13 17:29:09 -0400
message:
Merged latest from robert collins
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013211011-7aeccd5c452e31ee
parent: abentley at panoramicfeedback.com-20051013184118-37b9bf4a111d4550
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 17:10:11 -0400
message:
Replaced FileCreate with TreeFileCreate, fixed revert with empty parents
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013184118-37b9bf4a111d4550
parent: abentley at panoramicfeedback.com-20051013173952-224b00aa1f32b7fe
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 14:41:18 -0400
message:
Moved all fooCreate into get_contents
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013173952-224b00aa1f32b7fe
parent: abentley at panoramicfeedback.com-20051013170320-731d9d3efaeb81d6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 13:39:52 -0400
message:
Removed readonly_path from changeset generation
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013170320-731d9d3efaeb81d6
parent: abentley at panoramicfeedback.com-20051013161650-c44c58f105d9f7cb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 13:03:20 -0400
message:
Removed use of readonly path for executability test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013161650-c44c58f105d9f7cb
parent: abentley at panoramicfeedback.com-20051013152350-2b1ad39d05212ae3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 12:16:50 -0400
message:
Use line log for pending merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013152350-2b1ad39d05212ae3
parent: abentley at panoramicfeedback.com-20051013152150-454a9cc25007f24d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 11:23:50 -0400
message:
Avoid gathering merge info if log formatter can't display it.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013152150-454a9cc25007f24d
parent: abentley at panoramicfeedback.com-20051013152112-8744970e04966460
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 11:21:50 -0400
message:
Added one-line log format
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051013152112-8744970e04966460
parent: aaron.bentley at utoronto.ca-20051011054954-e31fd972bd88f2a5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-13 11:21:12 -0400
message:
Made format_date more flexible
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051011054954-e31fd972bd88f2a5
parent: aaron.bentley at utoronto.ca-20051011054752-1b29fbebcdf43693
committer: aaron.bentley at utoronto.ca
timestamp: Tue 2005-10-11 01:49:54 -0400
message:
Removed unused Branch.common_ancestor function
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051011054752-1b29fbebcdf43693
parent: aaron.bentley at utoronto.ca-20051011053602-aa069cc6a96764cf
committer: aaron.bentley at utoronto.ca
timestamp: Tue 2005-10-11 01:47:52 -0400
message:
Moved fixme to more appropriate place
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051011053602-aa069cc6a96764cf
parent: aaron.bentley at utoronto.ca-20051011052036-23ff7bae64a29826
committer: aaron.bentley at utoronto.ca
timestamp: Tue 2005-10-11 01:36:02 -0400
message:
Cleaned up Fetcher._find_last_revision
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051011052036-23ff7bae64a29826
parent: aaron.bentley at utoronto.ca-20051010041348-3049184277dce841
parent: robertc at robertcollins.net-20051011034144-19aca2bd13f66055
committer: aaron.bentley at utoronto.ca
timestamp: Tue 2005-10-11 01:20:36 -0400
message:
latest from robert collins
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051010041348-3049184277dce841
parent: aaron.bentley at utoronto.ca-20051008064121-364ef62ae059cf5c
committer: aaron.bentley at utoronto.ca
timestamp: Mon 2005-10-10 00:13:48 -0400
message:
Restored old tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017045742-1dbebef480c5ac5d
parent: mbp at sourcefrog.net-20051017041640-5c3119b097480367
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 14:57:42 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017041640-5c3119b097480367
parent: mbp at sourcefrog.net-20051017040433-79379c10856d7b83
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-17 14:16:40 +1000
message:
- more option help
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017040433-79379c10856d7b83
parent: mbp at sourcefrog.net-20051017024647-17ecb7c7608a8332
parent: robertc at lifelesslap.robertcollins.net-20051016223310-c4798eb9deb09a7c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 14:04:33 +1000
message:
[merge] from robert
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016223310-c4798eb9deb09a7c
parent: robertc at lifelesslap.robertcollins.net-20051016002327-3181e7214d4e132f
parent: robertc at lifelesslap.robertcollins.net-20051016223125-26d4401cb94b7b82
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 08:33:10 +1000
message:
Merge start of removal of WorkingTree concepts from Branch.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017024647-17ecb7c7608a8332
parent: mbp at sourcefrog.net-20051017024220-bd72837ef19ad42f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 12:46:47 +1000
message:
- annotate improvements from Goffreddo, with extra bug fixes and tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017024220-bd72837ef19ad42f
parent: mbp at sourcefrog.net-20051017014625-f7f58af5edf05eee
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 12:42:20 +1000
message:
- add extract_email_address
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017014625-f7f58af5edf05eee
parent: mbp at sourcefrog.net-20051014103707-4a95ccec6436e995
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 11:46:25 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014103707-4a95ccec6436e995
parent: mbp at sourcefrog.net-20051014094249-3d24c68f322d6bff
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-14 20:37:07 +1000
message:
[patch] better zsh completion
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014094249-3d24c68f322d6bff
parent: mbp at sourcefrog.net-20051014093721-a78913d0bd418688
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-14 19:42:49 +1000
message:
- more refactoring and tests of commandline
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014093721-a78913d0bd418688
parent: mbp at sourcefrog.net-20051014084555-437e7a0cc242b41d
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-14 19:37:21 +1000
message:
- more refactoring of and tests for option parsing
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014084555-437e7a0cc242b41d
parent: mbp at sourcefrog.net-20051014084100-0f385943cf422f3f
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 18:45:55 +1000
message:
- help for global options
- test for this
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014084100-0f385943cf422f3f
parent: mbp at sourcefrog.net-20051014083715-acc6a0c53bdb2e3e
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-14 18:41:00 +1000
message:
- add help strings to some options
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014083715-acc6a0c53bdb2e3e
parent: mbp at sourcefrog.net-20051014083656-8b02bda5873ad72a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 18:37:15 +1000
message:
- refactor handling of short option names
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014083656-8b02bda5873ad72a
parent: mbp at sourcefrog.net-20051014080525-5251fec74e669a07
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 18:36:56 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014080525-5251fec74e669a07
parent: mbp at sourcefrog.net-20051014055328-6fff7b94347a17ca
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 18:05:25 +1000
message:
- clean up handling of option objects
- add help for commit --file
- test for this
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014055328-6fff7b94347a17ca
parent: mbp at sourcefrog.net-20051014053449-2ec50e1a47085c46
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 15:53:28 +1000
message:
- Add assertContainsRe
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051014053449-2ec50e1a47085c46
parent: mbp at sourcefrog.net-20051014043241-381a202478a6f17b
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-14 15:34:49 +1000
message:
[patch] define cli options as objects, not strings
patch from Magnus Thering
------------------------------------------------------------
merged: robertc at robertcollins.net-20051017114107-f5586285d825c105
parent: robertc at lifelesslap.robertcollins.net-20051016223310-c4798eb9deb09a7c
parent: robertc at lifelesslap.robertcollins.net-20051017113105-76c3855778da1baa
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-17 21:41:07 +1000
message:
Merge in first part of GPG support.
This adds check_signatures config support, triams back the transport api
to be leaner and easier to hook in suffixes - non primary streams in the store
associated with the fileid that primary data is stored in, a gpg module which
will encapsulate all signing and checking operations.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017113105-76c3855778da1baa
parent: robertc at lifelesslap.robertcollins.net-20051017105039-87b9e081c41cb906
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 21:31:05 +1000
message:
gpg sign commits if the policy says we need to
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017105039-87b9e081c41cb906
parent: robertc at lifelesslap.robertcollins.net-20051017081509-f108fef422640aba
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 20:50:39 +1000
message:
Add re-sign command to generate a digital signature on a single revision.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017081509-f108fef422640aba
parent: robertc at lifelesslap.robertcollins.net-20051017065310-836e3179c48b4f6f
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 18:15:09 +1000
message:
gpg signing of content
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017065310-836e3179c48b4f6f
parent: robertc at lifelesslap.robertcollins.net-20051017062223-ef02def7780ccfb7
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 16:53:10 +1000
message:
check that we get the right command line from the default gpg strategy.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017062223-ef02def7780ccfb7
parent: robertc at lifelesslap.robertcollins.net-20051017042717-6f94bc63b0c04a01
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 16:22:23 +1000
message:
gpg_signing_command configuration item
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017042717-6f94bc63b0c04a01
parent: robertc at lifelesslap.robertcollins.net-20051017021612-1bc159c29da0e0fe
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 14:27:17 +1000
message:
move environment preservation up to the root test case, making it available to all tests
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017021612-1bc159c29da0e0fe
parent: robertc at lifelesslap.robertcollins.net-20051017014024-1c0d392828f918c3
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 12:16:12 +1000
message:
Teach store.copy_all about fileid suffixes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017014024-1c0d392828f918c3
parent: robertc at lifelesslap.robertcollins.net-20051017005441-57c0f0eb7972158e
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 11:40:24 +1000
message:
Unroll the multiple-copy logic enough to remove the duplicate iteration and yet retain the optimised gzip->gzip copy.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017005441-57c0f0eb7972158e
parent: robertc at lifelesslap.robertcollins.net-20051017004610-6130019f89a92d04
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 10:54:41 +1000
message:
Inline Store.add_multi, and remove unused prefetch method on CachedStore
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017004610-6130019f89a92d04
parent: robertc at lifelesslap.robertcollins.net-20051017001149-fe23a449de1385f7
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 10:46:10 +1000
message:
teach iter about suffixes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017001149-fe23a449de1385f7
parent: robertc at lifelesslap.robertcollins.net-20051017000033-b7385b1772d31605
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 10:11:49 +1000
message:
test get with suffixes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051017000033-b7385b1772d31605
parent: robertc at lifelesslap.robertcollins.net-20051016235302-818de607403e1c6e
parent: robertc at lifelesslap.robertcollins.net-20051016223310-c4798eb9deb09a7c
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 10:00:33 +1000
message:
merge in integration
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016235302-818de607403e1c6e
parent: robertc at lifelesslap.robertcollins.net-20051016235029-bae228a6289c5121
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 09:53:02 +1000
message:
test that the presence of a signature does not make a missing base file magically appear present
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016235029-bae228a6289c5121
parent: robertc at lifelesslap.robertcollins.net-20051016233906-e8b3ec7eb4898dc6
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 09:50:29 +1000
message:
test for has with suffixed files
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016233906-e8b3ec7eb4898dc6
parent: robertc at lifelesslap.robertcollins.net-20051016145121-01852573f8c63daa
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 09:39:06 +1000
message:
test simple has_id
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016145121-01852573f8c63daa
parent: robertc at lifelesslap.robertcollins.net-20051016141924-8dcbb20f1c03756e
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 00:51:21 +1000
message:
replace __contains__ calls in stores with has_id
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016141924-8dcbb20f1c03756e
parent: robertc at lifelesslap.robertcollins.net-20051016101150-c47ea7aac97aa585
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Mon 2005-10-17 00:19:24 +1000
message:
Many transport related tweaks:
- Remove get_partial as it was not used at all.
- Move store._iter_relpaths into transport as iter_files_recursive.
- Nuke ImmutableMemoryStore, replaced with MemoryTransport.
- Remove all direct use of the stat module from store logic.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016101150-c47ea7aac97aa585
parent: robertc at lifelesslap.robertcollins.net-20051016093048-9d12448dab8f8b97
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 20:11:50 +1000
message:
add registration of suffixes, in preparation for ensuring iteration is regular
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016093048-9d12448dab8f8b97
parent: robertc at lifelesslap.robertcollins.net-20051016083842-74ce6bd9a3951d1a
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 19:30:48 +1000
message:
rebuild ScratchBranch on top of ScratchTransport
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016083842-74ce6bd9a3951d1a
parent: robertc at lifelesslap.robertcollins.net-20051016083040-de4b6177b8a0531a
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:38:42 +1000
message:
move duplicate scratch logic into a scratch transport
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016083040-de4b6177b8a0531a
parent: robertc at lifelesslap.robertcollins.net-20051016082916-dae075fdf18af47e
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:30:40 +1000
message:
unify __len__() implementations for TransportStore classes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016082916-dae075fdf18af47e
parent: robertc at lifelesslap.robertcollins.net-20051016082643-a2300b765aea49b4
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:29:16 +1000
message:
unify has() implementations for TransportStore classes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016082643-a2300b765aea49b4
parent: robertc at lifelesslap.robertcollins.net-20051016082322-b0ee714c30d084e6
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:26:43 +1000
message:
unify __contains__ for TransportStore classes
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016082322-b0ee714c30d084e6
parent: robertc at lifelesslap.robertcollins.net-20051016082027-eefe2ec6b7d47a21
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:23:22 +1000
message:
pull up total_size into TransportStore
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016082027-eefe2ec6b7d47a21
parent: robertc at lifelesslap.robertcollins.net-20051016081323-8393c2878dc4dc9e
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:20:27 +1000
message:
convert get() in TextStore and CompressedTextStore into a template method
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016081323-8393c2878dc4dc9e
parent: robertc at lifelesslap.robertcollins.net-20051016075409-a01b5f59444f4dee
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 18:13:23 +1000
message:
convert all users of __getitem__ into TransportStores to use .get instead
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016075409-a01b5f59444f4dee
parent: robertc at lifelesslap.robertcollins.net-20051016071129-d0cd8a663a42cea0
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 17:54:09 +1000
message:
Remove the Store.get multiple-get interface which was not used, and remove much spurious duplication in teststore.py.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016071129-d0cd8a663a42cea0
parent: robertc at lifelesslap.robertcollins.net-20051016070617-825ca9863ba0bc91
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 17:11:29 +1000
message:
teach TransportStore.add to accept an optional file suffix, which does not alter the fileid.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016070617-825ca9863ba0bc91
parent: robertc at lifelesslap.robertcollins.net-20051016070057-e60bb578080f233f
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 17:06:17 +1000
message:
Teach CompressedTextStore._relpath to support file suffixes too.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016070057-e60bb578080f233f
parent: robertc at lifelesslap.robertcollins.net-20051016065655-28a0e5183996ef32
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 17:00:57 +1000
message:
test that TransportStore.add calls _add appropriately.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016065655-28a0e5183996ef32
parent: robertc at lifelesslap.robertcollins.net-20051016065321-fa8735f78154f92d
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 16:56:55 +1000
message:
Add stuf has and mkdir to MockTransport to enable testing store adds
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016065321-fa8735f78154f92d
parent: robertc at lifelesslap.robertcollins.net-20051016025253-bee0d4e8715606d4
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 16:53:21 +1000
message:
create an instrumented transport store for testing common logic.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016025253-bee0d4e8715606d4
parent: robertc at lifelesslap.robertcollins.net-20051016023400-9e6c7a550a478165
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 12:52:53 +1000
message:
pull up core TransportStore.add from TextStore.add and CompressedTextStore.add
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016023400-9e6c7a550a478165
parent: robertc at lifelesslap.robertcollins.net-20051016022511-0bd5ebf69bd26bd2
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 12:34:00 +1000
message:
Check that file suffixes in TransportStore are also valid
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016022511-0bd5ebf69bd26bd2
parent: robertc at lifelesslap.robertcollins.net-20051016015701-a3047f8fc145d6cf
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 12:25:11 +1000
message:
Pull up _relpath with gz suffix for CompressedTextStore into TransportStore
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016015701-a3047f8fc145d6cf
parent: robertc at lifelesslap.robertcollins.net-20051016015159-580cca34cb41e771
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 11:57:01 +1000
message:
Test TransportStore._relpath for simple cases: pull up _prefixed attribute as a result.
------------------------------------------------------------
merged: robertc at lifelesslap.robertcollins.net-20051016015159-580cca34cb41e771
parent: robertc at lifelesslap.robertcollins.net-20051016002217-aa38f9c1eb13ee48
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Sun 2005-10-16 11:51:59 +1000
message:
Pull up _check_id and _relpath from Text and CompressedText stores into TransportStore
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018023349-45ebeadb7e105db5
parent: mbp at sourcefrog.net-20051018023111-280509dabbb1a499
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 12:33:49 +1000
message:
- try to avoid test failure on platforms with ascii-only filesystems
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018023111-280509dabbb1a499
parent: mbp at sourcefrog.net-20051018021405-f956fbed28cf8a63
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 12:31:11 +1000
message:
- improved handling of non-ascii branch names and test
patch from Joel Rosdahl
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018021405-f956fbed28cf8a63
parent: mbp at sourcefrog.net-20051018020830-7c9938e1aad0964a
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 12:14:05 +1000
message:
- better display of argv and pwd in exceptions
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018020830-7c9938e1aad0964a
parent: mbp at sourcefrog.net-20051018020148-610087c2a964bf5b
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 12:08:30 +1000
message:
- http url fixes suggested by Robey Pointer, and tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018020148-610087c2a964bf5b
parent: mbp at sourcefrog.net-20051018011818-f4de53a5d08eeb05
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-10-18 12:01:48 +1000
message:
- assertEqualDiff handles strings without trailing newline
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018011818-f4de53a5d08eeb05
parent: mbp at sourcefrog.net-20051018011321-453ec15baa6f01c0
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-18 11:18:18 +1000
message:
- todo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051018011321-453ec15baa6f01c0
parent: mbp at sourcefrog.net-20051017093946-d28e99e7305deaf7
committer: mbp at sourcefrog.net
timestamp: Tue 2005-10-18 11:13:21 +1000
message:
- new commit --strict option
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017093946-d28e99e7305deaf7
parent: mbp at sourcefrog.net-20051017093643-07c748d32c6f98ab
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 19:39:46 +1000
message:
- more error conversions
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017093643-07c748d32c6f98ab
parent: mbp at sourcefrog.net-20051017080050-25ad02d43731ecf1
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 19:36:43 +1000
message:
- more error conversion
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017080050-25ad02d43731ecf1
parent: mbp at sourcefrog.net-20051017074802-4b70a1bb4d5c4194
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-17 18:00:50 +1000
message:
- convert NotBranchError to new exception base
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017074802-4b70a1bb4d5c4194
parent: mbp at sourcefrog.net-20051017070028-fb9229d4fd85af36
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-17 17:48:02 +1000
message:
- start introducing hct error classes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051017070028-fb9229d4fd85af36
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-17 17:00:28 +1000
message:
- update news of testaments and revprops
------------------------------------------------------------
merged: jelmer at samba.org-20051018181306-96bd114e1f43f112
parent: jelmer at samba.org-20051018173958-64b4a27c64719927
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 20:13:06 +0200
message:
Properly import exception.
------------------------------------------------------------
merged: jelmer at samba.org-20051018173958-64b4a27c64719927
parent: jelmer at samba.org-20051017234828-c250f2060f104fcc
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 19:39:58 +0200
message:
Fix typo
------------------------------------------------------------
merged: jelmer at samba.org-20051017234828-c250f2060f104fcc
parent: jelmer at samba.org-20051017233140-9666fb5abe3b5f81
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:48:28 +0200
message:
Remove TODO item that is already implemented.
------------------------------------------------------------
merged: jelmer at samba.org-20051017233140-9666fb5abe3b5f81
parent: jelmer at samba.org-20051017231429-fa6f49e760ed2f22
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:31:40 +0200
message:
Argument 'transport' can not be a string (assert on first line
checks it is an instance of Transport). Removing this comment (there was also
no test for this behaviour)
------------------------------------------------------------
merged: jelmer at samba.org-20051017231429-fa6f49e760ed2f22
parent: jelmer at samba.org-20051017231343-1388004327a41b4a
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:14:29 +0200
message:
Remove executable properties from Makefile (set by bzr itself now)
------------------------------------------------------------
merged: jelmer at samba.org-20051017231343-1388004327a41b4a
parent: jelmer at samba.org-20051017132619-72b6d48f8ec48c49
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Tue 2005-10-18 01:13:43 +0200
message:
Make setup.py executable
------------------------------------------------------------
merged: jelmer at samba.org-20051017132619-72b6d48f8ec48c49
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Mon 2005-10-17 15:26:19 +0200
message:
Fix typo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024121950-8d8cbc53f5a7da0b
parent: mbp at sourcefrog.net-20051024105058-49bdcfdb34d19bdd
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 22:19:50 +1000
message:
todo
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024105058-49bdcfdb34d19bdd
parent: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 20:50:58 +1000
message:
Update fetch command for new Branch constructors.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
parent: mbp at sourcefrog.net-20051024100558-678a90e04ba42706
parent: robertc at robertcollins.net-20051024085433-5e48ed93d1546627
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 20:22:01 +1000
message:
[merge] improve resign command (robertc)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024085433-5e48ed93d1546627
parent: robertc at robertcollins.net-20051024085306-a3173edd40c87abd
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 18:54:33 +1000
message:
touch up plugin.py docstring
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024085306-a3173edd40c87abd
parent: robertc at robertcollins.net-20051024083732-7f99eeec70f2bbb8
parent: mbp at sourcefrog.net-20051024023528-817a47f36cb21963
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 18:53:06 +1000
message:
merge from martin
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024023528-817a47f36cb21963
parent: mbp at sourcefrog.net-20051024022002-91c6683873cdbb87
parent: robertc at robertcollins.net-20051023151126-c18d3642d09a27ba
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 12:35:28 +1000
message:
[merge] robertc
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023151126-c18d3642d09a27ba
parent: robertc at robertcollins.net-20051023140720-aaa80c33984831a3
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 01:11:26 +1000
message:
'revision.revision_graph can handle having only partial history.
Previously, it would fail for a graph with no revision with no parents.
(Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023140720-aaa80c33984831a3
parent: robertc at robertcollins.net-20051023135059-99090b3a95ade1eb
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 00:07:20 +1000
message:
Allow the first revision on revision-history to have parents.
'bzr check' allows the first revision on revision-history to have
parents - something that is expected for cheap checkouts, and occurs
when conversions from baz do not have all history.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023135059-99090b3a95ade1eb
parent: robertc at robertcollins.net-20051023114619-cec8ca25207b1344
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-23 23:50:59 +1000
message:
BUGFIX: fetch was not skipping all missing parents for inventory insertion
------------------------------------------------------------
merged: robertc at robertcollins.net-20051023114619-cec8ca25207b1344
parent: robertc at robertcollins.net-20051022132747-706eed356bb1a11e
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-23 21:46:19 +1000
message:
More quoting at the transport layer bugfixes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051022132747-706eed356bb1a11e
parent: robertc at robertcollins.net-20051021034358-055268a69a324169
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-10-22 23:27:47 +1000
message:
convert versioning tests to use self.run_bzr, making the test suite quieter
------------------------------------------------------------
merged: robertc at robertcollins.net-20051021034358-055268a69a324169
parent: robertc at robertcollins.net-20051020092046-f41cd3e0c9896b98
parent: robertc at robertcollins.net-20051020074848-6dde0abbc59a1238
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-10-21 13:43:58 +1000
message:
merge setting of name during branching
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020074848-6dde0abbc59a1238
parent: robertc at robertcollins.net-20051020055809-70047c9f64e0a0a0
parent: robertc at robertcollins.net-20051020040918-4498d0a87aa37c87
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 17:48:48 +1000
message:
merge from upstream
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020040918-4498d0a87aa37c87
parent: robertc at robertcollins.net-20051020040812-fecd1bc32aa3478e
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 14:09:18 +1000
message:
update NEWS for post_commit
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020040812-fecd1bc32aa3478e
parent: robertc at robertcollins.net-20051020030620-3fa3160be265c585
parent: aaron.bentley at utoronto.ca-20051020025755-e03df41c52aa3156
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 14:08:12 +1000
message:
Merge from Aaron Bentley.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020025755-e03df41c52aa3156
parent: aaron.bentley at utoronto.ca-20051020025055-ae7bbc83f64bfd82
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 22:57:55 -0400
message:
tweaked spacing
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020025055-ae7bbc83f64bfd82
parent: aaron.bentley at utoronto.ca-20051020024033-6c024ecc0c78f471
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 22:50:55 -0400
message:
attempted to clarify the three-way merge code
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020024033-6c024ecc0c78f471
parent: aaron.bentley at utoronto.ca-20051020021004-566dee52da0fcd22
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 22:40:33 -0400
message:
committed fixes for new file conflict
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020021004-566dee52da0fcd22
parent: aaron.bentley at utoronto.ca-20051020020343-ae2f546b12a67485
parent: mbp at sourcefrog.net-20051019070401-0536bd80d1282c7f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 22:10:04 -0400
message:
Merge martin
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019070401-0536bd80d1282c7f
parent: mbp at sourcefrog.net-20051019064453-4d0ad1d57ab87aef
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 17:04:01 +1000
message:
Update news and readme
- better explanation of dependencies
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051019064453-4d0ad1d57ab87aef
parent: mbp at sourcefrog.net-20051019061131-6489a7f68564588e
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-10-19 16:44:53 +1000
message:
Load transports when they're first used.
- cleans up startup code
- plugins can import modules like paramiko that won't be present,
and just fail if they're not loaded
- possibly faster at startup
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020020343-ae2f546b12a67485
parent: aaron.bentley at utoronto.ca-20051020011258-c5d516d8965056aa
parent: robertc at robertcollins.net-20051019115459-a850274afcf87734
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 22:03:43 -0400
message:
Merged Robert's latest
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019115459-a850274afcf87734
parent: robertc at robertcollins.net-20051019072540-0ab4d3bd16ff8c94
parent: robertc at robertcollins.net-20051019101157-17438d311e746b4f
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 21:54:59 +1000
message:
merge from Martin, via newformat, and teach sftp about urlescaped paths
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019101157-17438d311e746b4f
parent: robertc at robertcollins.net-20051018131157-76a9970aa78e927e
parent: mbp at sourcefrog.net-20051019061131-6489a7f68564588e
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 20:11:57 +1000
message:
merge from upstream
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018131157-76a9970aa78e927e
parent: robertc at robertcollins.net-20051018125307-730e47c1a034cb6f
parent: mbp at sourcefrog.net-20051018063047-13fc3067d2f579a3
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 23:11:57 +1000
message:
Merged Martin.
------------------------------------------------------------
merged: A
committer: Robert Collins <robertc at lifelesslap.robertcollins.net>
timestamp: Tue 2005-10-18 16:34:40 +1000
message:
silly commit
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018125307-730e47c1a034cb6f
parent: robertc at robertcollins.net-20051017233518-6746654be564edde
parent: robertc at robertcollins.net-20051018120755-dff7965f9c6f9ee8
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 22:53:07 +1000
message:
Merge in various improvements to pull, testing and configuration.
* 'bzr pull' now accepts '--clobber' which will discard local changes
and make this branch identical to the source branch. (Robert Collins)
* There is a new method for TestCaseInTempDir, assertFileEqual, which
will check that a given content is equal to the content of the named
file. (Robert Collins)
* 'pull' has been factored out of the command as WorkingTree.pull().
A new option to WorkingTree.pull has been added, clobber, which will
ignore diverged history and pull anyway.
(Robert Collins)
* config.Config has a 'get_user_option' call that accepts an option name.
This will be looked up in branches.conf and bazaar.conf as normal.
It is intended that this be used by plugins to support options -
options of built in programs should have specific methods on the config.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018120755-dff7965f9c6f9ee8
parent: robertc at robertcollins.net-20051018073853-1206e813d89ba440
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 22:07:55 +1000
message:
Add assertFileEqual to TestCaseInTempDir.
There is a new method for TestCaseInTempDir, assertFileEqual, which
will check that a given content is equal to the content of the named
file.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018073853-1206e813d89ba440
parent: robertc at robertcollins.net-20051018065624-e92ff4e7ab3175bb
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 17:38:53 +1000
message:
config.Config has a 'get_user_option' call that accepts an option name.
This will be looked up in branches.conf and bazaar.conf as normal.
It is intended that this be used by plugins to support options -
options of built in programs should have specific methods on the config.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018065624-e92ff4e7ab3175bb
parent: robertc at robertcollins.net-20051018064217-e810bd94c74a9ad1
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 16:56:24 +1000
message:
'bzr pull' now accepts '--clobber'.
This will discard local changes and make this branch identical to the source
branch. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018064217-e810bd94c74a9ad1
parent: robertc at robertcollins.net-20051018052622-653d638c9e26fde4
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 16:42:17 +1000
message:
Factor out the guts of 'pull' from the command into WorkingTree.pull().
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018052622-653d638c9e26fde4
parent: robertc at robertcollins.net-20051017233206-cbd6059e27bd4e39
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-18 15:26:22 +1000
message:
fix broken tests
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019072540-0ab4d3bd16ff8c94
parent: robertc at robertcollins.net-20051019063338-45b891502a09911c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 17:25:40 +1000
message:
Change Transport.* to work with URL's.
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
to apis like 'put', 'get' and 'has'. This is to provide consistent
behaviour - it operates on url's only. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019063338-45b891502a09911c
parent: robertc at robertcollins.net-20051019060101-1f62d4fb1a5f59dc
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 16:33:38 +1000
message:
The HTTP transport would return NoSuchFile inappropriately.
bzrlib.transport.http has been modified so that only 404 urllib errors
are returned as NoSuchFile. Other exceptions will propogate as normal.
This allows debuging of actual errors. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019060101-1f62d4fb1a5f59dc
parent: robertc at robertcollins.net-20051019045120-88cf0c30850cf736
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 16:01:01 +1000
message:
WorkingTree.__del__ has been removed.
It was non deterministic and not doing what it was intended
to. See WorkingTree.__init__ for a comment about future directions.
(Robert Collins/Martin Pool)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051019045120-88cf0c30850cf736
parent: robertc at robertcollins.net-20051018234712-45a83974f691c860
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 14:51:20 +1000
message:
revision may be None in cmd_branch, do not treat as an int.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051018234712-45a83974f691c860
parent: robertc at robertcollins.net-20051018131157-76a9970aa78e927e
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-10-19 09:47:12 +1000
message:
Bugfix the new pull --clobber to not generate spurious conflicts.
When --clobber clobbered the history, a bad merge base was used.
Supporting this:
* merge.merge_inner now has tempdir as an optional parameter. (Robert Collins)
* Tree.kind is not recorded at the top level of the hierarchy, as it was
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
(Robert Collins)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020011258-c5d516d8965056aa
parent: aaron.bentley at utoronto.ca-20051020004917-6c576ac8d91f46ea
parent: robertc at robertcollins.net-20051019072540-0ab4d3bd16ff8c94
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 21:12:58 -0400
message:
Merged lifeless
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020004917-6c576ac8d91f46ea
parent: aaron.bentley at utoronto.ca-20051020000855-35ba5831ddaafee6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 20:49:17 -0400
message:
Restored merge-type selection
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051020000855-35ba5831ddaafee6
parent: abentley at panoramicfeedback.com-20051019195211-df4e4a8f8608f8fe
parent: aaron.bentley at utoronto.ca-20051019053950-8e77f1fca82f8865
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 20:08:55 -0400
message:
Merge my show-base change
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051019053950-8e77f1fca82f8865
parent: abentley at panoramicfeedback.com-20051019053042-8c2e001e21a5a692
parent: aaron.bentley at utoronto.ca-20051019024058-4562b385778ee490
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Wed 2005-10-19 01:39:50 -0400
message:
merged show-base from other branch
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051019024058-4562b385778ee490
parent: abentley at panoramicfeedback.com-20051018190214-384640a1ae232299
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Tue 2005-10-18 22:40:58 -0400
message:
Added --show-base to merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018190214-384640a1ae232299
parent: abentley at panoramicfeedback.com-20051018185256-3724349b6bef67ec
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 15:02:14 -0400
message:
Allowed second call of _get_parser() to not require a file
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018185256-3724349b6bef67ec
parent: abentley at panoramicfeedback.com-20051018184827-2cc69376beb1cdf3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 14:52:56 -0400
message:
Mentioned CO in NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018184827-2cc69376beb1cdf3
parent: abentley at panoramicfeedback.com-20051017201755-48ed4650792388ab
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 14:48:27 -0400
message:
Switched to ConfigObj
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051017201755-48ed4650792388ab
parent: abentley at panoramicfeedback.com-20051017174957-9669ee80955f0adf
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-17 16:17:55 -0400
message:
Merged latest from Martin
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051017174957-9669ee80955f0adf
parent: abentley at panoramicfeedback.com-20051017152349-d8a9fdcf75898bd9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-17 13:49:57 -0400
message:
Fixed selftest bug for users with short ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051017152349-d8a9fdcf75898bd9
parent: abentley at lappy-20051016235625-f2e4f5d4ff1e889c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-17 11:23:49 -0400
message:
Fixed -r brokenness in merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019053042-8c2e001e21a5a692
parent: abentley at panoramicfeedback.com-20051018205309-4ccd131f3ddabd51
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 01:30:42 -0400
message:
did test wrapping for option text
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018205309-4ccd131f3ddabd51
parent: abentley at panoramicfeedback.com-20051018201944-42864e79d8e9ad29
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 16:53:09 -0400
message:
Fixed wrong-long-option errors
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018201944-42864e79d8e9ad29
parent: abentley at panoramicfeedback.com-20051018194704-47d6827cc1d0d11b
parent: robertc at robertcollins.net-20051018125307-730e47c1a034cb6f
parent: A
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 16:19:44 -0400
message:
Merged more from Robert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051018194704-47d6827cc1d0d11b
parent: abentley at panoramicfeedback.com-20051018190214-384640a1ae232299
parent: robertc at robertcollins.net-20051017115654-662239e1587524a8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-18 15:47:04 -0400
message:
Merged more config stuff from Robert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019195211-df4e4a8f8608f8fe
parent: abentley at panoramicfeedback.com-20051019190125-96dbdbd6c7816f0b
parent: mbp at sourcefrog.net-20051019050312-d5791b27e7926a28
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 15:52:11 -0400
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019190125-96dbdbd6c7816f0b
parent: abentley at panoramicfeedback.com-20051019190103-7592b0cfc94e4109
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 15:01:25 -0400
message:
Added command-quieting test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019190103-7592b0cfc94e4109
parent: abentley at panoramicfeedback.com-20051019175751-47021813f45f6122
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 15:01:03 -0400
message:
Included configobj in setup.py
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019175751-47021813f45f6122
parent: abentley at panoramicfeedback.com-20051019175331-77ee21c8dc29d9ee
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 13:57:51 -0400
message:
Fixed bzr ancestry find_branch call
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019175331-77ee21c8dc29d9ee
parent: abentley at panoramicfeedback.com-20051019053042-8c2e001e21a5a692
parent: A
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 13:53:31 -0400
message:
Prevented display commands from printing broken pipe errors
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020030620-3fa3160be265c585
parent: robertc at robertcollins.net-20051020025244-fa1017d19a0ef618
parent: mbp at sourcefrog.net-20051019070401-0536bd80d1282c7f
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 13:06:20 +1000
message:
merge from Martin
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020025244-fa1017d19a0ef618
parent: robertc at robertcollins.net-20051020010507-5b7356be0f80930e
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 12:52:44 +1000
message:
post commit hook, first pass implementation
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020010507-5b7356be0f80930e
parent: robertc at robertcollins.net-20051019115459-a850274afcf87734
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 11:05:07 +1000
message:
Bugfix to previous url escaping patch - include weave stores
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020055809-70047c9f64e0a0a0
parent: robertc at robertcollins.net-20051018120755-dff7965f9c6f9ee8
parent: A
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 15:58:09 +1000
message:
'bzr branch' sets the branch-name,
It will now set the branch-name to the last component of the
output directory, if one was supplied.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051020092046-f41cd3e0c9896b98
parent: robertc at robertcollins.net-20051020040918-4498d0a87aa37c87
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-20 19:20:46 +1000
message:
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
'merge_flex' no longer calls conflict_handler.finalize(), instead that
is called by merge_inner. This is so that the conflict count can be
retrieved (and potentially manipulated) before returning to the caller
of merge_inner. Likewise 'merge' now returns the conflict count to the
caller. (Robert Collins)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024022002-91c6683873cdbb87
parent: mbp at sourcefrog.net-20051021053602-d0b789804a0dbdd7
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 12:20:02 +1000
message:
Fix http server tests for win32/macos (John)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051021053602-d0b789804a0dbdd7
parent: mbp at sourcefrog.net-20051021051225-4d9cebc5dde11096
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-21 15:36:02 +1000
message:
Make commit message long enough in test for pending merges
so that we see the elipsis characters.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051021051225-4d9cebc5dde11096
parent: mbp at sourcefrog.net-20051021033318-5a5e313f24684453
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-21 15:12:25 +1000
message:
- fix line endings in sftp transport
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051021033318-5a5e313f24684453
parent: mbp at sourcefrog.net-20051020053220-98d5bce475edc359
committer: mbp at sourcefrog.net
timestamp: Fri 2005-10-21 13:33:18 +1000
message:
- win32 get_console_size from Alexander
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020053220-98d5bce475edc359
parent: mbp at sourcefrog.net-20051020040116-3896b2868de9e05e
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 15:32:20 +1000
message:
- rules for using destructors
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020040116-3896b2868de9e05e
parent: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 14:01:16 +1000
message:
- fix indents
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
parent: mbp at sourcefrog.net-20051020034046-c15388d921246708
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 13:55:33 +1000
message:
- notes on testability of plugins
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020034046-c15388d921246708
parent: mbp at sourcefrog.net-20051020021707-8a59b483bb86fe9c
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 13:40:46 +1000
message:
- give a quieter warning if a plugin can't be loaded
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051020021707-8a59b483bb86fe9c
parent: mbp at sourcefrog.net-20051019070401-0536bd80d1282c7f
parent: robertc at robertcollins.net-20051020010507-5b7356be0f80930e
committer: mbp at sourcefrog.net
timestamp: Thu 2005-10-20 12:17:07 +1000
message:
[merge] robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024083732-7f99eeec70f2bbb8
parent: robertc at robertcollins.net-20051023151126-c18d3642d09a27ba
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 18:37:32 +1000
message:
BUGFIX: re-sign should accept ranges
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024100558-678a90e04ba42706
parent: mbp at sourcefrog.net-20051024091557-81fd166614c71dd0
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 20:05:58 +1000
message:
Doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024091557-81fd166614c71dd0
parent: mbp at sourcefrog.net-20051024083738-b0ece45ea3b783b9
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 19:15:57 +1000
message:
Unconditionally fetch all new history during merge
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024083738-b0ece45ea3b783b9
parent: mbp at sourcefrog.net-20051024083722-791734e579375c9d
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:37:38 +1000
message:
More merge/fetch tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024083722-791734e579375c9d
parent: mbp at sourcefrog.net-20051024081707-3bb0882c4ff583b1
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:37:22 +1000
message:
Make weave.py executable as a script
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024081707-3bb0882c4ff583b1
parent: mbp at sourcefrog.net-20051024081252-b0b27a00a68d87a3
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:17:07 +1000
message:
New test that merge fetches revisions from source
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024081252-b0b27a00a68d87a3
parent: mbp at sourcefrog.net-20051024080750-8c60dd9c8e346198
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:12:52 +1000
message:
Fix trace message
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024080750-8c60dd9c8e346198
parent: mbp at sourcefrog.net-20051024074547-81a9806a45b2a88b
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 18:07:50 +1000
message:
API docs for merge
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051024074547-81a9806a45b2a88b
parent: mbp at sourcefrog.net-20051024023528-817a47f36cb21963
committer: mbp at sourcefrog.net
timestamp: Mon 2005-10-24 17:45:47 +1000
message:
- add trace to merge
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019054013-518c59352d12019a
parent: michael at ellerman.id.au-20051019053733-fdbf18701d7ab8ea
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 15:40:13 +1000
message:
Fix doctest failure in Branch
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019053733-fdbf18701d7ab8ea
parent: michael at ellerman.id.au-20051019051845-1d3018be81222b18
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 15:37:33 +1000
message:
Strict commit was a little .. ah .. too strict, oops :}
branch.unknowns() returns a generator, so we can't do if branch.unknowns(),
it's always True.
if len(list(branch.unknowns())) might look cleanest, but creating the list of
unknowns is not cheap for large numbers of unknown files.
Instead we use a for loop to raise an exception as soon as we get one unknown
back from the generator.
Add more tests to make sure this doesn't break again.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019051845-1d3018be81222b18
parent: michael at concordia-20051019043528-6cf6dc8fe5e72bb2
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 15:18:45 +1000
message:
Undo double merge of strict commit
------------------------------------------------------------
merged: michael at concordia-20051019043528-6cf6dc8fe5e72bb2
parent: michael at ellerman.id.au-20051017115918-be3eadbee7ffa6fb
parent: mbp at sourcefrog.net-20051018114741-569e2fada4aa2c1d
committer: Michael Ellerman <michael at concordia>
timestamp: Wed 2005-10-19 14:35:28 +1000
message:
Merge from mainline.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051017115918-be3eadbee7ffa6fb
parent: mbp at sourcefrog.net-20051017065711-1c65e58938222fdd
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Mon 2005-10-17 21:59:18 +1000
message:
Implement strict commits with --strict flag.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027022612-a259d9eacbe71552
parent: mbp at sourcefrog.net-20051027020153-20bf39a493557b9c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 12:26:12 +1000
message:
Test for 'name in weave'
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027020153-20bf39a493557b9c
parent: mbp at sourcefrog.net-20051027020125-5e14fcc894afd240
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 12:01:53 +1000
message:
Add Weave.__contains__.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027020125-5e14fcc894afd240
parent: mbp at sourcefrog.net-20051027005309-2a7590d8bc3f9087
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 12:01:25 +1000
message:
Fix syntax of serializer_v5.pack_revision_to_string
*_to_string functions should return strings with a trailing newline.
Add tests for this.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027005309-2a7590d8bc3f9087
parent: mbp at sourcefrog.net-20051027000207-deb15558011913b1
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 10:53:09 +1000
message:
[patch] Close test log file before deleting, needed on Windows
(Alexander Belchenko)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027000207-deb15558011913b1
parent: mbp at sourcefrog.net-20051026234727-6b85ff2120f62cf0
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 10:02:07 +1000
message:
Sort and clean up list of default ignores
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026234727-6b85ff2120f62cf0
parent: mbp at sourcefrog.net-20051026234028-db434f9bc9e84fbf
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 09:47:27 +1000
message:
Show exception class in error messages
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026234028-db434f9bc9e84fbf
parent: mbp at sourcefrog.net-20051026064515-b13cf1f96bf814dc
parent: abentley at panoramicfeedback.com-20051026160834-23cda6ed223ded07
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 09:40:28 +1000
message:
[merge] aaron
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051026160834-23cda6ed223ded07
parent: abentley at panoramicfeedback.com-20051026135750-1076ead7e75afac2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-26 12:08:34 -0400
message:
Substituted branch_files for equivalent code
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051026135750-1076ead7e75afac2
parent: abentley at panoramicfeedback.com-20051026131719-17ef96584de39262
parent: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-26 09:57:50 -0400
message:
Merged Martin's latest
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051026131719-17ef96584de39262
parent: abentley at panoramicfeedback.com-20051025231834-78f6025f59a16c8b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-26 09:17:19 -0400
message:
Fixed add_suffix when renaming tree version to foo.THIS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051025231834-78f6025f59a16c8b
parent: abentley at panoramicfeedback.com-20051025230939-c96bc00f6cf969c5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-25 19:18:34 -0400
message:
Updated NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051025230939-c96bc00f6cf969c5
parent: abentley at panoramicfeedback.com-20051025222400-d8420bad3680928b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-25 19:09:39 -0400
message:
Made commit take branch from first argument, if supplied.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051025222400-d8420bad3680928b
parent: abentley at panoramicfeedback.com-20051024174246-7b1be2b168413272
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Tue 2005-10-25 18:24:00 -0400
message:
Updated news
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024174246-7b1be2b168413272
parent: abentley at panoramicfeedback.com-20051024164918-4e3f89415dc6d7cd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 13:42:46 -0400
message:
Handled conflicts with versioned files better
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024164918-4e3f89415dc6d7cd
parent: abentley at panoramicfeedback.com-20051024160919-282458b455bf5b4e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 12:49:18 -0400
message:
Support for forcing merges of unrelated trees
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024160919-282458b455bf5b4e
parent: abentley at panoramicfeedback.com-20051024155615-6af1ed78ba9e4f9f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 12:09:19 -0400
message:
Updated docs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024155615-6af1ed78ba9e4f9f
parent: abentley at panoramicfeedback.com-20051024150909-88bf8a581c631f6c
parent: mbp at sourcefrog.net-20051024102201-4a850a2e1c8724d7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 11:56:15 -0400
message:
Merge from mpool
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024150909-88bf8a581c631f6c
parent: abentley at panoramicfeedback.com-20051024145714-d3ae79be081f39d8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 11:09:09 -0400
message:
Fixes for default ignores
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024145714-d3ae79be081f39d8
parent: abentley at panoramicfeedback.com-20051024141840-957302d19be73e7f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 10:57:14 -0400
message:
Added default ignores for Arch, autofoo, compiled files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024141840-957302d19be73e7f
parent: abentley at panoramicfeedback.com-20051024135749-64122a285339663d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 10:18:40 -0400
message:
Fixed obsolete help
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024135749-64122a285339663d
parent: abentley at panoramicfeedback.com-20051024124852-c1214f7527292c30
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 09:57:49 -0400
message:
Fixed pull help, renamed clobber to overwrite
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024124852-c1214f7527292c30
parent: aaron.bentley at utoronto.ca-20051024044121-fc3059fae13e23e2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 08:48:52 -0400
message:
Fixed exception (No such thing as EncodingError that I can see)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051024044121-fc3059fae13e23e2
parent: aaron.bentley at utoronto.ca-20051024005115-11eb6ff177fc195d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Mon 2005-10-24 00:41:21 -0400
message:
Fixed InvalidRevisionID handling in Branch.get_revision_xml
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051024005115-11eb6ff177fc195d
parent: aaron.bentley at utoronto.ca-20051023234145-809a01974c2dc38b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 20:51:15 -0400
message:
Improved sort order of indirect merges
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023234145-809a01974c2dc38b
parent: aaron.bentley at utoronto.ca-20051023055504-118466d505ee4f52
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 19:41:45 -0400
message:
Added weave merge conflict to ExceptionConflictHandler
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023055504-118466d505ee4f52
parent: aaron.bentley at utoronto.ca-20051023052822-5d24a0faccc37a69
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 01:55:04 -0400
message:
Updated NEWS, error out if --show-base supplied and unsupported
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023052822-5d24a0faccc37a69
parent: aaron.bentley at utoronto.ca-20051023052047-3b6e36d9548cda07
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 01:28:22 -0400
message:
Switched to standard 7-char conflict markers
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023052047-3b6e36d9548cda07
parent: aaron.bentley at utoronto.ca-20051023033827-00e09ee38fe6eb84
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 01:20:47 -0400
message:
Added conflict handling for weave merges
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023033827-00e09ee38fe6eb84
parent: aaron.bentley at utoronto.ca-20051023002617-d57101d2671509f7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 23:38:27 -0400
message:
got merge type selection under test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023002617-d57101d2671509f7
parent: aaron.bentley at utoronto.ca-20051023000410-ea7f59932e2d3777
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 20:26:17 -0400
message:
Preliminary weave merge support
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051023000410-ea7f59932e2d3777
parent: aaron.bentley at utoronto.ca-20051022234501-236f63fda8c236ea
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 20:04:10 -0400
message:
Fix missing import
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051022234501-236f63fda8c236ea
parent: aaron.bentley at utoronto.ca-20051022232356-861a8b02872b132f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 19:45:01 -0400
message:
Restored merge type selection
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051022232356-861a8b02872b132f
parent: abentley at panoramicfeedback.com-20051021205609-004cda57d9f600fc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sat 2005-10-22 19:23:56 -0400
message:
Added mode preservation to AtomicFile
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021205609-004cda57d9f600fc
parent: abentley at panoramicfeedback.com-20051021201536-08d19a910242bcd0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 16:56:09 -0400
message:
Fixed double-reporting of pending merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021201536-08d19a910242bcd0
parent: abentley at panoramicfeedback.com-20051021194706-1f9e6e0c9b8647f9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 16:15:36 -0400
message:
Show indirect merges in status
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021194706-1f9e6e0c9b8647f9
parent: abentley at panoramicfeedback.com-20051021193207-b995bd6ca86366ac
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 15:47:06 -0400
message:
Prevented all ancestors from being marked as pending merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021193207-b995bd6ca86366ac
parent: abentley at panoramicfeedback.com-20051021175916-fe9541771c0d7e4e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 15:32:07 -0400
message:
Refactored merge and merge_inner to use Merger
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021175916-fe9541771c0d7e4e
parent: abentley at panoramicfeedback.com-20051021170219-d00be37b77b15040
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 13:59:16 -0400
message:
Introduced transform_tree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021170219-d00be37b77b15040
parent: abentley at panoramicfeedback.com-20051021165153-bfb2a975b6d364c7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 13:02:19 -0400
message:
Cleanup of merge.py
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021165153-bfb2a975b6d364c7
parent: abentley at panoramicfeedback.com-20051021163021-1e34da95b3cb56c3
parent: mbp at sourcefrog.net-20051021053602-d0b789804a0dbdd7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 12:51:53 -0400
message:
Merge Martin's latest
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051021163021-1e34da95b3cb56c3
parent: aaron.bentley at utoronto.ca-20051021032845-9c9e306061a42651
parent: robertc at robertcollins.net-20051020092046-f41cd3e0c9896b98
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Fri 2005-10-21 12:30:21 -0400
message:
Merged Robert Collins
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051021032845-9c9e306061a42651
parent: aaron.bentley at utoronto.ca-20051021032050-88224a49b5001bb6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-20 23:28:45 -0400
message:
Merge3 cleanups
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051021032050-88224a49b5001bb6
parent: abentley at panoramicfeedback.com-20051020213453-796630baa6e08bf6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-20 23:20:50 -0400
message:
Removed b
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051020213453-796630baa6e08bf6
parent: aaron.bentley at utoronto.ca-20051020025755-e03df41c52aa3156
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-20 17:34:53 -0400
message:
Ignored ^C in display commands
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026064515-b13cf1f96bf814dc
parent: mbp at sourcefrog.net-20051026063958-8742c9b5c23a9e8b
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 16:45:15 +1000
message:
More reweave tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051026063958-8742c9b5c23a9e8b
parent: mbp at sourcefrog.net-20051026062015-ab8c2e8913b19989
committer: mbp at sourcefrog.net
timestamp: Wed 2005-10-26 16:39:58 +1000
message:
Reweave in topological-sort order.
Previous ad-hoc order could fail when the weaves contained extensively
different but still consistent graphs.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028054949-98b4a70546cb7129
parent: mbp at sourcefrog.net-20051028053540-3eb02450833461e1
parent: aaron.bentley at utoronto.ca-20051028023422-f4c0b704edd5f79d
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 15:49:49 +1000
message:
[merge] short-option fix and merge --reprocess
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051028023422-f4c0b704edd5f79d
parent: abentley at panoramicfeedback.com-20051027234449-f257689f3a79d80a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-27 22:34:22 -0400
message:
Restored short options in help
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027234449-f257689f3a79d80a
parent: abentley at panoramicfeedback.com-20051027234315-1f51cfe5a0303e31
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 19:44:49 -0400
message:
Updated NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027234315-1f51cfe5a0303e31
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
parent: abentley at panoramicfeedback.com-20051027234145-cc851c8f0f63eaba
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 19:43:15 -0400
message:
Merged reprocessing for merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027234145-cc851c8f0f63eaba
parent: abentley at panoramicfeedback.com-20051027231448-ba0ae9cde819edc9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 19:41:45 -0400
message:
Integrated reprocessing into the rest of the merge stuff
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027231448-ba0ae9cde819edc9
parent: abentley at panoramicfeedback.com-20051027230926-4e9911d404596430
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 19:14:48 -0400
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027230926-4e9911d404596430
parent: abentley at panoramicfeedback.com-20051024174246-7b1be2b168413272
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 19:09:26 -0400
message:
Got reprocessing working
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028053540-3eb02450833461e1
parent: mbp at sourcefrog.net-20051027035040-076326e2321b5257
parent: aaron.bentley at utoronto.ca-20051028043558-b39b4663f21c99dc
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 15:35:40 +1000
message:
[merge] win32 fixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051028043558-b39b4663f21c99dc
parent: aaron.bentley at utoronto.ca-20051028043446-9a5efa4bc437d071
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Fri 2005-10-28 00:35:58 -0400
message:
win32 locking fix from Belchenko
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051028043446-9a5efa4bc437d071
parent: aaron.bentley at utoronto.ca-20051028043155-f87e0a6f5e905b12
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Fri 2005-10-28 00:34:46 -0400
message:
win32 glob expansion fix from Belchenko
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051028043155-f87e0a6f5e905b12
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Fri 2005-10-28 00:31:55 -0400
message:
win32 setup fixes from Belchenko
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051027035040-076326e2321b5257
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-10-27 13:50:40 +1000
message:
Prepare for 0.6rc1
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031171704-4e16f11e8135aeff
parent: mbp at sourcefrog.net-20051031133705-7216138f826218cd
parent: robertc at robertcollins.net-20051030235846-fda8b626748cce52
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 12:17:04 -0500
message:
[merge] robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030235846-fda8b626748cce52
parent: robertc at robertcollins.net-20051030173220-0a4a8cf5dbde6673
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-30 18:58:46 -0500
message:
Move Branch.read_working_inventory to WorkingTree.
Branch.read_working_inventory has moved to
WorkingTree.read_working_inventory. This necessitated changes to
Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
as well. To make it clear that a WorkingTree cannot always be obtained
Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
be obtained. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030173220-0a4a8cf5dbde6673
parent: robertc at robertcollins.net-20051030145626-2f57bd49824dd1d7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-30 12:32:20 -0500
message:
Bugfix: SFTP had index errors walking up to the root path.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030145626-2f57bd49824dd1d7
parent: robertc at robertcollins.net-20051030134112-e0c65fc981721f18
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-30 09:56:26 -0500
message:
Add a --create-prefix to the new push command.
As part of this, some option parsing errors will raise 'BzrOptionError',
allowing granular detection for decorating commands. (Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030134112-e0c65fc981721f18
parent: robertc at robertcollins.net-20051030133625-2d0cb66618da4f6c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-30 08:41:12 -0500
message:
Set push and pull locations only upon success.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030133625-2d0cb66618da4f6c
parent: robertc at robertcollins.net-20051030014016-98a4fba7d6a4176c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sun 2005-10-30 08:36:25 -0500
message:
Adjust sftp url regex to allow foo at bar usernames.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030014016-98a4fba7d6a4176c
parent: robertc at robertcollins.net-20051030000009-9db99a338a0dfdac
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-10-29 21:40:16 -0400
message:
Support decoration of commands.
Commands.register_command now takes an optional flag to signal that the
registrant is planning to decorate an existing command. When given
multiple plugins registering a command is not an error, and the original
command class (whether built in or a plugin based one) is returned to the
caller. There is a new error 'MustUseDecorated' for signalling when a
wrapping command should switch to the original version. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051030000009-9db99a338a0dfdac
parent: robertc at robertcollins.net-20051029234845-7ae4e7d118bdd3ed
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-10-29 20:00:09 -0400
message:
Merge from Martin.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051029234845-7ae4e7d118bdd3ed
parent: robertc at robertcollins.net-20051028222236-24a8086314b34613
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-10-29 19:48:45 -0400
message:
Implement a 'bzr push' command, with saved locations; update diff to return 1.
* 'bzr diff' now returns 1 when there are changes in the working
tree.
* 'bzr push' now exists and can push changes to a remote location.
This uses the transport infrastructure, and can store the remote
location in the ~/.bazaar/branches.conf configuration file.
* WorkingTree.pull has been split across Branch and WorkingTree,
to allow Branch only pulls.
* commands.display_command now returns the result of the decorated
function.
* LocationConfig now has a set_user_option(key, value) call to save
a setting in its matching location section (a new one is created
if needed).
* Branch has two new methods, get_push_location and set_push_location
to respectively, get and set the push location.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051028222236-24a8086314b34613
parent: robertc at robertcollins.net-20051027194518-58afabc9ab280bb0
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-10-28 18:22:36 -0400
message:
Make the paramiko tests pass. Nice huh.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051027194518-58afabc9ab280bb0
parent: robertc at robertcollins.net-20051024140519-8c20eb83b8981c05
parent: mbp at sourcefrog.net-20051027034457-acfead93c532ec29
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-10-27 15:45:18 -0400
message:
Merge from Martin
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024140519-8c20eb83b8981c05
parent: robertc at robertcollins.net-20051024135918-024629d7ee347b5c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Tue 2005-10-25 00:05:19 +1000
message:
NEWS file entry for prior commit - upgrades of trees with no revisions should not fail.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051024135918-024629d7ee347b5c
parent: robertc at robertcollins.net-20051024085433-5e48ed93d1546627
parent: dilinger at athenacr.com-20051020194856-86687868337effed
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-10-24 23:59:18 +1000
message:
fix upgrading of trees with no commits
------------------------------------------------------------
merged: dilinger at athenacr.com-20051020194856-86687868337effed
parent: mbp at sourcefrog.net-20051020035533-aeb2314d74708a3d
committer: Andres Salomon <dilinger at athenacr.com>
timestamp: Thu 2005-10-20 15:48:56 -0400
message:
Handle the case where revision_history() returns an empty list during
an upgrade. Not a huge problem, since there's really nothing to convert,
but it's nice to not spew errors anyways.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031133705-7216138f826218cd
parent: mbp at sourcefrog.net-20051031131752-937c2ac79930eb6c
parent: steve at borho.org-20051031155052-c771ab6189cd2691
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 08:37:05 -0500
message:
[merge] zsh improvements (Steve Borho)
------------------------------------------------------------
merged: steve at borho.org-20051031155052-c771ab6189cd2691
parent: steve at borho.org-20051031062521-a655b2f5cc24eec2
committer: Steve Borho <steve at borho.org>
timestamp: Mon 2005-10-31 09:50:52 -0600
message:
Protect against error messages when not inside a branch
------------------------------------------------------------
merged: steve at borho.org-20051031062521-a655b2f5cc24eec2
parent: steve at borho.org-20051029142439-1d227ee477827410
committer: Steve Borho <steve at borho.org>
timestamp: Mon 2005-10-31 00:25:21 -0600
message:
Fixed spelling of detritus in clean-tree completion function
------------------------------------------------------------
merged: steve at borho.org-20051029142439-1d227ee477827410
parent: steve at borho.org-20051028193443-3247785118d72ad6
committer: Steve Borho <steve at borho.org>
timestamp: Sat 2005-10-29 09:24:39 -0500
message:
Added zsh completions for common plugins
------------------------------------------------------------
merged: steve at borho.org-20051028193443-3247785118d72ad6
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Steve Borho <steve at borho.org>
timestamp: Fri 2005-10-28 14:34:43 -0500
message:
zsh completions updated for bzr 0.6
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031131752-937c2ac79930eb6c
parent: mbp at sourcefrog.net-20051031123645-20ecc5dd9337fb90
parent: robertc at robertcollins.net-20051024140519-8c20eb83b8981c05
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 08:17:52 -0500
message:
[merge] upgrade fix
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031123645-20ecc5dd9337fb90
parent: mbp at sourcefrog.net-20051031120610-da41deafd12fdbb8
parent: jelmer at samba.org-20051030171629-f0af39611b2a072c
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 07:36:45 -0500
message:
[merge] fix sftp selftest and parsing of passwords in sftp urls
------------------------------------------------------------
merged: jelmer at samba.org-20051030171629-f0af39611b2a072c
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Jelmer Vernooij <jelmer at samba.org>
timestamp: Sun 2005-10-30 18:16:29 +0100
message:
Parse passwords in sftp URLs (sftp://foo:bar@localhost/).
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031120610-da41deafd12fdbb8
parent: mbp at sourcefrog.net-20051031120304-2dcdacfc04b814d8
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 07:06:10 -0500
message:
[patch] 'bzr init DIR' (John)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051031120304-2dcdacfc04b814d8
parent: mbp at sourcefrog.net-20051028072011-e5f623cec5769d4e
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-10-31 07:03:04 -0500
message:
Remove duplicated NEWS entry
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028072011-e5f623cec5769d4e
parent: mbp at sourcefrog.net-20051028055627-b80f0d7d43d07407
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 17:20:11 +1000
message:
Set logger level depending on BZR_DEBUG to reduce work
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051028055627-b80f0d7d43d07407
parent: mbp at sourcefrog.net-20051028055302-14e925407b2b09d4
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-10-28 15:56:27 +1000
message:
0.6 release
More information about the bazaar-commits
mailing list