##// END OF EJS Templates
merge
Marcin Kasperski -
r266:a016b877 merge default
parent child Browse files
Show More
@@ -58,3 +58,4 b' 656fe41c1965602997032e8d8d00d63b57b825d2'
58 678b0342e43894511601306c2a660cc678a29411 1.1.8
58 678b0342e43894511601306c2a660cc678a29411 1.1.8
59 13ceb03ee4b3ba074ee0e12273559da2ba3ff50c 1.1.9
59 13ceb03ee4b3ba074ee0e12273559da2ba3ff50c 1.1.9
60 42e1da83e6dde50e12e8708bee649e5291a42b58 1.2.0
60 42e1da83e6dde50e12e8708bee649e5291a42b58 1.2.0
61 e01afc28bac525a133a6ff4fd59812333e4b756d 1.2.1
@@ -1,3 +1,8 b''
1
2 1.2.1
3 ~~~~~~~~~~~~
4
5 Tested against hg 4.8 (no changes needed).
1
6
2 1.2.0
7 1.2.0
3 ~~~~~~~~~~~~
8 ~~~~~~~~~~~~
@@ -15,8 +20,6 b' handling (propts).'
15 Refreshing smtp monkeypatch to be a bit more like modern mercurials
20 Refreshing smtp monkeypatch to be a bit more like modern mercurials
16 (in particular, obligatory cert falidaton).
21 (in particular, obligatory cert falidaton).
17
22
18
19
20 1.1.9
23 1.1.9
21 ~~~~~~~~~~~~
24 ~~~~~~~~~~~~
22
25
@@ -367,12 +367,19 b' install some missing tool, or library, a'
367
367
368 .. note::
368 .. note::
369
369
370 Recent versions of keyring library (since version 12) use python
370 Depending on keyring_ version, installation of some dependency may
371 resolve problem. For example (as of late 2018), I got KDE Wallet
372 backend working with pip-installed keyring after::
373
374 pip install dbus-python
375
376 Note also, that recent versions of keyring library (since version 12) use Python
371 entrypoints to find available backends. Those are incompatible with
377 entrypoints to find available backends. Those are incompatible with
372 some binary packaging methods (like ``py2app``) and may cause
378 some binary packaging methods (like ``py2app``) and may cause
373 problems. In particular there were packaged installations of TortoiseHG
379 problems. In particular there were packaged installations of TortoiseHG
374 which were unable to load keyring backends. See `#61 <https://bitbucket.org/Mekk/mercurial_keyring/issues/61/tortoisehg-encounters-unknown-exception>`_ for some more details.
380 which were unable to load keyring backends. See `#61 <https://bitbucket.org/Mekk/mercurial_keyring/issues/61/tortoisehg-encounters-unknown-exception>`_ for some more details.
375
381
382
376 If ``keyring`` command works, but mercurial with mercurial_keyring does not,
383 If ``keyring`` command works, but mercurial with mercurial_keyring does not,
377 try enforcing proper backend (by means of ``keyringrc.cfg``, see above).
384 try enforcing proper backend (by means of ``keyringrc.cfg``, see above).
378 Only if this doesn't help, there may be a bug in mercurial_keyring.
385 Only if this doesn't help, there may be a bug in mercurial_keyring.
@@ -385,6 +392,7 b' keyring`` and looking for binary package'
385
392
386
393
387
394
395
388 History
396 History
389 =======================================================
397 =======================================================
390
398
@@ -1,5 +1,5 b''
1
1
2 VERSION = '1.2.0'
2 VERSION = '1.2.1'
3
3
4 # pylint: disable=unused-import
4 # pylint: disable=unused-import
5
5
General Comments 0
You need to be logged in to leave comments. Login now