At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/
------------------------------------------------------------ revno: 3885 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: refactor-delta-show timestamp: Tue 2008-12-16 13:34:17 +0100 message: Merge log-s-v into refactor-delta-show modified: Makefile Makefile-20050805140406-d96e3498bb61c5bb NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1 bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1 bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1 bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663 bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1 bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220 bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2 bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5 bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42 bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96 bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6 bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1 doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2 tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1 ------------------------------------------------------------ revno: 3878.1.6 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: log-s-v timestamp: Tue 2008-12-16 13:34:08 +0100 message: Merge cleanups into log-s-v modified: Makefile Makefile-20050805140406-d96e3498bb61c5bb NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1 bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1 bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1 bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663 bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1 bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220 bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2 bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5 bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42 bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96 bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6 bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1 doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2 tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1 ------------------------------------------------------------ revno: 3874.1.7 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: cleanups timestamp: Tue 2008-12-16 13:33:57 +0100 message: Merge bzr.dev into cleanups modified: Makefile Makefile-20050805140406-d96e3498bb61c5bb NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1 bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1 bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1 bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663 bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1 bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220 bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2 bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5 bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42 bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96 bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6 bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1 doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2 tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1 ------------------------------------------------------------ revno: 3874.2.34 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Canonical.com Patch Queue Manager <[email protected]> branch nick: +trunk timestamp: Tue 2008-12-16 05:08:44 +0000 message: (Jelmer) Remove unnecessary commands in svn guide. modified: doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2 ------------------------------------------------------------ revno: 3874.30.1 revision-id: [email protected] parent: [email protected] committer: Jelmer Vernooij <[email protected]> branch nick: bzr.dev timestamp: Tue 2008-12-16 05:07:30 +0100 message: Remove unnecessary commands for importing svn repositories. modified: doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2 ------------------------------------------------------------ revno: 3874.2.33 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Canonical.com Patch Queue Manager <[email protected]> branch nick: +trunk timestamp: Tue 2008-12-16 01:56:55 +0000 message: (Jari Aalto) Unify some examples to be consistent with the rest of the documentation. modified: doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2 ------------------------------------------------------------ revno: 3874.29.2 revision-id: [email protected] parent: [email protected] author: Jari Aalto <[email protected]> committer: Jelmer Vernooij <[email protected]> branch nick: bzr.dev timestamp: Tue 2008-12-16 01:47:50 +0100 message: This patch unifies few examples to use same notation as elsewhere int he documentation: (comment) modified: doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2 ------------------------------------------------------------ revno: 3874.2.32 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Canonical.com Patch Queue Manager <[email protected]> branch nick: +trunk timestamp: Tue 2008-12-16 01:20:58 +0000 message: (Jelmer) bzr-svn releases are now in lp:bzr-svn again. modified: tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1 ------------------------------------------------------------ revno: 3874.29.1 revision-id: [email protected] parent: [email protected] committer: Jelmer Vernooij <[email protected]> branch nick: bzr.dev timestamp: Sun 2008-12-07 18:58:36 +0100 message: bzr-svn releases are now in lp:bzr-svn again. modified: tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1 ------------------------------------------------------------ revno: 3874.2.31 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Canonical.com Patch Queue Manager <[email protected]> branch nick: +trunk timestamp: Mon 2008-12-15 05:20:42 +0000 message: Improved help on storage formats (Ian Clatworthy) modified: Makefile Makefile-20050805140406-d96e3498bb61c5bb NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1 bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220 ------------------------------------------------------------ revno: 3874.28.1 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Ian Clatworthy <[email protected]> branch nick: ianc-integration timestamp: Mon 2008-12-15 14:37:10 +1000 message: Improved help on storage formats (Ian Clatworthy) modified: Makefile Makefile-20050805140406-d96e3498bb61c5bb NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1 bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220 ------------------------------------------------------------ revno: 3874.27.6 revision-id: [email protected] parent: [email protected] committer: Ian Clatworthy <[email protected]> branch nick: bzr.help-formats timestamp: Mon 2008-12-15 14:33:37 +1000 message: include feedback from poolie modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1 ------------------------------------------------------------ revno: 3874.27.5 revision-id: [email protected] parent: [email protected] committer: Ian Clatworthy <[email protected]> branch nick: bzr.help-formats timestamp: Fri 2008-12-12 20:12:33 +1000 message: minor tweak to rich-root explanation modified: bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1 ------------------------------------------------------------ revno: 3874.27.4 revision-id: [email protected] parent: [email protected] committer: Ian Clatworthy <[email protected]> branch nick: bzr.help-formats timestamp: Fri 2008-12-12 20:09:07 +1000 message: rich-root explanation and improved help for 1.6 and 1.9 formats modified: bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1 ------------------------------------------------------------ revno: 3874.27.3 revision-id: [email protected] parent: [email protected] committer: Ian Clatworthy <[email protected]> branch nick: bzr.help-formats timestamp: Fri 2008-12-12 19:28:59 +1000 message: tweak test suite to support the split up formats topic modified: bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220 ------------------------------------------------------------ revno: 3874.27.2 revision-id: [email protected] parent: [email protected] committer: Ian Clatworthy <[email protected]> branch nick: bzr.help-formats timestamp: Fri 2008-12-12 18:33:36 +1000 message: split formats topic into multiple topics modified: bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1 ------------------------------------------------------------ revno: 3874.27.1 revision-id: [email protected] parent: [email protected] committer: Ian Clatworthy <[email protected]> branch nick: bzr.help-formats timestamp: Thu 2008-12-11 17:56:01 +1000 message: improve help on storage formats modified: Makefile Makefile-20050805140406-d96e3498bb61c5bb NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb ------------------------------------------------------------ revno: 3874.2.30 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Canonical.com Patch Queue Manager <[email protected]> branch nick: +trunk timestamp: Sat 2008-12-13 00:04:03 +0000 message: shelf uses paths relative to current directory (abentley) modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1 bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1 ------------------------------------------------------------ revno: 0.16.121 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Aaron Bentley <[email protected]> branch nick: ls-shelf timestamp: Fri 2008-12-12 15:27:07 -0800 message: Merge bzr.dev into ls-shelf added: bzrlib/_chunks_to_lines_py.py _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1 bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1 bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2 modified: .bzrignore bzrignore-20050311232317-81f7b71efa2db11a Makefile Makefile-20050805140406-d96e3498bb61c5bb NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1 bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183 bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1 bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9 bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1 bzrlib/merge.py merge.py-20050513021216-953b65a438527106 bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86 bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1 bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1 bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3 bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64 bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24 bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663 bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220 bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1 bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989 bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84 bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2 bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5 bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687 bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5 bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42 bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96 bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6 bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1 bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490 bzrlib/weave.py knit.py-20050627021749-759c29984154256b doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c setup.py setup.py-20050314065409-02f8a0a6e3f9bc70 ------------------------------------------------------------ revno: 0.16.120 revision-id: [email protected] parent: [email protected] committer: Aaron Bentley <[email protected]> branch nick: ls-shelf timestamp: Thu 2008-12-11 22:09:44 -0800 message: Use relative paths with shelve modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1 bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1 ------------------------------------------------------------ revno: 3874.2.29 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Canonical.com Patch Queue Manager <[email protected]> branch nick: +trunk timestamp: Fri 2008-12-12 13:47:29 +0000 message: (vila) Fix redirection related bugs: #245964, #265070, #270863 and #303959 modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1 bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663 bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220 bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2 bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5 bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42 bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96 bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6 bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1 ------------------------------------------------------------ revno: 3874.26.1 revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: bzr.integration timestamp: Fri 2008-12-12 14:09:26 +0100 message: Fix redirection related bugs: #245964, #265070, #270863 and #303959 modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1 bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663 bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220 bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2 bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5 bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42 bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96 bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6 bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1 ------------------------------------------------------------ revno: 3874.25.7 revision-id: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: 303959-redirection timestamp: Fri 2008-12-12 13:25:48 +0100 message: Fixed as per Robert's review. * bzrlib/transport/http/__init__.py: (HttpTransportBase._redirected_to): Better comment. modified: bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96 ------------------------------------------------------------ revno: 3874.25.6 revision-id: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: 303959-redirection timestamp: Thu 2008-12-04 18:12:46 +0100 message: Fix bug #270863 by preserving 'bzr+http[s]' decorator. * bzrlib/transport/remote.py: (RemoteHTTPTransport._redirected_to): Specific implementation to handle the redirections. * bzrlib/transport/http/_urllib.py: (HttpTransport_urllib.__init__): Fix parameter order. * bzrlib/transport/http/_pycurl.py: (PyCurlTransport.__init__): Fix parameter order. * bzrlib/transport/http/__init__.py: (HttpTransportBase.external_url): Semi drive-by fix, external_url shouldn't expose the implementation qualifier (it's private to bzr not externally usable). * bzrlib/transport/decorator.py: (TransportDecorator._redirected_to): Cleanup. * bzrlib/tests/test_smart_transport.py: (RemoteHTTPTransportTestCase): Add specific tests for _redirected_to. modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2 bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42 bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96 bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6 bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1 ------------------------------------------------------------ revno: 3874.25.5 revision-id: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: 303959-redirection timestamp: Thu 2008-12-04 17:02:51 +0100 message: Don't use the exception as a parameter for _redirected_to. * bzrlib/transport/http/__init__.py: (HttpTransportBase._redirected_to): Update prototype. * bzrlib/transport/decorator.py: (TransportDecorator._redirected_to): Update prototype. * bzrlib/tests/blackbox/test_push.py: (RedirectingMemoryTransport): Update prototype. modified: bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1 bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663 bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5 bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42 bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96 ------------------------------------------------------------ revno: 3874.25.4 revision-id: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: 303959-redirection timestamp: Thu 2008-12-04 16:53:40 +0100 message: Cleanup. * bzrlib/transport/http/_urllib.py: (HttpTransport_urllib._perform): Update RedirectRequested creation. * bzrlib/transport/http/_pycurl.py: (PyCurlTransport._curl_perform): Update RedirectRequested creation. * bzrlib/tests/blackbox/test_push.py: (RedirectingMemoryTransport.mkdir): RedirectRequested wants urls not paths. Be more precise with the paths used too. (TestPushRedirect.test_push_redirects_on_mkdir, TestPushRedirect.test_push_gracefully_handles_too_many_redirects): Use '-d' instead of chdir(). * bzrlib/push.py: (_show_push_branch.redirected): Updated and note() added (why wasn't it there in the first place ?). * bzrlib/errors.py: (RedirectRequested): Simplified now that the redirection stuff is handled by the transport itself. modified: bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1 bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663 bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6 bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c ------------------------------------------------------------ revno: 3874.25.3 revision-id: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: 303959-redirection timestamp: Thu 2008-12-04 12:50:30 +0100 message: Fix bug #303959 by returning a transport based on the same url when redirected to an url with a slash appened. * bzrlib/tests/test_http.py: (Test_redirected_to.test_redirected_to_self_with_slash): Reproduce bug #303959. modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 ------------------------------------------------------------ revno: 3874.25.2 revision-id: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: 303959-redirection timestamp: Thu 2008-12-04 12:25:56 +0100 message: Fix bug #265070 by providing a finer sieve for accepted redirections. * bzrlib/transport/http/_urllib.py: (HttpTransport_urllib.__init__): Provides the implementation name. * bzrlib/transport/http/_pycurl.py: (PyCurlTransport.__init__): Provides the implementation name. * bzrlib/transport/http/__init__.py: (HttpTransportBase.__init__): Make the implementation a mandatory parameter. (HttpTransportBase._redirected_to.relpath): We need a dedicated relpath method to be able to cope with slight differences between the url sent and the url received from the server. (HttpTransportBase._redirected_to): Fix bug #265070 by accepting more redirection kinds and handling them: http <-> https and user specified in the url. * bzrlib/tests/test_http.py: (Test_redirected_to): More complete tests for _redirected_to(). modified: bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96 bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6 bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c ------------------------------------------------------------ revno: 3874.25.1 revision-id: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: 303959-redirection timestamp: Wed 2008-12-03 17:40:38 +0100 message: Fix bug #245964 by preserving decorators during redirections (when appropriate). * bzrlib/transport/decorator.py: (TransportDecorator._redirected_to): Generic implementation delegating to the _decorated transport. * bzrlib/transport/http/__init__.py: (HttpTransportBase.clone): Drive-by fix, deleted, base implementation was strictly identical. (HttpTransportBase._redirected_to): Narrow the possible redirections to those where both urls have the same ending relpath (to cope with known usages that doesn't respect the 'base' paradigm (i.e. using '.bzr/smart' instead of 'smart' on a cloned transport for example). Preserve qualifiers when creating the redirected transport. Also preserve user if used against the same host:port (further authentication can invalidate the user if it's wrong, but if it's required, we'd better propagate it). * bzrlib/transport/decorator.py: (TransportDecorator.__init__): Drive-by fix, the url is indeed not decorated anymore, name the variable accordingly. * bzrlib/transport/__init__.py: (Transport._redirected_to): Default do nothing implementation. * bzrlib/tests/test_bzrdir.py: (TestHTTPRedirections.test_qualifier_preserved): Ensures that qualifiers are preserved across redirections. * bzrlib/bzrdir.py: (BzrDir.open_from_transport.redirected): Delegate redirection handling to the transport. modified: NEWS NEWS-20050323055033-4e00b5db738777ff bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220 bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9 bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5 bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42 bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
Diff too large for email (1215 lines, the limit is 1000).
-- bazaar-commits mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
