[MERGE] FreeBSD concurrency detection

[Matthew D. Fuller]

Building on just-landed changes, this seems to DTRT in some quick
testing.


-- 
Matthew Fuller     (MF4839)   |  fullermd at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: fullermd at over-yonder.net-20090605091302-\
#   tdw4zqpuv1n0dxl5
# target_branch: file:///home/fullermd/src/bzr/bzr.dev/
# testament_sha1: d11603e75910941123521f0ae29100c838ac3d4e
# timestamp: 2009-06-05 04:13:22 -0500
# base_revision_id: pqm at pqm.ubuntu.com-20090605081039-abvojdsxjbg5i4ff
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2009-06-05 07:14:08 +0000
+++ NEWS	2009-06-05 09:13:02 +0000
@@ -114,6 +114,8 @@
 
 * The number of cores is also detected on Solaris and win32. (Vincent Ladeuil)
 
+* The number of cores is also detected on FreeBSD. (Matthew Fuller)
+
 
 bzr 1.15
 ########

=== modified file 'bzrlib/osutils.py'
--- bzrlib/osutils.py	2009-06-05 07:10:13 +0000
+++ bzrlib/osutils.py	2009-06-05 09:13:02 +0000
@@ -1841,6 +1841,10 @@
     def _local_concurrency():
         return subprocess.Popen(['sysctl', '-n', 'hw.availcpu'],
                                 stdout=subprocess.PIPE).communicate()[0]
+elif sys.platform[0:7] == 'freebsd':
+    def _local_concurrency():
+        return subprocess.Popen(['sysctl', '-n', 'hw.ncpu'],
+                                stdout=subprocess.PIPE).communicate()[0]
 elif sys.platform == 'sunos5':
     def _local_concurrency():
         return subprocess.Popen(['psrinfo', '-p',],

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTWr9zQAAiT/gEQQAARR////
XyNMir////BQBK6L2gMxqJFAEkkyTKZo0GozTIE9U9NT09IQekNMmjNEDmjJiYAJiMCNMCDEYJkw
CMOaMmJgAmIwI0wIMRgmTAIwSKJPKmJmmkaNNABkHqBo0AA0AEkgU8mmpggQ0yJlNk0mg2o00MgD
T1HktGTn0SNwbyjIcXaDJT0SKlMrrVVYKnwBPiJmidPNXzXxEl707zplhWYuDbGz18Vnoky9dhwM
qngc5WJQxWj2Nmf1e4r/J54/75OkaJoGYfBz0SSs4PNj5c+mHDU5833dfgmqdl0gOzY4kKvX/Mbq
PZx5T34o26K+/tNt41dpV+5jMXT1WMDq+DDKhie7rtAlQWdMVVhnVuc9zdzIIwvrYW7tatk7aGHE
q5pFLeCpGMaFZOEiYgIQtpNdCmiCFEehRJlQcpEUyE4Q872cTfAwAiPSt5bynUzJ8Z2YvCda8RIZ
GsxUWscC/gAlvKbApYGivv97h+Xx6ILl0tVXnYBHEDdQQaXGVnmdxneXO2Gk0PGJlZYkLxgNpBTY
LzZGOLtZJbicYZSJJgq8mzERyaytYsOMDguwCvkV1ZDxa0ZjIV484bccIEi49hCpcMZBUobh2ocS
Ims/xXXU2xNT9tSFkKxljIGsPysRIG8WRYvMJWsDEjXqIKZ1FDAkPKlDcag1wNRcRHlsiZe1w5Oe
xg8dfeUIzPuhLAibB15lNay8A0YDMwrXXcSNE5MkZtVaQTCKpVpFhm4cyxtLMzLV93ITHDfhhbjk
IEWYJbPkrlcZwNBwjbLKCtUXW2mM672Uz2PRThFd4tO387DkthJMpMGmvRq35Kcw5mRddm74Gdjt
3DxOLDeMbj/dy6jCboFmHERjic2o391FCyQ67qVK9JZuRpvYSoym8ymDORkxSfVfY25bYlQn9aVw
d86CAwy/PTkDzM+0rIz4znN3kuTfTueatO1wOHGmJANAeFJFdF0IL50jHnBBPMxsWKlZBwGgDWbR
1L6CJyIR2NtDNz1E8O02H4EjTxKL4F2tsGcYEEYvUcG8SrHWNm3Hc5fFMK/1jPQSEY3c4oJhM5Fj
NaILosMgyLkaSbPoGueHIyN44+B7RxyJEBlzR1tAcSrwMpqMdGGJWHI7P1xLQYt51Ol61rSL3v3G
H2XsSH0rTroc1ooD9i4GgT1Gxl8UXeNTn40DdSDteW8PReC3Hs0Rh3EgKBx9R3RFekcPGXAFX6Gp
Q8u2mS9BVC4ZBOa7+h5z30JepPjBT3ZP8wGS6lTa8iTQ4Q9A7XPOQQYUFMeuzfTSxBpHFdSHE0Dj
uQV13PFgciBKFcS3Utfs3oM2EnLlWcIKRHu6bb6q0zyK1Gy5gXK4W0DpXW20ZCMUVeeg3dwNSUj/
sPXvMmT76WmD0G3A6ZOB5Aiwy63HM5cU+gzQIbDgFVNAxIJzR6SR/WLr1zT/r3TQU82eZe72hpdF
3gA6FOzKwVk55r4llA1NVFhRYNlByrA31Wo5rGRzOYih39KnTAyerwN5mBRRQXoKJjw1gUTAPRjf
W9h7nu896CZpsVD3gW/8XckU4UJA1q/c0A==