Rev 4140: (mbp) integrated small fixes in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Mar 13 02:36:33 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4140
revision-id: pqm at pqm.ubuntu.com-20090313023629-g9v7xglb6rvfopba
parent: pqm at pqm.ubuntu.com-20090313014131-ysd8da1qo8woaby9
parent: mbp at sourcefrog.net-20090313012747-igvrav6sr7irhz1l
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-03-13 02:36:29 +0000
message:
(mbp) integrated small fixes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
------------------------------------------------------------
revno: 4095.2.9
revision-id: mbp at sourcefrog.net-20090313012747-igvrav6sr7irhz1l
parent: mbp at sourcefrog.net-20090312053256-071khr6k4wwuuyja
parent: pqm at pqm.ubuntu.com-20090313010135-3huetgz68wxrhsb3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Fri 2009-03-13 12:27:47 +1100
message:
merge news
removed:
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
------------------------------------------------------------
revno: 4095.2.8
revision-id: mbp at sourcefrog.net-20090312053256-071khr6k4wwuuyja
parent: mbp at sourcefrog.net-20090312044443-dabkh2yeci9p1u4j
parent: pqm at pqm.ubuntu.com-20090312052102-ksjfiyd5ctzibuo1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Thu 2009-03-12 15:32:56 +1000
message:
merge news
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 4095.2.7
revision-id: mbp at sourcefrog.net-20090312044443-dabkh2yeci9p1u4j
parent: mbp at sourcefrog.net-20090312024302-aynicfx1ywm0k9dl
parent: mbp at sourcefrog.net-20090312031249-h77w1hh8wae7v3zf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Thu 2009-03-12 14:44:43 +1000
message:
merge back 1.13
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 4122.1.1
revision-id: mbp at sourcefrog.net-20090312031249-h77w1hh8wae7v3zf
parent: pqm at pqm.ubuntu.com-20090312025908-v6s9pjhxubuqrnxe
parent: pqm at pqm.ubuntu.com-20090311094306-qdrxqed2k7sgxf7z
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integrate-1.13
timestamp: Thu 2009-03-12 13:12:49 +1000
message:
Merge back 1.13 and bump version to 1.14dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 4095.2.6
revision-id: mbp at sourcefrog.net-20090312024302-aynicfx1ywm0k9dl
parent: mbp at sourcefrog.net-20090312024231-wp8aqy67cjypwll4
parent: pqm at pqm.ubuntu.com-20090312021804-624908fcy28eisfn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Thu 2009-03-12 12:43:02 +1000
message:
merge trunk
added:
bzrlib/tests/per_repository_reference/test_default_stacking.py test_default_stackin-20090311055345-9ajahgm58oq3wh6h-1
tools/check-newsbugs.py checknewsbugs.py-20090128204947-lsdwd8nlswm1yrwv-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/workingtree_implementations/test_mkdir.py test_mkdir.py-20060907214856-4omn6hf1u7fvrart-3
bzrlib/tests/workingtree_implementations/test_nested_specifics.py test_nested_specific-20070306004443-qut978c488jr11sg-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
------------------------------------------------------------
revno: 4095.2.5
revision-id: mbp at sourcefrog.net-20090312024231-wp8aqy67cjypwll4
parent: mbp at sourcefrog.net-20090310020305-o1eq68r43q0uek7i
parent: pqm at pqm.ubuntu.com-20090310033520-f2ynw0fprjw433m2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Thu 2009-03-12 12:42:31 +1000
message:
merge trunk
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
------------------------------------------------------------
revno: 4095.2.4
revision-id: mbp at sourcefrog.net-20090310020305-o1eq68r43q0uek7i
parent: mbp at sourcefrog.net-20090310020233-sbr2qvnqnv84y7f6
parent: nmb at wartburg.edu-20090309195518-zgangfenh061dks3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Tue 2009-03-10 12:03:05 +1000
message:
merge better messages from bzr ignore
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
------------------------------------------------------------
revno: 4098.6.1
revision-id: nmb at wartburg.edu-20090309195518-zgangfenh061dks3
parent: pqm at pqm.ubuntu.com-20090309084556-9i2m12qlud2qcrtw
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: better-ignore-warning
timestamp: Mon 2009-03-09 14:55:18 -0500
message:
Use a more informative message when an ignore pattern matches existing version controlled files. Fixes #248895
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
------------------------------------------------------------
revno: 4095.2.3
revision-id: mbp at sourcefrog.net-20090310020233-sbr2qvnqnv84y7f6
parent: mbp at sourcefrog.net-20090310012257-rvtds5ic7ard4iza
parent: pqm at pqm.ubuntu.com-20090310012923-c8el0n6v75v4ycd1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Tue 2009-03-10 12:02:33 +1000
message:
merge trunk
added:
bzrlib/clean_tree.py clean_tree.py-20050827022328-5ba46e22d074695c
bzrlib/tests/blackbox/test_clean_tree.py test_clean_tree.py-20090219235516-em1ybc01twsqacx9-1
bzrlib/tests/test_clean_tree.py test_clean_tree.py-20060603174249-ozlk5sl2166opxbk-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
=== modified file 'NEWS'
--- a/NEWS 2009-03-13 00:13:11 +0000
+++ b/NEWS 2009-03-13 01:27:47 +0000
@@ -24,6 +24,10 @@
IMPROVEMENTS:
+ * ``bzr ignore`` gives a more informative message when existing
+ version controlled files match the ignore pattern. (Neil
+ Martinsen-Burrell, #248895)
+
* Progress bars now show the rate of network activity for
``bzr+ssh://`` and ``bzr://`` connections. (Andrew Bennetts)
@@ -36,6 +40,9 @@
stackable-format branch with an unstackable-format repository to a
destination with a default stacking policy. (Andrew Bennetts)
+ * Fixed incorrect "Source format does not support stacking" warning
+ when pushing to a smart server. (Andrew Bennetts, #334114)
+
* The GNU Changelog formatter is slightly improved in the case where
the delta is empty, and now correctly claims not to support tags.
(Andrea Bolognani)
=== modified file 'bzr'
--- a/bzr 2009-03-12 03:02:41 +0000
+++ b/bzr 2009-03-12 05:32:56 +0000
@@ -1,6 +1,6 @@
#! /usr/bin/env python
-# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2009-03-12 03:02:41 +0000
+++ b/bzrlib/__init__.py 2009-03-12 05:32:56 +0000
@@ -106,6 +106,7 @@
version_string = '%d.%d.%d.%s.%d' % version_info
return main_version + sub_string
+
__version__ = _format_version_tuple(version_info)
version_string = __version__
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2009-03-12 13:43:15 +0000
+++ b/bzrlib/builtins.py 2009-03-13 01:27:47 +0000
@@ -2440,7 +2440,9 @@
tree.unlock()
if len(matches) > 0:
print "Warning: the following files are version controlled and" \
- " match your ignore pattern:\n%s" % ("\n".join(matches),)
+ " match your ignore pattern:\n%s" \
+ "\nThese files will continue to be version controlled" \
+ " unless you 'bzr remove' them." % ("\n".join(matches),)
class cmd_ignored(Command):
=== modified file 'bzrlib/tests/blackbox/test_ignore.py'
--- a/bzrlib/tests/blackbox/test_ignore.py 2009-01-17 01:30:58 +0000
+++ b/bzrlib/tests/blackbox/test_ignore.py 2009-03-09 19:55:18 +0000
@@ -124,7 +124,9 @@
out, err = self.run_bzr('ignore a')
self.assertEqual(out,
"Warning: the following files are version controlled"\
- " and match your ignore pattern:\na\n")
+ " and match your ignore pattern:\na\n"\
+ "These files will continue to be version controlled"\
+ " unless you 'bzr remove' them.\n")
# test a single unversioned file
out, err = self.run_bzr('ignore b')
@@ -135,7 +137,9 @@
out, err = self.run_bzr('ignore *')
self.assertEqual(out,
"Warning: the following files are version controlled"\
- " and match your ignore pattern:\n.bzrignore\na\nb\n")
+ " and match your ignore pattern:\n.bzrignore\na\nb\n"\
+ "These files will continue to be version controlled"\
+ " unless you 'bzr remove' them.\n")
def test_ignored_versioned_file_matching_new_pattern(self):
tree = self.make_branch_and_tree('.')
@@ -148,4 +152,6 @@
out, err = self.run_bzr('ignore b')
self.assertEqual(out,
"Warning: the following files are version controlled"\
- " and match your ignore pattern:\nb\n")
+ " and match your ignore pattern:\nb\n"\
+ "These files will continue to be version controlled"\
+ " unless you 'bzr remove' them.\n")
More information about the bazaar-commits
mailing list