Rev 264: Merge upstream. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev
Jelmer Vernooij
jelmer at samba.org
Mon Jan 1 17:55:18 GMT 2007
------------------------------------------------------------
revno: 264
revision-id: jelmer at samba.org-20070101175406-z596p07otvo3c8jh
parent: jelmer at samba.org-20061229164052-l6hr3ie3je9ae1zc
parent: jelmer at samba.org-20070101173622-q1h4vkjd9cuevxzd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: norootid
timestamp: Mon 2007-01-01 18:54:06 +0100
message:
Merge upstream.
added:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
tests/test_checkout.py test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
modified:
TODO todo-20060729211917-2kpobww0zyvvo0j2-1
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
checkout.py workingtree.py-20060306120941-b083cb0fdd4a69de
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
format.py format.py-20060406233823-b6fa009fe35dfde7
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping.txt mapping.txt-20060625151311-9ghaqrm71ajq593n-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_transport.py test_transport.py-20060621232111-xh7xvoblzsrgj79t-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
------------------------------------------------------------
revno: 236.1.11.1.107
merged: jelmer at samba.org-20070101173622-q1h4vkjd9cuevxzd
parent: jelmer at samba.org-20070101170010-0v0mdegv2ilp0fxj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 18:36:22 +0100
message:
Update NEWS, TODO, add some FIXME's.
------------------------------------------------------------
revno: 236.1.11.1.106
merged: jelmer at samba.org-20070101170010-0v0mdegv2ilp0fxj
parent: jelmer at samba.org-20070101162635-5cdtbm36kfqlhtcg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 18:00:10 +0100
message:
Allow importing to a remote repository.
------------------------------------------------------------
revno: 236.1.11.1.105
merged: jelmer at samba.org-20070101162635-5cdtbm36kfqlhtcg
parent: jelmer at samba.org-20070101160712-hwasoj85vlmrxqmu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 17:26:35 +0100
message:
Don't prepend branch path with slash as that causes problems with
svn_ra_dav connections.
------------------------------------------------------------
revno: 236.1.11.1.104
merged: jelmer at samba.org-20070101160712-hwasoj85vlmrxqmu
parent: jelmer at samba.org-20070101154147-gihfok8g1dpayxcf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 17:07:12 +0100
message:
Don't consider files when checking for branches.
------------------------------------------------------------
revno: 236.1.11.1.103
merged: jelmer at samba.org-20070101154147-gihfok8g1dpayxcf
parent: jelmer at samba.org-20070101063020-65y03vowlr5tfik3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 16:41:47 +0100
message:
Add test file I forgot to add earlier, update TODO, some reformatting.
------------------------------------------------------------
revno: 236.1.11.1.102
merged: jelmer at samba.org-20070101063020-65y03vowlr5tfik3
parent: jelmer at samba.org-20070101061751-hbqi11kw435l7e3p
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 07:30:20 +0100
message:
Remove spurious call to get_repos_root().
------------------------------------------------------------
revno: 236.1.11.1.101
merged: jelmer at samba.org-20070101061751-hbqi11kw435l7e3p
parent: jelmer at samba.org-20070101054344-0crkmk42n3k2u9fp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 07:17:51 +0100
message:
More efficient implementation of last_revision().
------------------------------------------------------------
revno: 236.1.11.1.100
merged: jelmer at samba.org-20070101054344-0crkmk42n3k2u9fp
parent: jelmer at samba.org-20070101025448-xsv2sdp4yzw12s01
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 06:43:44 +0100
message:
Show progress bar when finding branches.
------------------------------------------------------------
revno: 236.1.11.1.99
merged: jelmer at samba.org-20070101025448-xsv2sdp4yzw12s01
parent: jelmer at samba.org-20070101024256-4j04d2s9gk0p1m9e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 03:54:48 +0100
message:
Removing directory doesn't always work.
------------------------------------------------------------
revno: 236.1.11.1.98
merged: jelmer at samba.org-20070101024256-4j04d2s9gk0p1m9e
parent: jelmer at samba.org-20070101005921-uvksxw5fgj9fjhxp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 03:42:56 +0100
message:
Fix convert optimization.
------------------------------------------------------------
revno: 236.1.11.1.97
merged: jelmer at samba.org-20070101005921-uvksxw5fgj9fjhxp
parent: jelmer at samba.org-20061231205748-2molb5x3pspz17cx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 01:59:21 +0100
message:
Avoid opening possibly remote branches if it can be avoided.
------------------------------------------------------------
revno: 236.1.11.1.96
merged: jelmer at samba.org-20061231205748-2molb5x3pspz17cx
parent: jelmer at samba.org-20061231200311-yesyt819xp8bbs03
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2006-12-31 21:57:48 +0100
message:
Don't use SvnRepository for regular Bazaar branches. (#77023)
------------------------------------------------------------
revno: 236.1.11.1.95
merged: jelmer at samba.org-20061231200311-yesyt819xp8bbs03
parent: jelmer at samba.org-20061231033910-r3ks4rqiwpmiwhqy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2006-12-31 21:03:11 +0100
message:
Properly implement SvnRemoteAccess.open_repository() and
SvnRemoteAccess.find_repository(). open_repository() now no longer
works on non-repository BzrDirs
Try to reduce the amount of TCP/IP connections overall.
------------------------------------------------------------
revno: 236.1.11.1.94
merged: jelmer at samba.org-20061231033910-r3ks4rqiwpmiwhqy
parent: jelmer at samba.org-20061231030347-8ye5ftr7c0w2inpq
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2006-12-31 04:39:10 +0100
message:
Add --all option to svn-import.
------------------------------------------------------------
revno: 236.1.11.1.93
merged: jelmer at samba.org-20061231030347-8ye5ftr7c0w2inpq
parent: jelmer at samba.org-20061230210837-oqd06o4d929mah6j
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2006-12-31 04:03:47 +0100
message:
Add NEWS file.
------------------------------------------------------------
revno: 236.1.11.1.92
merged: jelmer at samba.org-20061230210837-oqd06o4d929mah6j
parent: jelmer at samba.org-20061230192957-nyzdptkm4iu91jm0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2006-12-30 22:08:37 +0100
message:
Implement all_revision_ids().
Mutter less.
------------------------------------------------------------
revno: 236.1.11.1.91
merged: jelmer at samba.org-20061230192957-nyzdptkm4iu91jm0
parent: jelmer at samba.org-20061230174926-kprsbiva815mc835
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2006-12-30 20:29:57 +0100
message:
Simplify fetch code, avoid extra roundtrip when possible.
------------------------------------------------------------
revno: 236.1.11.1.90
merged: jelmer at samba.org-20061230174926-kprsbiva815mc835
parent: jelmer at samba.org-20061230174309-9614ukw3mkm0tebf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2006-12-30 18:49:26 +0100
message:
Properly finish progress bars when exceptions occur.
------------------------------------------------------------
revno: 236.1.11.1.89
merged: jelmer at samba.org-20061230174309-9614ukw3mkm0tebf
parent: jelmer at samba.org-20061230173356-d81shupvjqeb1g4j
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2006-12-30 18:43:09 +0100
message:
More consistent use of progress bars.
Remove unused arguments of RevisionBuildEditor.
------------------------------------------------------------
revno: 236.1.11.1.88
merged: jelmer at samba.org-20061230173356-d81shupvjqeb1g4j
parent: jelmer at samba.org-20061230021458-dlocxymqbkrngyet
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2006-12-30 18:33:56 +0100
message:
Make to_location optional. If not specified, it is determined frm
from_location in the same way as cmd_branch from bzr does.
------------------------------------------------------------
revno: 236.1.11.1.87
merged: jelmer at samba.org-20061230021458-dlocxymqbkrngyet
parent: jelmer at samba.org-20061230011810-h4o2wd05ntp7q0fj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2006-12-30 03:14:58 +0100
message:
Reduce threshold for switching to checksums.
------------------------------------------------------------
revno: 236.1.11.1.86
merged: jelmer at samba.org-20061230011810-h4o2wd05ntp7q0fj
parent: jelmer at samba.org-20061229211551-5f6dzb5dk7z59iqg
parent: jelmer at samba.org-20061229231829-2rwwhu07q2u774k8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2006-12-30 02:18:10 +0100
message:
Fix nested checkouts.
------------------------------------------------------------
revno: 236.1.11.1.85.1.1
merged: jelmer at samba.org-20061229231829-2rwwhu07q2u774k8
parent: jelmer at samba.org-20061229211551-5f6dzb5dk7z59iqg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2006-12-30 00:18:29 +0100
message:
Use checksums for the path in case the file id is too long (fixes #77453).
------------------------------------------------------------
revno: 236.1.11.1.85
merged: jelmer at samba.org-20061229211551-5f6dzb5dk7z59iqg
parent: jelmer at samba.org-20061229203040-w86k8wxrfinr8bg2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2006-12-29 22:15:51 +0100
message:
More efficient implementation of follow_branch().
------------------------------------------------------------
revno: 236.1.11.1.84
merged: jelmer at samba.org-20061229203040-w86k8wxrfinr8bg2
parent: jelmer at samba.org-20061229201444-jmgaaquygfp4ty6n
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2006-12-29 21:30:40 +0100
message:
Reduce amount of output of follow_history() functions.
------------------------------------------------------------
revno: 236.1.11.1.83
merged: jelmer at samba.org-20061229201444-jmgaaquygfp4ty6n
parent: jelmer at samba.org-20061229192154-oql5chqxnki9xvs1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2006-12-29 21:14:44 +0100
message:
Add specialized version of follow_branch_history() that returns
less data (will allow more efficient implementation later).
------------------------------------------------------------
revno: 236.1.11.1.82
merged: jelmer at samba.org-20061229192154-oql5chqxnki9xvs1
parent: jelmer at samba.org-20061229184647-pbc050jhf8ls78fk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2006-12-29 20:21:54 +0100
message:
Pass in a callable for generating file ids to apply_changes() rather than a
revision id.
------------------------------------------------------------
revno: 236.1.11.1.81
merged: jelmer at samba.org-20061229184647-pbc050jhf8ls78fk
parent: jelmer at samba.org-20061229171536-42b4448bos7zjhp4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2006-12-29 19:46:47 +0100
message:
Reduce number of find_children() calls.
------------------------------------------------------------
revno: 236.1.11.1.80
merged: jelmer at samba.org-20061229171536-42b4448bos7zjhp4
parent: jelmer at samba.org-20061229165621-bm2p23gukm0yj8fx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2006-12-29 18:15:36 +0100
message:
Allow specifying find_children() function.
------------------------------------------------------------
revno: 236.1.11.1.79
merged: jelmer at samba.org-20061229165621-bm2p23gukm0yj8fx
parent: jelmer at samba.org-20061229051751-j93sydbdguw15i25
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2006-12-29 17:56:21 +0100
message:
Don't look up full path but just basename in parents' children list.
Diff too large for email (2138, the limit is 1000).
More information about the bazaar-commits
mailing list