comparison README.rst @ 6189:16f59121f8f6 mercurial-4.8

test-compat: merge mercurial-4.9 into mercurial-4.8
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 23 Feb 2022 00:09:39 +0300
parents 92f1a6e7c139
children 8b3cb6cae4a2
comparison
equal deleted inserted replaced
6168:8d04f00c2fbf 6189:16f59121f8f6
74 need to provide the full path to ``hgext3rd/evolve/``, for example:: 74 need to provide the full path to ``hgext3rd/evolve/``, for example::
75 75
76 [extensions] 76 [extensions]
77 evolve = ~/evolve/hgext3rd/evolve 77 evolve = ~/evolve/hgext3rd/evolve
78 78
79 Pitfalls
80 --------
81
82 If you get ``"failed to import extension evolve: No module named 'evolve'"``
83 error, there are a couple of things to check:
84
85 * make sure you gave pip the correct package name (it's hg-evolve),
86
87 * make sure evolve is installed for the same version of Python that you use for
88 running Mercurial (``hg debuginstall | grep Python``).
89
79 Server-only Setup 90 Server-only Setup
80 ================= 91 =================
81 92
82 It is possible to enable a smaller subset of the features aimed at servers that 93 It is possible to enable a smaller subset of the features aimed at servers that
83 simply serve repositories:: 94 simply serve repositories::
115 .. _`support for Python 3`: https://www.mercurial-scm.org/wiki/Python3 126 .. _`support for Python 3`: https://www.mercurial-scm.org/wiki/Python3
116 127
117 How to Contribute 128 How to Contribute
118 ================= 129 =================
119 130
120 Discussion happens on the #hg-evolve IRC on libera_. 131 Discussion happens in #hg-evolve and #mercurial on libera_ IRC network.
121 132
122 .. _libera: https://libera.chat/ 133 .. _libera: https://libera.chat/
123 134
124 Bugs are to be reported on the Mercurial's bug tracker (component: 135 Bugs are to be reported on the Mercurial's bug tracker (component:
125 `evolution`_). 136 `evolution`_).
197 byteify-strings:mode.output = pipe 208 byteify-strings:mode.output = pipe
198 209
199 Release Checklist 210 Release Checklist
200 ================= 211 =================
201 212
213 * use contrib/merge-test-compat.sh to merge with the test compatibility
214 branches,
215
202 * make sure the tests are happy on all supported versions, 216 * make sure the tests are happy on all supported versions,
203 217
204 You can use the `contrib/merge-test-compat.sh` to merge with the test 218 * make sure there is no code difference between the compatibility branches and
205 compatibility branches. 219 stable (no diff within hgext3rd/),
206 220
207 * make sure there is no code difference between the compat branches and stable 221 * update the ``testedwith`` variable for all extensions (remove '.dev'):
208 (no diff within `hgext3rd/`),
209
210 * update the `testedwith` variable for all extensions (remove '.dev'):
211 222
212 - hgext3rd/evolve/metadata.py 223 - hgext3rd/evolve/metadata.py
213 - hgext3rd/topic/__init__.py 224 - hgext3rd/topic/__init__.py
214 - hgext3rd/pullbundle.py 225 - hgext3rd/pullbundle.py
215 226
216 * make sure the changelog is up to date, 227 * make sure CHANGELOG is up-to-date,
217 228
218 * add a date to the changelog entry for the target version, 229 * add a date to the CHANGELOG entry for the target version,
219 230
220 * update the `__version__` field of all relevant extensions: 231 * update the ``__version__`` field of all relevant extensions:
221 232
222 - hgext3rd/evolve/metadata.py 233 - hgext3rd/evolve/metadata.py
223 - hgext3rd/topic/__init__.py 234 - hgext3rd/topic/__init__.py
224 - hgext3rd/pullbundle.py (if touched) 235 - hgext3rd/pullbundle.py (if touched)
225 236
226 * create a new Debian entry: 237 * create a new Debian changelog entry:
227 238
228 - debchange --newversion x.y.z-1 "new upstream release" 239 - debchange --newversion x.y.z-1 "new upstream release"
229 - debchange --release 240 - debchange --release
230 241
231 * sanity check install and sdist targets of setup.py: 242 * sanity check install and sdist targets of setup.py:
233 - python setup.py install --home=$(mktemp -d) 244 - python setup.py install --home=$(mktemp -d)
234 - python setup.py sdist 245 - python setup.py sdist
235 246
236 * tag the commit, 247 * tag the commit,
237 248
249 * move ``@`` bookmark to the new tag,
250
238 * push and publish the tag, 251 * push and publish the tag,
239 252
240 * upload the tarball to PyPI, 253 * upload the tarball to PyPI,
241 254
242 * make an announcement on evolve-testers@mercurial-scm.org (possibly on 255 * make an announcement on evolve-testers@mercurial-scm.org and
243 mercurial@mercurial-scm.org too), 256 mercurial@mercurial-scm.org,
244 257
245 * bump versions of all extensions and add '.dev' (see existing commits as an 258 * bump versions of all extensions and add ``.dev`` (see existing commits as an
246 example): 259 example):
247 260
248 - hgext3rd/evolve/metadata.py 261 - hgext3rd/evolve/metadata.py
249 - hgext3rd/topic/__init__.py 262 - hgext3rd/topic/__init__.py
250 - hgext3rd/pullbundle.py 263 - hgext3rd/pullbundle.py
251 264
252 The version we use on the stable branch during development should be 265 Version bump rules:
253 `x.y.z+1.dev`. The version of the default branch should be `x.y+1.0.dev`. 266
267 - stable branch x.y.z+1.dev
268 - default branch x.y+1.0.dev
254 269
255 * merge stable into default. 270 * merge stable into default.