[Bug 6116] New: http 410 exchanging obsolete markers with evolve repo

2019-04-08 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6116 Bug ID: 6116 Summary: http 410 exchanging obsolete markers with evolve repo Product: Mercurial project Version: unspecified Hardware: PC OS: Windows Status: UNCONFIR

Re: [PATCH evolve-ext] uncommit: abort if an explicitly given file cannot be uncommitted (BC)

2019-04-08 Thread Matt Harbison
On Tue, 02 Apr 2019 22:45:15 -0400, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1554259321 14400 # Tue Apr 02 22:42:01 2019 -0400 # Node ID 272e76e20c3c52fcae8a4c2003f73d8db77e566b # Parent e8515ee7a7cc0281d905f762e26e8956ccfd7f74 uncommit: abort if an explici

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

2019-04-08 Thread Yuya Nishihara
On Mon, 08 Apr 2019 14:27:53 -0400, Jordi Gutiérrez Hermoso wrote: > On Sun, 2019-04-07 at 09:55 +0900, Yuya Nishihara wrote: > > On Fri, 05 Apr 2019 14:42:38 -0400, Jordi Gutiérrez Hermoso wrote: > > > > @@ -624,7 +627,18 @@ def checkstatus(repo, subset, pat, field > > >  brea

Re: [PATCH] chistedit: properly show verbose diffs

2019-04-08 Thread Yuya Nishihara
On Mon, 08 Apr 2019 10:36:53 -0400, Jordi Gutiérrez Hermoso wrote: > On Sat, 2019-04-06 at 09:46 +0900, Yuya Nishihara wrote: > > On Thu, 04 Apr 2019 10:47:49 -0400, Jordi Gutiérrez Hermoso wrote: > > > diff --git a/hgext/histedit.py b/hgext/histedit.py > > > --- a/hgext/histedit.py > > > +++ b/hge

mercurial@42075: 5 new changesets

2019-04-08 Thread Mercurial Commits
5 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/db72f9f6580e changeset: 42071:db72f9f6580e user:Denis Laxalde date:Thu Apr 04 11:35:18 2019 +0200 summary: interactive: do not prompt about files given in command line https://www.mercurial-scm.org/rep

D6217: remotefilelog: correctly reject wdir filenodes

2019-04-08 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG864f9f63d3ed: remotefilelog: correctly reject wdir filenodes (authored by durin42, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6217?vs=14690&id=14700#toc REPOSITORY rHG M

D6216: remotefilelog: add tests of `hg grep -r 'wdir()'`

2019-04-08 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb1b216a241cc: remotefilelog: add tests of `hg grep -r 'wdir()'` (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6216?vs=14689

D6217: remotefilelog: correctly reject wdir filenodes

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > test-remotefilelog-blame.t:40 >$ hg grep --all-files x > - remote: abort: working directory revision cannot be specified > - 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) > - abort: error downloading file con

[Bug 6115] New: hg id --template - not works

2019-04-08 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6115 Bug ID: 6115 Summary: hg id --template - not works Product: Mercurial Version: 4.9 Hardware: PC OS: Windows Status: UNCONFIRMED Severity: bug Pri

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

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGfcd7a91dec23: localrepo: don't allow lookup of working directory revision (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D

D6194: remotefilelog: fix crash on `hg addremove` of added-but-deleted file

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG91cc8dc866ed: remotefilelog: fix crash on `hg addremove` of added-but-deleted file (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-

D6193: config: read configs from directories in lexicographical order

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGedbcf5b239f9: config: read configs from directories in lexicographical order (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.or

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

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG50b69c08651b: tests: demonstrate broken pull of "" revision (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D62

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

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb8c2dc367cc3: tests: demonstrate broken `hg convert` if "" is in description (authored by martinvonz, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6213?vs=14687&

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

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf46c1a9b1bfe: tests: add test of for hash reference translation by `hg convert` (authored by martinvonz, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6212?vs=14686&id=14693#t

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

2019-04-08 Thread Jordi Gutiérrez Hermoso
On Sun, 2019-04-07 at 09:55 +0900, Yuya Nishihara wrote: > On Fri, 05 Apr 2019 14:42:38 -0400, Jordi Gutiérrez Hermoso wrote: > > @@ -624,7 +627,18 @@ def checkstatus(repo, subset, pat, field > >  break > >  else: > >  return False > > -files

Re: Idea: hg merge --close

2019-04-08 Thread Augie Fackler
On Sun, Apr 07, 2019 at 02:02:07PM +0200, Pierre-Yves David wrote: > > > On 4/7/19 12:52 PM, Joerg Sonnenberger wrote: > > Hello all, > > one thing we discussed during the mini sprint is the issue of dealing > > with merged vs active vs inactive branches. At the moment, closing a > > branch to get

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

2019-04-08 Thread Augie Fackler
On Fri, Apr 05, 2019 at 02:56:38PM -0400, Jordi Gutiérrez Hermoso wrote: > # HG changeset patch > # User Jordi Gutiérrez Hermoso > # Date 1554350103 14400 > # Wed Apr 03 23:55:03 2019 -0400 > # Node ID 93b81d9461e703176801fc425d9e9f75275abc02 > # Parent ede500c898adaab1d78f5e048fe84774c9f01f

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

2019-04-08 Thread Augie Fackler
On Fri, Apr 05, 2019 at 11:11:36PM -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1554520031 14400 > # Fri Apr 05 23:07:11 2019 -0400 > # Node ID 33e7b98103511da6b5bb7fd54ba7ada62e80813c > # Parent 385b6be9f587e3ec2bc04de98d5ffe025a375e8f > packaging: ensu

Re: [PATCH 8 of 8] match: let regex match function return a boolean

2019-04-08 Thread Augie Fackler
On Mon, Apr 08, 2019 at 10:23:52AM +0200, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1554648827 -7200 > # Sun Apr 07 16:53:47 2019 +0200 > # Node ID de054cf2bda331787804762f411d1656333c43c4 > # Parent 5adda8921403ce9aa216a823e69ab668ac674d8f > match: let rege

Re: [PATCH 4 of 8] match: complement documentation of match() parameters

2019-04-08 Thread Augie Fackler
On Mon, Apr 08, 2019 at 10:23:48AM +0200, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1554567649 -7200 > # Sat Apr 06 18:20:49 2019 +0200 > # Node ID 043ca8235e56dec170c7feee51c59d4150d94a2f > # Parent a507b64705f6ce78c4ad74b45a798668d8770cb7 > match: compleme

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

2019-04-08 Thread Martin von Zweigbergk via Mercurial-devel
On Sun, Apr 7, 2019 at 5:50 PM Jordi Gutiérrez Hermoso wrote: > On Sun, 2019-04-07 at 09:48 +0900, Yuya Nishihara wrote: > > So they are quite similar to -r 'file("set:copied()")', and we do include > > renames in copies in general. > > Hm, but we don't have a renamed() fileset, do we? How do you

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

2019-04-08 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D6183#90498, @martinvonz wrote: > In https://phab.mercurial-scm.org/D6183#90486, @pulkit wrote: > > > In https://phab.mercurial-scm.org/D6183#90481, @martinvonz wrote: > > > > > In https://phab.mercurial-scm.org/D6183#90327,

D6196: cext: make revlog.c PY_SSIZE_T_CLEAN

2019-04-08 Thread mharbison72 (Matt Harbison)
mharbison72 added a comment. I don't have time to look into this, but this makes the mac builds very unhappy. (The parent runs fine.) Somehow the bot is still running, but recording various segfaults. When I tried to investigate, the build process fails because `python hg version` is segf

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

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D6183#90486, @pulkit wrote: > In https://phab.mercurial-scm.org/D6183#90481, @martinvonz wrote: > > > In https://phab.mercurial-scm.org/D6183#90327, @martinvonz wrote: > > > > > In https://phab.mercurial-scm.org/D6183#90

D6219: memctx: make p[12]copies() correct

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz planned changes to this revision. martinvonz added a subscriber: pulkit. martinvonz added a comment. Not for review, sharing for @pulkit REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6219 To: martinvonz, #hg-reviewers Cc: pulkit, mercurial-devel

D6219: memctx: make p[12]copies() correct

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY TODO: extract the code that's duplicated from changectx REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6219 AFFECTED FILES merc

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

2019-04-08 Thread pulkit (Pulkit Goyal)
pulkit added a comment. In https://phab.mercurial-scm.org/D6183#90481, @martinvonz wrote: > In https://phab.mercurial-scm.org/D6183#90327, @martinvonz wrote: > > > In https://phab.mercurial-scm.org/D6183#90300, @marmoute wrote: > > > > > I am quite enthousiastic for a non-filelog b

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

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D6183#90470, @gracinet wrote: > Hi Martin, > > Thanks for taking on copy tracing, it's been on our mind for a while, too. > > Some of our users would be very interested in the expected speedups of the copy tracing syste

D6218: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in exchange.py:2217 > I don't feel good about the fact that we are not encoding data here. Is there > exists some function which I can use to encode and decode this list of specs? You could probably reuse the function from https:/

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

2019-04-08 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D6183#90327, @martinvonz wrote: > 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 unenth

D6218: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

2019-04-08 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > exchange.py:2217 > narrowspecpart = bundler.newpart('narrow:spec') > +data = '' > if include: I don't feel good about the fact that we are not encoding data here. Is there exists some function which I can use to encode an

D6218: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019)

2019-04-08 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a reviewer: durin42. Herald added a reviewer: martinvonz. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this patch, when ACL is involved, narrowspecs are send as bundle2 parameter for narrow

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

2019-04-08 Thread gracinet (Georges Racinet)
gracinet added a comment. Hi Martin, Thanks for taking on copy tracing, it's been on our mind for a while, too. Some of our users would be very interested in the expected speedups of the copy tracing system, however the impact of putting that data in the changeset itself would not b

D6217: remotefilelog: correctly reject wdir filenodes

2019-04-08 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This fixes `hg grep -r 'wdir()'` when remotefilelog is enabled and the working directory contains uncommitted modifications. REPOSITORY rHG Mercurial REVISION

D6216: remotefilelog: add tests of `hg grep -r 'wdir()'`

2019-04-08 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This demonstrates how remotefilelog breaks grepping dirtied working directories. A future change will introduce a fix. REPOSITORY rHG Mercurial REVISION DETAIL

Re: [PATCH] chistedit: properly show verbose diffs

2019-04-08 Thread Jordi Gutiérrez Hermoso
On Sat, 2019-04-06 at 09:46 +0900, Yuya Nishihara wrote: > On Thu, 04 Apr 2019 10:47:49 -0400, Jordi Gutiérrez Hermoso wrote: > > diff --git a/hgext/histedit.py b/hgext/histedit.py > > --- a/hgext/histedit.py > > +++ b/hgext/histedit.py > > @@ -1230,8 +1230,9 @@ def addln(win, y, x, line, color=Non

Re: packaging hg + zstd for Fedora

2019-04-08 Thread Gregory Szorc
Static linking to get the “advanced” zstd C API is still required. Supposedly the API will be stabilized in the next major release of zstd. python-zstandard doesn’t support non-static linking. There is a setup.py option to not use the bundled zstd library, which is better for packagers, but stil

Re: packaging hg + zstd for Fedora

2019-04-08 Thread Neal Becker
Augie Fackler wrote: > Greg? You're the python-zstd maintainer: is the interface stable enough we > can support non-vendored zstd at this point? > > Context for Neal: there at least used to be some unstable APIs in play > that required static linking, so our old guidance was to only use the > ven

Re: packaging hg + zstd for Fedora

2019-04-08 Thread Augie Fackler
Greg? You're the python-zstd maintainer: is the interface stable enough we can support non-vendored zstd at this point? Context for Neal: there at least used to be some unstable APIs in play that required static linking, so our old guidance was to only use the vendored zstd. I don't know offhan

packaging hg + zstd for Fedora

2019-04-08 Thread Neal Becker
Hi, I'm helping to maintain hg on Fedora. Fedora has a policy of using system libraries where possible. Fedora currently has libzstd (1.3.8), but does not appear to have python2- zstd module. I think we need to build hg to use the system libzstd, and to also package python2-zstd seperate

[PATCH 4 of 8] match: complement documentation of match() parameters

2019-04-08 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1554567649 -7200 # Sat Apr 06 18:20:49 2019 +0200 # Node ID 043ca8235e56dec170c7feee51c59d4150d94a2f # Parent a507b64705f6ce78c4ad74b45a798668d8770cb7 match: complement documentation of match() parameters diff --git a/mercurial/match.py b/mer

[PATCH 6 of 8] match: make _donormalize's auditor and warn arguments optional

2019-04-08 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1554650069 -7200 # Sun Apr 07 17:14:29 2019 +0200 # Node ID a544e90f7c163576fe84234b024bf0c0052d995e # Parent c7e9ddf8b24e9768d331872af1e61cd5d65c3668 match: make _donormalize's auditor and warn arguments optional Argument 'warn' is actually

[PATCH 3 of 8] match: add doctest examples for patkind()

2019-04-08 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1554566053 -7200 # Sat Apr 06 17:54:13 2019 +0200 # Node ID a507b64705f6ce78c4ad74b45a798668d8770cb7 # Parent 490dbf4f3e1668a186e14e95a119684dafcf496b match: add doctest examples for patkind() diff --git a/mercurial/match.py b/mercurial/match

[PATCH 2 of 8] match: add a docstring with doctest examples to patternmatcher

2019-04-08 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1554556915 -7200 # Sat Apr 06 15:21:55 2019 +0200 # Node ID 490dbf4f3e1668a186e14e95a119684dafcf496b # Parent 9514c11ecebac78d47f1b174a4bbc4d17971ab05 match: add a docstring with doctest examples to patternmatcher Doctest examples aim at illu

[PATCH 1 of 8] match: add doctest examples for exactmatcher

2019-04-08 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1554632483 -7200 # Sun Apr 07 12:21:23 2019 +0200 # Node ID 9514c11ecebac78d47f1b174a4bbc4d17971ab05 # Parent 675775c33ab66cd157b9929bb0371bf05cbceee6 match: add doctest examples for exactmatcher Make the docstring raw, since it now includes

[PATCH 8 of 8] match: let regex match function return a boolean

2019-04-08 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1554648827 -7200 # Sun Apr 07 16:53:47 2019 +0200 # Node ID de054cf2bda331787804762f411d1656333c43c4 # Parent 5adda8921403ce9aa216a823e69ab668ac674d8f match: let regex match function return a boolean Match function for regex pattern kind is b

[PATCH 5 of 8] match: add doctest examples in match()

2019-04-08 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1554708890 -7200 # Mon Apr 08 09:34:50 2019 +0200 # Node ID c7e9ddf8b24e9768d331872af1e61cd5d65c3668 # Parent 043ca8235e56dec170c7feee51c59d4150d94a2f match: add doctest examples in match() Make the docstring raw, as it now includes escape ch

[PATCH 7 of 8] match: make arguments of _expandsets() optional

2019-04-08 Thread Denis Laxalde
# HG changeset patch # User Denis Laxalde # Date 1554650218 -7200 # Sun Apr 07 17:16:58 2019 +0200 # Node ID 5adda8921403ce9aa216a823e69ab668ac674d8f # Parent a544e90f7c163576fe84234b024bf0c0052d995e match: make arguments of _expandsets() optional Arguments 'ctx', 'listsubrepos' and 'badfn'