D7221: hghave: fix bytes/string issue on Python 3

Submitter	phabricator
Date	Nov. 4, 2019, 9:20 p.m.
Message ID	<differential-rev-PHID-DREV-b3e5dipm6vflseks5qsn-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/42730/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Mon, 4 Nov 2019 21:20:38 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "durin42 (Augie Fackler)" <phabricator@mercurial-scm.org> Subject: D7221: hghave: fix bytes/string issue on Python 3 Message-ID: <differential-rev-PHID-DREV-b3e5dipm6vflseks5qsn-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-b3e5dipm6vflseks5qsn Thread-Index: OTRlNGE0ZjdlN2YwM2MzNjQyODU4MWY2YzVi MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "durin42 \(Augie Fackler\)" <phabricator+D7221+public+d9b1c2e0f56fd263@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Nov. 4, 2019, 9:20 p.m.

durin42 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/D7221

AFFECTED FILES
  tests/hghave.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

phabricator - Nov. 11, 2019, 11:36 a.m.

pulkit added a comment.


  This has already been pushed as https://www.mercurial-scm.org/repo/hg-committed/rev/c3bca833cb92

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7221/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7221

To: durin42, #hg-reviewers, pulkit
Cc: mercurial-devel

phabricator - April 22, 2020, 3:58 p.m.

Herald added a subscriber: mercurial-patches.
marmoute added a comment.


  Baymax does not catch stuff in `Accepted` state, but this diff is 6 months old, so resubmit if still relevant.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7221/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7221

To: durin42, #hg-reviewers, pulkit
Cc: marmoute, mercurial-patches, mercurial-devel

phabricator - Aug. 8, 2020, 8:56 p.m.

indygreg added a comment.


  A similar patch already landed. I'm going to commandeer and close.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7221/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7221

To: durin42, #hg-reviewers, pulkit
Cc: indygreg, marmoute, mercurial-patches, mercurial-devel

Patch

diff --git a/tests/hghave.py b/tests/hghave.py
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -987,4 +987,4 @@ 
     version_regex = b'black, version ([0-9a-b.]+)'
     version = matchoutput(blackcmd, version_regex)
     sv = distutils.version.StrictVersion
-    return version and sv(version.group(1)) >= sv('19.10b0')
+    return version and sv(_strpath(version.group(1))) >= sv('19.10b0')

Patchwork D7221: hghave: fix bytes/string issue on Python 3

Comments

Patch