Re: [PATCH] py3: write out hgextindex as bytes in setup.py

On Fri, 05 Apr 2019 18:59:42 -0400, Gregory Szorc wrote: The source transforming module importer is going to be “fun” to get working for py2exe. That’s because I believe py2exe is performing its own pyc compilation so the zip has only pyc files. I have doubts that the module compilatio

[PATCH 2 of 2] packaging: ensure that --python is an absolute path when building on Windows

# HG changeset patch # User Matt Harbison # Date 1554520031 14400 # Fri Apr 05 23:07:11 2019 -0400 # Node ID 33e7b98103511da6b5bb7fd54ba7ada62e80813c # Parent 385b6be9f587e3ec2bc04de98d5ffe025a375e8f packaging: ensure that --python is an absolute path when building on Windows For whatever r

[PATCH 1 of 2] packaging: don't crash building wix with python3.6 and earlier

# HG changeset patch # User Matt Harbison # Date 1554518865 14400 # Fri Apr 05 22:47:45 2019 -0400 # Node ID 385b6be9f587e3ec2bc04de98d5ffe025a375e8f # Parent 7cfd20bc07215ce8d18642dfe67f316405208c06 packaging: don't crash building wix with python3.6 and earlier `capture_output` was added i

Re: [PATCH 2 of 3] revset: implement copies and renames for checkstatus

On Fri, Apr 5, 2019, 12:30 Jordi Gutiérrez Hermoso wrote: > # HG changeset patch > # User Jordi Gutiérrez Hermoso > # Date 1554489104 14400 > # Fri Apr 05 14:31:44 2019 -0400 > # Node ID 4baa10f1f44a8e427f49fa4f4d8d29552c2a1a65 > # Parent 9fcb915a73b83547921aaa13584c88cb99c6aee7 > revset:

Re: D5628: diffstat: make --git work properly on renames (issue6025)

On Fri, 5 Apr 2019 20:47:21 +, pulkit (Pulkit Goyal) wrote: > pulkit added inline comments. > > INLINE COMMENTS > > > patch.py:2811 > > +elif line.startswith('rename to'): > > +filename += ' => %s' % line.split()[-1] > > addresult() > > This is unfortunately not work

Re: [PATCH] py3: write out hgextindex as bytes in setup.py

On Fri, 05 Apr 2019 18:38:54 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1554503803 14400 > # Fri Apr 05 18:36:43 2019 -0400 > # Node ID d8aef987cc88a5abead0c9cecf5e14066f161968 > # Parent a975821d0938615b8cb235f12cc6461a42dcfbd8 > py3: write out hgexti

Re: [PATCH 1 of 3] [py3] packaging: allow to run make with python3

On Thu, 04 Apr 2019 19:09:51 +0200, Philippe Pepiot wrote: > # HG changeset patch > # User Philippe Pepiot > # Date 1554397608 -7200 > # Thu Apr 04 19:06:48 2019 +0200 > # Node ID c9030c811fdff71908344bb17f05bb71d314acc7 > # Parent 4ee906aa7b60fb6b113e4dc187fbb5a8f42e557c > [py3] packaging:

Re: [PATCH] chistedit: properly show verbose diffs

On Thu, 04 Apr 2019 10:47:49 -0400, Jordi Gutiérrez Hermoso wrote: > # HG changeset patch > # User Jordi Gutiérrez Hermoso > # Date 1554388915 14400 > # Thu Apr 04 10:41:55 2019 -0400 > # Node ID 704f79617827ab0c19a788715b797fcfe8557cea > # Parent 4ee906aa7b60fb6b113e4dc187fbb5a8f42e557c > c

Re: [PATCH] py3: write out hgextindex as bytes in setup.py

> On Apr 5, 2019, at 15:44, Matt Harbison wrote: > >> On Fri, 05 Apr 2019 18:38:54 -0400, Matt Harbison >> wrote: >> >> # HG changeset patch >> # User Matt Harbison >> # Date 1554503803 14400 >> # Fri Apr 05 18:36:43 2019 -0400 >> # Node ID d8aef987cc88a5abead0c9cecf5e14066f161968 >> #

Re: [PATCH] py3: write out hgextindex as bytes in setup.py

On Fri, 05 Apr 2019 18:38:54 -0400, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1554503803 14400 # Fri Apr 05 18:36:43 2019 -0400 # Node ID d8aef987cc88a5abead0c9cecf5e14066f161968 # Parent a975821d0938615b8cb235f12cc6461a42dcfbd8 py3: write out hgextindex as

[PATCH] py3: write out hgextindex as bytes in setup.py

# HG changeset patch # User Matt Harbison # Date 1554503803 14400 # Fri Apr 05 18:36:43 2019 -0400 # Node ID d8aef987cc88a5abead0c9cecf5e14066f161968 # Parent a975821d0938615b8cb235f12cc6461a42dcfbd8 py3: write out hgextindex as bytes in setup.py I hit this trying to build the py2exe target

D5628: diffstat: make --git work properly on renames (issue6025)

pulkit added inline comments. INLINE COMMENTS > patch.py:2811 > +elif line.startswith('rename to'): > +filename += ' => %s' % line.split()[-1] > addresult() This is unfortunately not working with hglib. hglib seems to be splitting data on '>' or only reading data after

[Bug 6113] New: content-divergent resolution seems to reset author.

https://bz.mercurial-scm.org/show_bug.cgi?id=6113 Bug ID: 6113 Summary: content-divergent resolution seems to reset author. Product: Mercurial Version: unspecified Hardware: All OS: All Status: UNCONFIRMED

D6215: localrepo: don't allow lookup of working directory revision

martinvonz updated this revision to Diff 14688. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6215?vs=14685&id=14688 REVISION DETAIL https://phab.mercurial-scm.org/D6215 AFFECTED FILES mercurial/localrepo.py tests/test-convert-hg-source.t tests/t

D6213: tests: demonstrate broken `hg convert` if "ffffffffffff" is in description

martinvonz updated this revision to Diff 14687. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6213?vs=14683&id=14687 REVISION DETAIL https://phab.mercurial-scm.org/D6213 AFFECTED FILES tests/test-convert-hg-source.t CHANGE DETAILS diff --git a/test

D6212: tests: add test of for hash reference translation by `hg convert`

martinvonz updated this revision to Diff 14686. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6212?vs=14682&id=14686 REVISION DETAIL https://phab.mercurial-scm.org/D6212 AFFECTED FILES tests/test-convert-hg-source.t CHANGE DETAILS diff --git a/test

D6212: tests: add test of for hash reference translation by `hg convert`

martinvonz added inline comments. INLINE COMMENTS > test-convert-hg-source.t:213-215 > +Create a commit we'll drop while converting so we get different hashes > + $ echo a > unwanted > + $ hg ci -Aqm 'unwanted' I just remembered that there is a `convert.hg.sourcename` that can be used for thi

[PATCH 2 of 2 V2] chistedit: add basic colours to diff view

# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1554350103 14400 # Wed Apr 03 23:55:03 2019 -0400 # Node ID 93b81d9461e703176801fc425d9e9f75275abc02 # Parent ede500c898adaab1d78f5e048fe84774c9f01fea chistedit: add basic colours to diff view This isn't complete, and it would be ni

[PATCH 1 of 2 V2] chistedit: use default curses colours

# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1554490485 14400 # Fri Apr 05 14:54:45 2019 -0400 # Node ID ede500c898adaab1d78f5e048fe84774c9f01fea # Parent a975821d0938615b8cb235f12cc6461a42dcfbd8 chistedit: use default curses colours Terminals will define default colours (for

[PATCH 1 of 3] revset: short docstring for checkstatus

# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1554489052 14400 # Fri Apr 05 14:30:52 2019 -0400 # Node ID 9fcb915a73b83547921aaa13584c88cb99c6aee7 # Parent a975821d0938615b8cb235f12cc6461a42dcfbd8 revset: short docstring for checkstatus This is where all the action happens for

[PATCH 2 of 3] revset: implement copies and renames for checkstatus

# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1554489104 14400 # Fri Apr 05 14:31:44 2019 -0400 # Node ID 4baa10f1f44a8e427f49fa4f4d8d29552c2a1a65 # Parent 9fcb915a73b83547921aaa13584c88cb99c6aee7 revset: implement copies and renames for checkstatus Determining when a file is a

[PATCH 3 of 3] revset: two new revsets, copies and renames

# HG changeset patch # User Jordi Gutiérrez Hermoso # Date 1554489566 14400 # Fri Apr 05 14:39:26 2019 -0400 # Node ID cf6a3da4082569df7b5dd83ab61fcbedc70839f1 # Parent 4baa10f1f44a8e427f49fa4f4d8d29552c2a1a65 revset: two new revsets, copies and renames diff --git a/mercurial/revset.py b/me

D6212: tests: add test of for hash reference translation by `hg convert`

martinvonz added a comment. I created this stack on the default branch, but it's probably small enough to be put on stable. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6212 To: martinvonz, #hg-reviewers Cc: mercurial-devel ___

D6215: localrepo: don't allow lookup of working directory revision

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It seems that repo.lookup(), which is what supports the "lookup" wire protocol command, should not allow the working copy revision input. This fixes both

D6214: tests: demonstrate broken pull of "ffffffffffff" revision

martinvonz 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/D6214 AFFECTED FILES tests/test-pull.t CHANGE DETAILS diff --git a/tests/test-pull.t b/tests/test-p

D6213: tests: demonstrate broken `hg convert` if "ffffffffffff" is in description

martinvonz 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/D6213 AFFECTED FILES tests/test-convert-hg-source.t CHANGE DETAILS diff --git a/tests/test-convert-

D6212: tests: add test of for hash reference translation by `hg convert`

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The convert extension translates commit references in the commit message. We didn't have any explicit testing of this before, so let's add a test. REPOSITORY

Re: [PATCH] setup: fix a possible NameError on rust build

queued, thanks > On Apr 4, 2019, at 10:24, Georges Racinet wrote: > > > On 4/4/19 3:43 PM, Philippe Pepiot wrote: >> # HG changeset patch >> # User Philippe Pepiot >> # Date 1554385248 -7200 >> # Thu Apr 04 15:40:48 2019 +0200 >> # Node ID f7c8453060138de8ab1f56b760d84157d3f0a064 >> # Par

D6188: test/test-revset2.t: Unset environment variable P

jerry.montfort abandoned this revision. jerry.montfort added a comment. Thanks @pulkit! Abandoning revision as you suggested. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6188 To: jerry.montfort, #hg-reviewers Cc: pulkit, mercurial-devel __

D6178: crecord: new keys g & G to navigate to the top and bottom respectively

This revision was automatically updated to reflect the committed changes. Closed by commit rHG80103ed2e8ee: crecord: new keys g & G to navigate to the top and bottom respectively (authored by carun, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6178?vs=14623&id=14681#t

D6178: crecord: new keys g & G to navigate to the top and bottom respectively

pulkit added a comment. Amending this diff to make test-check-code.t happy which complains about lines longer than 80. diff --git a/mercurial/crecord.py b/mercurial/crecord.py --- a/mercurial/crecord.py +++ b/mercurial/crecord.py @@ -1528,10 +1528,10 @@ the following are val

Re: [PATCH] chistedit: properly show verbose diffs

On Thu, Apr 4, 2019 at 5:50 PM Jordi Gutiérrez Hermoso wrote: > # HG changeset patch > # User Jordi Gutiérrez Hermoso > # Date 1554388915 14400 > # Thu Apr 04 10:41:55 2019 -0400 > # Node ID 704f79617827ab0c19a788715b797fcfe8557cea > # Parent 4ee906aa7b60fb6b113e4dc187fbb5a8f42e557c > chis

Re: [PATCH] chistedit: use default curses colours

On Thu, Apr 4, 2019 at 6:15 AM Jordi Gutiérrez Hermoso wrote: > # HG changeset patch > # User Jordi Gutiérrez Hermoso > # Date 1554347266 14400 > # Wed Apr 03 23:07:46 2019 -0400 > # Node ID 263cec9c08fc1b517847fe53f27b47978be127f4 > # Parent 4ee906aa7b60fb6b113e4dc187fbb5a8f42e557c > chis

D6211: branch: return early if we find an open named branch apart from default

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The current code builds a list of all the open named branches except default and then bool that. This is mostly fine until you get a repo which has thousands of

D6210: branchcache: don't verify closed nodes in _branchtip()

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We only do membership testing there. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6210 AFFECTED FILES mercurial/branchmap.py CHA

D6209: branchcache: don't verify closed nodes in iteropen()

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We expect that the nodes passed to iteropen() will be verified. We are only testing for membership in closed nodes set, so we don't need to verify the whole clos

D6208: [RFC] branchmap: lazily validate nodes from the branchmap

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On my personal hg-repository with 365 entries in .hg/cache/branch2, following are the numbers for perfbranchmapload. Before this patch: ! wall 0.000866 co

D6207: branchcache: add functions to validate changelog nodes

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds functions to validate closed nodes, validate nodes for a certain branch and for all the branches. These functions will be used in upcoming patche

D6206: branchmap: implement __contains__()

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We have good occurences of `if branch in branchmap()` in our code. If __contains__() is not implemented then it will use __iter__() to find whether the element ex

D6205: branchmap: prevent using __getitem__() in branchheads()

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY branchheads() can directly use self._entries instead. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6205 AFFECTED FILES mercurial/

D6204: branchmap: dynamically resolve type of branchcache class

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is required to support subclassing. Thanks to Yuya for suggesting this in https://phab.mercurial-scm.org/D6151. REPOSITORY rHG Mercurial REVISION DETAIL

D6183: copies: add config option for writing copy metadata to file and/or changset

martinvonz added a comment. In https://phab.mercurial-scm.org/D6183#90300, @marmoute wrote: > I am quite enthousiastic for a non-filelog based copy tracing using commit level information. However, I am very unenthousiastic at the idea of storing more copy data in the changeset itself. Th

D6200: perf: make perf.run-limits code work with Python 3

This revision was automatically updated to reflect the committed changes. Closed by commit rHG912d82daeda3: perf: make perf.run-limits code work with Python 3 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6200?vs=146

D6199: zstandard: vendor python-zstandard 0.11

This revision was automatically updated to reflect the committed changes. Closed by commit rHG675775c33ab6: zstandard: vendor python-zstandard 0.11 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6199?vs=14658&id=14672

D6198: cext: make osutil.c PY_SSIZE_T_CLEAN

This revision was automatically updated to reflect the committed changes. Closed by commit rHG668eff08387f: cext: make osutil.c PY_SSIZE_T_CLEAN (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6198?vs=14654&id=14671 R

D6197: cext: make parsers.c PY_SSIZE_T_CLEAN

This revision was automatically updated to reflect the committed changes. Closed by commit rHG896b19d12c08: cext: make parsers.c PY_SSIZE_T_CLEAN (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6197?vs=14653&id=14670

D6196: cext: make revlog.c PY_SSIZE_T_CLEAN

This revision was automatically updated to reflect the committed changes. Closed by commit rHGb01bbb8ff1f2: cext: make revlog.c PY_SSIZE_T_CLEAN (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6196?vs=14652&id=14669 R

D6202: setup: use raw string for regular expression

This revision was automatically updated to reflect the committed changes. Closed by commit rHGfecbd93a5f08: setup: use raw string for regular expression (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6202?vs=14661&id=

D6203: tests: add optional output for Python 2.7 deprecation

This revision was automatically updated to reflect the committed changes. Closed by commit rHG65ed223619ec: tests: add optional output for Python 2.7 deprecation (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6203?vs=

D6201: automation: use raw strings when there are backslashes

This revision was automatically updated to reflect the committed changes. Closed by commit rHG0e9066db5e44: automation: use raw strings when there are backslashes (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6201?vs

D6188: test/test-revset2.t: Unset environment variable P

pulkit added a comment. In https://phab.mercurial-scm.org/D6188#90212, @jerry.montfort wrote: > Hi, Used hg phasbsend which created https://phab.mercurial-scm.org/D6195. I've no clue how to merge/handle these two, so feel free to intervene. > Also added issueNNN to the commit descripti

Re: [PATCH] interactive: do not prompt about files given in command line

On Fri, Apr 5, 2019 at 12:47 PM Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1554370518 -7200 > # Thu Apr 04 11:35:18 2019 +0200 > # Node ID 74a00c7446609592ccb6a3dc5ac98769ac36bfe8 > # Parent 4ee906aa7b60fb6b113e4dc187fbb5a8f42e557c > interactive: do not pro

[PATCH] interactive: do not prompt about files given in command line

# HG changeset patch # User Denis Laxalde # Date 1554370518 -7200 # Thu Apr 04 11:35:18 2019 +0200 # Node ID 74a00c7446609592ccb6a3dc5ac98769ac36bfe8 # Parent 4ee906aa7b60fb6b113e4dc187fbb5a8f42e557c interactive: do not prompt about files given in command line For commit and revert commands

D6183: copies: add config option for writing copy metadata to file and/or changset

marmoute added a comment. I am quite enthousiastic for a non-filelog based copy tracing using commit level information. However, I am very unenthousiastic at the idea of storing more copy data in the changeset itself. The "files" field in the changelog is already quite problematic (about 95%