Rev 2958: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/reconcile
Robert Collins
robertc at robertcollins.net
Sat Nov 3 18:33:34 GMT 2007
At http://people.ubuntu.com/~robertc/baz2.0/reconcile
------------------------------------------------------------
revno: 2958
revision-id:robertc at robertcollins.net-20071103183255-3h06a3ijbennz6w1
parent: robertc at robertcollins.net-20071103142637-1diuxsp2at93vcon
parent: pqm at pqm.ubuntu.com-20071103093911-4alf7wiad3n3vfz6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Sun 2007-11-04 05:32:55 +1100
message:
Merge bzr.dev.
added:
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2951.1.8
revision-id:pqm at pqm.ubuntu.com-20071103093911-4alf7wiad3n3vfz6
parent: pqm at pqm.ubuntu.com-20071103032627-fvl5prorhuns0t4o
parent: bialix at ukr.net-20071103083016-zsrh94hlg43us0pz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-11-03 09:39:11 +0000
message:
windows python has os.lstat
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2949.6.2
revision-id:bialix at ukr.net-20071103083016-zsrh94hlg43us0pz
parent: bialix at ukr.net-20071031103212-pog42qlbk0vt66hk
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.os.lstat
timestamp: Sat 2007-11-03 10:30:16 +0200
message:
more changes osutils.lstat -> os.lstat
modified:
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2949.6.1
revision-id:bialix at ukr.net-20071031103212-pog42qlbk0vt66hk
parent: pqm at pqm.ubuntu.com-20071029221703-zy7q7a0ehfvpybtn
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.os.lstat
timestamp: Wed 2007-10-31 12:32:12 +0200
message:
windows python has os.lstat
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
------------------------------------------------------------
revno: 2951.1.7
revision-id:pqm at pqm.ubuntu.com-20071103032627-fvl5prorhuns0t4o
parent: pqm at pqm.ubuntu.com-20071103023739-e0wzok4qpvzq66sa
parent: mbp at sourcefrog.net-20071103010733-0a65i4zksk38or4u
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-11-03 03:26:27 +0000
message:
MemoryTransport._abspath: fix handling of '..' and other strangeness
modified:
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
------------------------------------------------------------
revno: 2940.3.1
revision-id:mbp at sourcefrog.net-20071103010733-0a65i4zksk38or4u
parent: pqm at pqm.ubuntu.com-20071025022746-ftudwmzir8v2lccc
committer: mbp at sourcefrog.net
branch nick: memorytransport
timestamp: Fri 2007-11-02 21:07:33 -0400
message:
MemoryTransport._abspath: fix handling of '..' and other strangeness
modified:
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
------------------------------------------------------------
revno: 2951.1.6
revision-id:pqm at pqm.ubuntu.com-20071103023739-e0wzok4qpvzq66sa
parent: pqm at pqm.ubuntu.com-20071103015330-pt1tec7wyxwwcey8
parent: bialix at ukr.net-20071102051217-5ebfnblbcihhut5g
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-11-03 02:37:39 +0000
message:
selftest: use SymlinkFeature instead of TestSkipped where appropriate
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
------------------------------------------------------------
revno: 2949.5.2
revision-id:bialix at ukr.net-20071102051217-5ebfnblbcihhut5g
parent: bialix at ukr.net-20071101095245-qmmtwknzalx2b33u
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: symlink.feature
timestamp: Fri 2007-11-02 07:12:17 +0200
message:
John's review
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 2949.5.1
revision-id:bialix at ukr.net-20071101095245-qmmtwknzalx2b33u
parent: pqm at pqm.ubuntu.com-20071029221703-zy7q7a0ehfvpybtn
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: symlink.feature
timestamp: Thu 2007-11-01 11:52:45 +0200
message:
selftest: use SymlinkFeature instead of TestSkipped where appropriate
modified:
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
------------------------------------------------------------
revno: 2951.1.5
revision-id:pqm at pqm.ubuntu.com-20071103015330-pt1tec7wyxwwcey8
parent: pqm at pqm.ubuntu.com-20071031141102-b5664t8izotfnc6h
parent: v.ladeuil+lp at free.fr-20071102090358-urw3ymbkp19n9qgv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-11-03 01:53:30 +0000
message:
Fix #158972 don't use timeout for HttpServer
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 2951.1.4.1.1
revision-id:v.ladeuil+lp at free.fr-20071102090358-urw3ymbkp19n9qgv
parent: pqm at pqm.ubuntu.com-20071031141102-b5664t8izotfnc6h
parent: v.ladeuil+lp at free.fr-20071031143746-7jrk0tmczzzp9aoz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Fri 2007-11-02 10:03:58 +0100
message:
Fix #158972 don't use timeout for HttpServer
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 2951.1.2.2.2
revision-id:v.ladeuil+lp at free.fr-20071031143746-7jrk0tmczzzp9aoz
parent: v.ladeuil+lp at free.fr-20071031124242-zh1ub5bq2fqo9bzu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 158972
timestamp: Wed 2007-10-31 15:37:46 +0100
message:
Fix #158972 don't use timeout for HttpServer
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2951.1.2.2.1
revision-id:v.ladeuil+lp at free.fr-20071031124242-zh1ub5bq2fqo9bzu
parent: pqm at pqm.ubuntu.com-20071031104053-fj7i7m8037qjgce4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 158972
timestamp: Wed 2007-10-31 13:42:42 +0100
message:
Fix #158972 by not using timeout for HttpServer.
* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler._handle_one_request): Deleted.
(TestingHTTPServer.server_close): Shuwdown the socket before
closing it.
(HttpServer._http_start): No more timeout.
modified:
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 2951.1.4
revision-id:pqm at pqm.ubuntu.com-20071031141102-b5664t8izotfnc6h
parent: pqm at pqm.ubuntu.com-20071031123737-3srdl8uoj1o9vb69
parent: v.ladeuil+lp at free.fr-20071031124019-ir0as6cxx5tjpayy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-31 14:11:02 +0000
message:
Fix typo (is_permament => is_permanent) reported on IRC
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
------------------------------------------------------------
revno: 2951.1.3.1.1
revision-id:v.ladeuil+lp at free.fr-20071031124019-ir0as6cxx5tjpayy
parent: pqm at pqm.ubuntu.com-20071031123737-3srdl8uoj1o9vb69
parent: v.ladeuil+lp at free.fr-20071031123811-ya0py5cpwhh6rabl
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Wed 2007-10-31 13:40:19 +0100
message:
Fix typo (is_permament => is_permanent) reported on IRC
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
------------------------------------------------------------
revno: 2949.4.1
revision-id:v.ladeuil+lp at free.fr-20071031123811-ya0py5cpwhh6rabl
parent: pqm at pqm.ubuntu.com-20071029221703-zy7q7a0ehfvpybtn
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: http
timestamp: Wed 2007-10-31 13:38:11 +0100
message:
Fix typo (is_permament => is_permanent) reported on IRC
* bzrlib/errors.py:
(RedirectRequested.__init__): Fix typo and delete useless
attribute.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._perform): Fix typo.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): Fix typo.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
------------------------------------------------------------
revno: 2951.1.3
revision-id:pqm at pqm.ubuntu.com-20071031123737-3srdl8uoj1o9vb69
parent: pqm at pqm.ubuntu.com-20071031104053-fj7i7m8037qjgce4
parent: v.ladeuil+lp at free.fr-20071031114844-4aiho9kp87gzzngk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-31 12:37:37 +0000
message:
Fix reference to FTPServer, forgotten in the previous renaming
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2951.1.2.1.1
revision-id:v.ladeuil+lp at free.fr-20071031114844-4aiho9kp87gzzngk
parent: pqm at pqm.ubuntu.com-20071031104053-fj7i7m8037qjgce4
parent: v.ladeuil+lp at free.fr-20071031114545-4sovxko8bk8nq115
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Wed 2007-10-31 12:48:44 +0100
message:
Fix reference to FTPServer, forgotten in the previous renaming
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2949.3.3
revision-id:v.ladeuil+lp at free.fr-20071031114545-4sovxko8bk8nq115
parent: v.ladeuil+lp at free.fr-20071031093150-jampe95fzzgls1ny
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 157752
timestamp: Wed 2007-10-31 12:45:45 +0100
message:
Fix reference to FTPServer, forgotten in the previous renaming.
* bzrlib/tests/__init__.py:
(_FTPServerFeature._probe): Test the right module import.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2951.1.2
revision-id:pqm at pqm.ubuntu.com-20071031104053-fj7i7m8037qjgce4
parent: pqm at pqm.ubuntu.com-20071030223954-0ussb5qn1dy2fg8v
parent: v.ladeuil+lp at free.fr-20071031094642-pi0ce5o2etkjqoix
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-31 10:40:53 +0000
message:
Fix #157752 by wrapping medusa test ftp server behind FTPServerFeature
added:
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2951.1.1.1.1
revision-id:v.ladeuil+lp at free.fr-20071031094642-pi0ce5o2etkjqoix
parent: pqm at pqm.ubuntu.com-20071030223954-0ussb5qn1dy2fg8v
parent: v.ladeuil+lp at free.fr-20071031093150-jampe95fzzgls1ny
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Wed 2007-10-31 10:46:42 +0100
message:
Fix #157752 by wrapping medusa test ftp server behind FTPServerFeature
added:
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2949.3.2
revision-id:v.ladeuil+lp at free.fr-20071031093150-jampe95fzzgls1ny
parent: v.ladeuil+lp at free.fr-20071030175409-yvkwn2d5t1paslvh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 157752
timestamp: Wed 2007-10-31 10:31:50 +0100
message:
Rename FTPServer.py to ftp_server.py.
* bzrlib/transport/ftp.py:
Rename FTPServer.py to ftp_server.py.
(get_test_permutations): Rename the fake FTPServer to
UnavailableFTPServer.
* bzrlib/tests/test_ftp_transport.py:
Rename FTPServer.py to ftp_server.py.
renamed:
bzrlib/tests/FTPServer.py => bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
modified:
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2949.3.1
revision-id:v.ladeuil+lp at free.fr-20071030175409-yvkwn2d5t1paslvh
parent: pqm at pqm.ubuntu.com-20071029221703-zy7q7a0ehfvpybtn
parent: v.ladeuil+lp at free.fr-20071029173634-yxcis9vbrv60t3z9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 157752
timestamp: Tue 2007-10-30 18:54:09 +0100
message:
Fix #157752 by wrapping medusa test ftp server behind FTPServerFeature
added:
bzrlib/tests/FTPServer.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2917.3.2
revision-id:v.ladeuil+lp at free.fr-20071029173634-yxcis9vbrv60t3z9
parent: v.ladeuil+lp at free.fr-20071019131948-g5793d6onl5ik5sm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 127164
timestamp: Mon 2007-10-29 18:36:34 +0100
message:
Prepare for fixing bug #157752 (so close to a palindrome...)
* bzrlib/transport/ftp.py:
(get_test_permutations): Add a dummy FPTServer so that the test
suite reports the skipped tests.
modified:
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2917.3.1
revision-id:v.ladeuil+lp at free.fr-20071019131948-g5793d6onl5ik5sm
parent: pqm at pqm.ubuntu.com-20071019042839-xwvsz0loa77yokxm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 127164
timestamp: Fri 2007-10-19 15:19:48 +0200
message:
Separate transport from test server.
* bzrlib/transport/ftp.py:
Move ftp test server to its own file.
(get_test_permutations): Reworked around FTPServerFeature.
* bzrlib/tests/test_ftp_transport.py:
(TestCaseWithFTPServer.setUp): Use FTPServerFeature instead of
MedusaFeature.
* bzrlib/tests/__init__.py:
(_FTPServerFeature): New feature allowing a cleaner separation
between ftp.py and FTPServer.py.
* bzrlib/tests/FTPServer.py:
New file. Extracted from bzrlib/transport/ftp.py (use case for
tracking moving lines).
added:
bzrlib/tests/FTPServer.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2951.1.1
revision-id:pqm at pqm.ubuntu.com-20071030223954-0ussb5qn1dy2fg8v
parent: pqm at pqm.ubuntu.com-20071030214613-c0ojrpmnm21da068
parent: robertc at robertcollins.net-20071030210601-poh10rzw97d51vxq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-10-30 22:39:54 +0000
message:
(robertc) Avoid resetting dirstate parent data during revert if the parents list has not changed. (Robert Collins)
modified:
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2949.2.2
revision-id:robertc at robertcollins.net-20071030210601-poh10rzw97d51vxq
parent: robertc at robertcollins.net-20071030200323-2iyytqgqcltpngta
committer: Robert Collins <robertc at robertcollins.net>
branch nick: revert
timestamp: Wed 2007-10-31 08:06:01 +1100
message:
Avoid dirstate parent resetting when it is not needed during revert.
modified:
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
Diff too large for email (1606 lines, the limit is 1000).
More information about the bazaar-commits
mailing list