D7200: histedit: restore hex nodeids to be 12 digits long

Closed by commit rHGb27cf9f52194: histedit: restore hex nodeids to be 12 digits long (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial

D7200: histedit: restore hex nodeids to be 12 digits long

martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I accidentally switched from 12 digits to 40 digits while making the code py3-compatible. Thanks to Yuya for noticing.

D7183: py3: render message about conflicts in chistedit code

martinvonz added a comment. In D7183#105654 , @martinvonz wrote: > In D7183#105653 , @yuja wrote: > >>> if len(conflicts) > 0: >>> >>> - conflictstr = b','.join(map(lambda r: str(r.ctx),

D7183: py3: render message about conflicts in chistedit code

martinvonz added a comment. In D7183#105653 , @yuja wrote: >> if len(conflicts) > 0: >> >> - conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts)) >> >> +conflictstr = b','.join(map(lambda r: r.ctx.hex(),

mercurial@43375: 14 new changesets (14 on stable)

14 new changesets (14 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/ddfd0f3956f4 changeset: 43362:ddfd0f3956f4 branch: stable user:Emmanuel Leblond date:Fri Nov 01 10:57:31 2019 -0700 summary: py3: fix fsmonitor's _handleunavailable exception

D7183: py3: render message about conflicts in chistedit code

yuja added a comment. > if len(conflicts) > 0: > > - conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts)) > > +conflictstr = b','.join(map(lambda r: r.ctx.hex(), conflicts)) Seems okay, but it was previously a short hash. REPOSITORY rHG Mercurial CHANGES

Re: D7183: py3: render message about conflicts in chistedit code

> if len(conflicts) > 0: > -conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts)) > +conflictstr = b','.join(map(lambda r: r.ctx.hex(), conflicts)) Seems okay, but it was previously a short hash. ___

D7199: lock: fix race in lock-breaking code

valentin.gatienbaron created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY With low frequency, I see hg pulls fail with output like: abort: no such file or directory: .hg/store/lock I think what happens is, in lock.py,

D7198: lock: refactor in preparation for next commit

valentin.gatienbaron created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7198 AFFECTED FILES mercurial/lock.py CHANGE DETAILS diff --git a/mercurial/lock.py

D7134: phabricator: use context manager form of progress in uploadchunks

Kwan added a comment. Kwan updated this revision to Diff 17494. Rebase onto stable REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7134?vs=17336=17494 BRANCH stable CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7134/new/ REVISION

mercurial@43361: 8 new changesets (8 on stable)

8 new changesets (8 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/166808ff91de changeset: 43354:166808ff91de branch: stable user:Mads Kiilerich date:Thu Oct 31 11:53:11 2019 +0100 summary: packaging: drop "support" for unsupported Fedora versions

Re: [PATCH 1 of 8 stable] packaging: drop "support" for unsupported Fedora versions

On Fri, Nov 1, 2019 at 7:49 AM Mads Kiilerich wrote: > # HG changeset patch > # User Mads Kiilerich > # Date 1572519191 -3600 > # Thu Oct 31 11:53:11 2019 +0100 > # Branch stable > # Node ID a29e42f5492266b779ab24ac4496211c947c6601 > # Parent fdc3af52305b805863d0178b9e8c7150b2495479 >

D7180: tests: fix typo "includfe"

Closed by commit rHG815218e71ae9: tests: fix typo includfe (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7180?vs=17414=17465 CHANGES SINCE LAST ACTION

D7190: py3: fix fsmonitor's _watchmantofsencoding exception message encoding

Closed by commit rHG29e75689d4a2: py3: fix fsmonitors _watchmantofsencoding exception message encoding (authored by touilleMan). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7197: automation: install black

indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This should unblock us from running the code formatting test in our automated environment. REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL

D7186: py3: use native strings as keys into **opts in chistedit

Closed by commit rHGca1398169a73: py3: use native strings as keys into **opts in chistedit (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7185: py3: open chistedit file in binary mode using vfs

Closed by commit rHG093b85e2db05: py3: open chistedit file in binary mode using vfs (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7185?vs=17440=17461

D7184: py3: avoid another b''.format() in chistedit

Closed by commit rHG45ec06859354: py3: avoid another b.format() in chistedit (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7184?vs=17439=17460 CHANGES

D7183: py3: render message about conflicts in chistedit code

Closed by commit rHG9acc86e812b8: py3: render message about conflicts in chistedit code (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7183?vs=17438=17459

D7182: py3: handle keypresses in chistedit

Closed by commit rHGbddc0ee684ae: py3: handle keypresses in chistedit (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7182?vs=17437=17458 CHANGES SINCE

D7193: py3: fix exception message encoding in scmutil.py's simplekeyvaluefile.read

Closed by commit rHG8a1d9e252ea4: py3: fix exception message encoding in scmutil.pys simplekeyvaluefile.read (authored by touilleMan). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7194: py3: fix crecord.py's editpatchwitheditor exception message encoding

Closed by commit rHGd5437bf42e37: py3: fix crecord.pys editpatchwitheditor exception message encoding (authored by touilleMan). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7191: py3: fix exception display encoding in contrib/simplemerge.py

Closed by commit rHGe54da18c421e: py3: fix exception display encoding in contrib/simplemerge.py (authored by touilleMan). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7195: py3: fix exception message encoding in infinitepush

Closed by commit rHGf8e10e3e001f: py3: fix exception message encoding in infinitepush (authored by touilleMan). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7195?vs=17449=17452

D7192: py3: fix exception message check in test-linerange.py's testOutOfRange

Closed by commit rHG5c12a381fab3: py3: fix exception message check in test-linerange.pys testOutOfRange (authored by touilleMan). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7196: py3: fix fsmonitor's _handleunavailable exception message encoding

Closed by commit rHGb567c4365974: py3: fix fsmonitors _handleunavailable exception message encoding (authored by touilleMan). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7187: py3: fix fsmonitor error message formatting under Python3

This revision now requires changes to proceed. indygreg added inline comments. indygreg requested changes to this revision. INLINE COMMENTS > watchmanclient.py:26 > > -def __str__(self): > +def __bytes__(self): > if self.warn: There's no `__bytes__` on Python 2. So we'll want

D7195: py3: fix exception message encoding in infinitepush

touilleMan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7195 AFFECTED FILES hgext/infinitepush/__init__.py CHANGE DETAILS diff --git

D7194: py3: fix crecord.py's editpatchwitheditor exception message encoding

touilleMan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7194 AFFECTED FILES mercurial/crecord.py CHANGE DETAILS diff --git a/mercurial/crecord.py

D7193: py3: fix exception message encoding in scmutil.py's simplekeyvaluefile.read

touilleMan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7193 AFFECTED FILES mercurial/scmutil.py CHANGE DETAILS diff --git a/mercurial/scmutil.py

D7192: py3: fix exception message check in test-linerange.py's testOutOfRange

touilleMan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7192 AFFECTED FILES tests/test-linerange.py CHANGE DETAILS diff --git a/tests/test-linerange.py

D7191: py3: fix exception display encoding in contrib/simplemerge.py

touilleMan created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7191 AFFECTED FILES contrib/simplemerge CHANGE DETAILS diff --git a/contrib/simplemerge

D7190: py3: fix fsmonitor's _watchmantofsencoding exception message encoding

touilleMan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7190 AFFECTED FILES hgext/fsmonitor/__init__.py CHANGE DETAILS diff --git

D7189: git: use bytes in command name, not unicode

maho created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7189 AFFECTED FILES hgext/git/__init__.py CHANGE DETAILS diff --git a/hgext/git/__init__.py

D7188: git: force using bytes in command name

maho created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D7188 AFFECTED FILES mercurial/extensions.py CHANGE DETAILS diff --git a/mercurial/extensions.py

D7186: py3: use native strings as keys into **opts in chistedit

martinvonz updated this revision to Diff 17441. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7186?vs=17433=17441 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7186/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7186 AFFECTED

D7185: py3: open chistedit file in binary mode using vfs

martinvonz updated this revision to Diff 17440. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7185?vs=17432=17440 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7185/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7185 AFFECTED

D7184: py3: avoid another b''.format() in chistedit

martinvonz updated this revision to Diff 17439. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7184?vs=17431=17439 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7184/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7184 AFFECTED

D7183: py3: render message about conflicts in chistedit code

martinvonz updated this revision to Diff 17438. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7183?vs=17430=17438 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7183/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7183 AFFECTED

D7182: py3: handle keypresses in chistedit

martinvonz updated this revision to Diff 17437. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7182?vs=17429=17437 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7182/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7182 AFFECTED

D7181: py3: make chistedit render

martinvonz updated this revision to Diff 17436. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7181?vs=17428=17436 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7181/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7181 AFFECTED

D7187: py3: fix fsmonitor error message formatting under Python3

touilleMan updated this revision to Diff 17435. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7187?vs=17434=17435 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7187/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7187 AFFECTED

D7187: py3: fix fsmonitor error message formatting under Python3

touilleMan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The watchmanclient.Unavailable exception got an invalid __str__ method resulting in a crash when watchman is not available. This fix also solve

[PATCH 8 of 8 stable] packaging: update built-in Fedora support to Fedora 31

# HG changeset patch # User Mads Kiilerich # Date 1572616448 -3600 # Fri Nov 01 14:54:08 2019 +0100 # Branch stable # Node ID 86a486daf51bb3a38623ee0635d81aec5c7008b0 # Parent 8c57b4472c1acd7bf11f83dccb29c6cc064455a0 packaging: update built-in Fedora support to Fedora 31 This is now quite

[PATCH 7 of 8 stable] packaging: refactor "fedora29" target to a single more generic "fedora" target

# HG changeset patch # User Mads Kiilerich # Date 1572612704 -3600 # Fri Nov 01 13:51:44 2019 +0100 # Branch stable # Node ID 8c57b4472c1acd7bf11f83dccb29c6cc064455a0 # Parent 0b31ec6e6e7e815a75dc465e133043582b3e4cb7 packaging: refactor "fedora29" target to a single more generic "fedora"

[PATCH 6 of 8 stable] packaging: make dockerrpm fedora target more generic

# HG changeset patch # User Mads Kiilerich # Date 1572618554 -3600 # Fri Nov 01 15:29:14 2019 +0100 # Branch stable # Node ID 0b31ec6e6e7e815a75dc465e133043582b3e4cb7 # Parent dd589d02eba31ae40369d24bf3620863b4c86008 packaging: make dockerrpm fedora target more generic Fedora moves fast in

[PATCH 5 of 8 stable] packaging: use "python3" for fedora29 ... and as buildrpm default

# HG changeset patch # User Mads Kiilerich # Date 1572609562 -3600 # Fri Nov 01 12:59:22 2019 +0100 # Branch stable # Node ID dd589d02eba31ae40369d24bf3620863b4c86008 # Parent 27f849825e3a2fe7bd08a79659cfddaa95851ff9 packaging: use "python3" for fedora29 ... and as buildrpm default Change

[PATCH 4 of 8 stable] packaging: use "--python python" for centos7 to avoid explicit "python2"

# HG changeset patch # User Mads Kiilerich # Date 1572608858 -3600 # Fri Nov 01 12:47:38 2019 +0100 # Branch stable # Node ID 27f849825e3a2fe7bd08a79659cfddaa95851ff9 # Parent 0039dc1d76f454f86a9cbfb9064ca6b3cac664d6 packaging: use "--python python" for centos7 to avoid explicit "python2"

[PATCH 3 of 8 stable] packaging: fix docker-centos5 - use pythonexe and set to "python" as before

# HG changeset patch # User Mads Kiilerich # Date 1572608048 -3600 # Fri Nov 01 12:34:08 2019 +0100 # Branch stable # Node ID 0039dc1d76f454f86a9cbfb9064ca6b3cac664d6 # Parent b6c904e28f35efa5fcb6162a72e4acb19899f183 packaging: fix docker-centos5 - use pythonexe and set to "python" as

[PATCH 2 of 8 stable] packaging: move dockerrpm output directory creation to dockerrpm

# HG changeset patch # User Mads Kiilerich # Date 1572607097 -3600 # Fri Nov 01 12:18:17 2019 +0100 # Branch stable # Node ID b6c904e28f35efa5fcb6162a72e4acb19899f183 # Parent a29e42f5492266b779ab24ac4496211c947c6601 packaging: move dockerrpm output directory creation to dockerrpm Avoid

[PATCH 1 of 8 stable] packaging: drop "support" for unsupported Fedora versions

# HG changeset patch # User Mads Kiilerich # Date 1572519191 -3600 # Thu Oct 31 11:53:11 2019 +0100 # Branch stable # Node ID a29e42f5492266b779ab24ac4496211c947c6601 # Parent fdc3af52305b805863d0178b9e8c7150b2495479 packaging: drop "support" for unsupported Fedora versions Fedora 31 has

Re: D7181: py3: make chistedit render

Feel free to do that in flight. Otherwise I'll do it later today. It won't matter in practice. We should of course have a separate method explicitly for creating a line instead. But that's not for stable. On Fri, Nov 1, 2019, 06:42 yuja (Yuya Nishihara) < phabrica...@mercurial-scm.org> wrote: >

D7181: py3: make chistedit render

yuja added a comment. > +return b"#%s %s %d:%s %s" % ((b'%d' % self.origpos).ljust(2), > + action.ljust(6), r, h, desc) > + > +__bytes__ = __str__ `__str__ = encoding.strmethod(__bytes__)` can be used instead. `__str__` of

Re: D7181: py3: make chistedit render

> +return b"#%s %s %d:%s %s" % ((b'%d' % self.origpos).ljust(2), > + action.ljust(6), r, h, desc) > + > +__bytes__ = __str__ `__str__ = encoding.strmethod(__bytes__)` can be used instead. `__str__` of Python3 must return unicode string.