Rev 6028: This adds one more hpss round trip to determine the configuration setting. in http://bazaar.launchpad.net/~jameinel/bzr/2.4-tag-fetch-flag-771184

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.4-tag-fetch-flag-771184

------------------------------------------------------------
revno: 6028
revision-id: john at arbash-meinel.com-20110809133021-3wc3pi40by6z8zvo
parent: john at arbash-meinel.com-20110809132310-5xweu1xf7zmex88w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-tag-fetch-flag-771184
timestamp: Tue 2011-08-09 15:30:21 +0200
message:
  This adds one more hpss round trip to determine the configuration setting.
  
  I wonder if we should make it a global config instead...
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- a/bzrlib/tests/blackbox/test_branch.py	2011-06-02 08:11:47 +0000
+++ b/bzrlib/tests/blackbox/test_branch.py	2011-08-09 13:30:21 +0000
@@ -287,6 +287,7 @@
         builder = self.make_branch_builder('source')
         source = fixtures.build_branch_with_non_ancestral_rev(builder)
         source.tags.set_tag('tag-a', 'rev-2')
+        source.get_config().set_user_option('branch.fetch_tags', 'True')
         # Now source has a tag not in its ancestry.  Make a branch from it.
         self.run_bzr('branch source new-branch')
         new_branch = branch.Branch.open('new-branch')
@@ -479,6 +480,7 @@
         self.setup_smart_server_with_call_log()
         builder = self.make_branch_builder('source')
         source = fixtures.build_branch_with_non_ancestral_rev(builder)
+        source.get_config().set_user_option('branch.fetch_tags', 'True')
         source.tags.set_tag('tag-a', 'rev-2')
         source.tags.set_tag('tag-missing', 'missing-rev')
         # Now source has a tag not in its ancestry.  Make a branch from it.
@@ -489,7 +491,7 @@
         # being too low. If rpc_count increases, more network roundtrips have
         # become necessary for this use case. Please do not adjust this number
         # upwards without agreement from bzr's network support maintainers.
-        self.assertLength(9, self.hpss_calls)
+        self.assertLength(10, self.hpss_calls)
 
     def test_branch_to_stacked_from_trivial_branch_streaming_acceptance(self):
         self.setup_smart_server_with_call_log()

=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py	2011-06-13 14:32:13 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py	2011-08-09 13:30:21 +0000
@@ -681,6 +681,7 @@
         builder.build_commit(message="Rev 2a", rev_id='rev-2a')
         source.tags.set_tag('tag-a', 'rev-2a')
         source.set_last_revision_info(1, 'rev-1')
+        source.get_config().set_user_option('branch.fetch_tags', 'True')
         builder.build_commit(message="Rev 2b", rev_id='rev-2b')
         # Merge from source
         self.run_bzr('merge -d target source')