Merge lp:~vila/brz/3.0.0 into lp:brz/3.0

Proposed by Vincent Ladeuil on 2019-03-06
Status: Merged
Approved by: Vincent Ladeuil on 2019-03-06
Approved revision: 7306
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~vila/brz/3.0.0
Merge into: lp:brz/3.0
Diff against target: 258 lines (+33/-34)
9 files modified
.bzrignore (+1/-0)
breezy/__init__.py (+1/-1)
breezy/bzr/smart/medium.py (+2/-2)
breezy/bzr/smart/protocol.py (+10/-10)
breezy/bzr/smart/request.py (+2/-2)
breezy/graph.py (+2/-2)
breezy/osutils.py (+6/-9)
doc/en/release-notes/brz-3.0.txt (+6/-6)
tools/time_graph.py (+3/-2)
To merge this branch: bzr merge lp:~vila/brz/3.0.0
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve on 2019-03-06
Review via email: mp+364029@code.launchpad.net

Commit message

Release 3.0.0

Description of the change

Release breezy 3.0.0

To post a comment you must log in.
Vincent Ladeuil (vila) wrote :

RM self-approval

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2018-11-18 18:55:35 +0000
3+++ .bzrignore 2019-03-06 11:18:29 +0000
4@@ -2,6 +2,7 @@
5 # These are created as byproducts of our test suite
6 ./test*.tmp
7 ./.python-eggs
8+./breezy.egg-info
9 ./.bzr.log
10 # Generated files
11 CHANGELOG
12
13=== modified file 'breezy/__init__.py'
14--- breezy/__init__.py 2019-01-14 01:27:55 +0000
15+++ breezy/__init__.py 2019-03-06 11:18:29 +0000
16@@ -50,7 +50,7 @@
17 # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
18 # releaselevel of 'dev' for unreleased under-development code.
19
20-version_info = (3, 0, 0, 'beta', 1)
21+version_info = (3, 0, 0, 'final', 0)
22
23
24 def _format_version_tuple(version_info):
25
26=== modified file 'breezy/bzr/smart/medium.py'
27--- breezy/bzr/smart/medium.py 2018-11-18 14:23:08 +0000
28+++ breezy/bzr/smart/medium.py 2019-03-06 11:18:29 +0000
29@@ -433,13 +433,13 @@
30 self.finished = True
31
32 def _write_out(self, bytes):
33- tstart = osutils.timer_func()
34+ tstart = osutils.perf_counter()
35 osutils.send_all(self.socket, bytes, self._report_activity)
36 if 'hpss' in debug.debug_flags:
37 thread_id = _thread.get_ident()
38 trace.mutter('%12s: [%s] %d bytes to the socket in %.3fs'
39 % ('wrote', thread_id, len(bytes),
40- osutils.timer_func() - tstart))
41+ osutils.perf_counter() - tstart))
42
43
44 class SmartServerPipeStreamMedium(SmartServerStreamMedium):
45
46=== modified file 'breezy/bzr/smart/protocol.py'
47--- breezy/bzr/smart/protocol.py 2018-11-22 22:15:05 +0000
48+++ breezy/bzr/smart/protocol.py 2019-03-06 11:18:29 +0000
49@@ -639,7 +639,7 @@
50 mutter('hpss call: %s', repr(args)[1:-1])
51 if getattr(self._request._medium, 'base', None) is not None:
52 mutter(' (to %s)', self._request._medium.base)
53- self._request_start_time = osutils.timer_func()
54+ self._request_start_time = osutils.perf_counter()
55 self._write_args(args)
56 self._request.finished_writing()
57 self._last_verb = args[0]
58@@ -655,7 +655,7 @@
59 mutter(' (to %s)',
60 self._request._medium._path)
61 mutter(' %d bytes', len(body))
62- self._request_start_time = osutils.timer_func()
63+ self._request_start_time = osutils.perf_counter()
64 if 'hpssdetail' in debug.debug_flags:
65 mutter('hpss body content: %s', body)
66 self._write_args(args)
67@@ -675,7 +675,7 @@
68 if getattr(self._request._medium, '_path', None) is not None:
69 mutter(' (to %s)',
70 self._request._medium._path)
71- self._request_start_time = osutils.timer_func()
72+ self._request_start_time = osutils.perf_counter()
73 self._write_args(args)
74 readv_bytes = self._serialise_offsets(body)
75 bytes = self._encode_bulk_data(readv_bytes)
76@@ -707,7 +707,7 @@
77 if 'hpss' in debug.debug_flags:
78 if self._request_start_time is not None:
79 mutter(' result: %6.3fs %s',
80- osutils.timer_func() - self._request_start_time,
81+ osutils.perf_counter() - self._request_start_time,
82 repr(result)[1:-1])
83 self._request_start_time = None
84 else:
85@@ -1173,9 +1173,9 @@
86
87 def _trace(self, action, message, extra_bytes=None, include_time=False):
88 if self._response_start_time is None:
89- self._response_start_time = osutils.timer_func()
90+ self._response_start_time = osutils.perf_counter()
91 if include_time:
92- t = '%5.3fs ' % (time.clock() - self._response_start_time)
93+ t = '%5.3fs ' % (osutils.perf_counter() - self._response_start_time)
94 else:
95 t = ''
96 if extra_bytes is None:
97@@ -1318,7 +1318,7 @@
98 base = getattr(self._medium_request._medium, 'base', None)
99 if base is not None:
100 mutter(' (to %s)', base)
101- self._request_start_time = osutils.timer_func()
102+ self._request_start_time = osutils.perf_counter()
103 self._write_protocol_version()
104 self._write_headers(self._headers)
105 self._write_structure(args)
106@@ -1336,7 +1336,7 @@
107 if path is not None:
108 mutter(' (to %s)', path)
109 mutter(' %d bytes', len(body))
110- self._request_start_time = osutils.timer_func()
111+ self._request_start_time = osutils.perf_counter()
112 self._write_protocol_version()
113 self._write_headers(self._headers)
114 self._write_structure(args)
115@@ -1355,7 +1355,7 @@
116 path = getattr(self._medium_request._medium, '_path', None)
117 if path is not None:
118 mutter(' (to %s)', path)
119- self._request_start_time = osutils.timer_func()
120+ self._request_start_time = osutils.perf_counter()
121 self._write_protocol_version()
122 self._write_headers(self._headers)
123 self._write_structure(args)
124@@ -1372,7 +1372,7 @@
125 path = getattr(self._medium_request._medium, '_path', None)
126 if path is not None:
127 mutter(' (to %s)', path)
128- self._request_start_time = osutils.timer_func()
129+ self._request_start_time = osutils.perf_counter()
130 self.body_stream_started = False
131 self._write_protocol_version()
132 self._write_headers(self._headers)
133
134=== modified file 'breezy/bzr/smart/request.py'
135--- breezy/bzr/smart/request.py 2018-11-11 04:08:32 +0000
136+++ breezy/bzr/smart/request.py 2019-03-06 11:18:29 +0000
137@@ -309,7 +309,7 @@
138 self.finished_reading = False
139 self._command = None
140 if 'hpss' in debug.debug_flags:
141- self._request_start_time = osutils.timer_func()
142+ self._request_start_time = osutils.perf_counter()
143 self._thread_id = get_ident()
144
145 def _trace(self, action, message, extra_bytes=None, include_time=False):
146@@ -318,7 +318,7 @@
147 # that just putting it in a helper doesn't help a lot. And some state
148 # is taken from the instance.
149 if include_time:
150- t = '%5.3fs ' % (osutils.timer_func() - self._request_start_time)
151+ t = '%5.3fs ' % (osutils.perf_counter() - self._request_start_time)
152 else:
153 t = ''
154 if extra_bytes is None:
155
156=== modified file 'breezy/graph.py'
157--- breezy/graph.py 2018-11-16 12:20:11 +0000
158+++ breezy/graph.py 2019-03-06 11:18:29 +0000
159@@ -612,11 +612,11 @@
160 # In the common case, we don't need to spider out far here, so
161 # avoid doing extra work.
162 if step_all_unique:
163- tstart = time.clock()
164+ tstart = osutils.perf_counter()
165 nodes = all_unique_searcher.step()
166 common_to_all_unique_nodes.update(nodes)
167 if 'graph' in debug.debug_flags:
168- tdelta = time.clock() - tstart
169+ tdelta = osutils.perf_counter() - tstart
170 trace.mutter('all_unique_searcher step() took %.3fs'
171 'for %d nodes (%d total), iteration: %s',
172 tdelta, len(nodes), len(all_unique_searcher.seen),
173
174=== modified file 'breezy/osutils.py'
175--- breezy/osutils.py 2018-11-17 18:49:41 +0000
176+++ breezy/osutils.py 2019-03-06 11:18:29 +0000
177@@ -70,15 +70,6 @@
178 )
179
180
181-# Cross platform wall-clock time functionality with decent resolution.
182-# On Linux ``time.clock`` returns only CPU time. On Windows, ``time.time()``
183-# only has a resolution of ~15ms. Note that ``time.clock()`` is not
184-# synchronized with ``time.time()``, this is only meant to be used to find
185-# delta times by subtracting from another call to this function.
186-timer_func = time.time
187-if sys.platform == 'win32':
188- timer_func = time.clock
189-
190 # On win32, O_BINARY is used to indicate the file should
191 # be opened in binary mode, rather than text mode.
192 # On other platforms, O_BINARY doesn't exist, because
193@@ -2609,3 +2600,9 @@
194 if sys.platform == "win32" and win32utils._is_pywintypes_error(evalue):
195 return True
196 return False
197+
198+
199+if PY3:
200+ perf_counter = time.perf_counter
201+else:
202+ perf_counter = time.clock
203
204=== modified file 'doc/en/release-notes/brz-3.0.txt'
205--- doc/en/release-notes/brz-3.0.txt 2019-03-04 02:07:44 +0000
206+++ doc/en/release-notes/brz-3.0.txt 2019-03-06 11:18:29 +0000
207@@ -5,16 +5,16 @@
208 .. toctree::
209 :maxdepth: 1
210
211+brz 3.0.0
212+#########
213+
214+:Codename: Pelican
215+:3.0.0: 2019-03-06
216+
217 brz 3.0.0 is the first release of ``Breezy``, a fork of Bazaar. For more
218 information, see our release announcement on the Bazaar mailing list and
219 README.
220
221-brz 3.0.0
222-#########
223-
224-:Codename: Pelican
225-:3.0.0: NOT RELEASED YET
226-
227 External Compatibility Breaks
228 *****************************
229
230
231=== modified file 'tools/time_graph.py'
232--- tools/time_graph.py 2018-11-16 12:20:11 +0000
233+++ tools/time_graph.py 2019-03-06 11:18:29 +0000
234@@ -8,6 +8,7 @@
235 branch,
236 commands,
237 graph,
238+ osutils,
239 ui,
240 trace,
241 _known_graph_py,
242@@ -24,7 +25,7 @@
243 trace.enable_default_logging()
244 ui.ui_factory = text.TextUIFactory()
245
246-begin = time.clock()
247+begin = osutils.perf_counter()
248 if len(args) >= 1:
249 b = branch.Branch.open(args[0])
250 else:
251@@ -33,7 +34,7 @@
252 g = b.repository.get_graph()
253 parent_map = dict(p for p in g.iter_ancestry([b.last_revision()])
254 if p[1] is not None)
255-end = time.clock()
256+end = osutils.perf_counter()
257
258 print('Found %d nodes, loaded in %.3fs' % (len(parent_map), end - begin))
259

Subscribers

People subscribed via source and target branches