D3530: revlog: handle error from node lookup

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG312d7d14d44e: revlog: handle error from node lookup (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3530?vs=8636=8647

D3518: remotenames: check the remotepath with url containing user information too

2018-05-11 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGbbdc1bc56e58: remotenames: check the remotepath with url containing user information too (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3520: remotenames: enable the storage config option if extension is enabled

2018-05-11 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb9e6b71dc272: remotenames: enable the storage config option if extension is enabled (authored by pulkit, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3520?vs=8613=8651#toc

D3519: tests: clone the repo over ssh in tests/test-logexchange.t

2018-05-11 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7465b908d305: tests: clone the repo over ssh in tests/test-logexchange.t (authored by pulkit, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3519?vs=8612=8650#toc REPOSITORY

D3531: shortest: avoid magic number "41"

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5ac72e07692a: shortest: avoid magic number 41 (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3531?vs=8637=8648 REVISION

[PATCH 01 of 10] hgweb: move prettyprintlines() closure out of diffs()

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522766299 -32400 # Tue Apr 03 23:38:19 2018 +0900 # Node ID 093cd239abcc1a6a79e80f03f3536df427753ebe # Parent b9e6b71dc27246d1f4d6437edfdc9788188aa306 hgweb: move prettyprintlines() closure out of diffs() This will be

[PATCH 02 of 10] hgweb: wrap {lines} of {diff} with mappedgenerator

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522766535 -32400 # Tue Apr 03 23:42:15 2018 +0900 # Node ID 11a0e939b544d0c091c20b1d82bdc775a3b0b9ff # Parent 093cd239abcc1a6a79e80f03f3536df427753ebe hgweb: wrap {lines} of {diff} with mappedgenerator This can't be a

[PATCH 06 of 10] hgweb: move getblock() closure out of compare()

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522767420 -32400 # Tue Apr 03 23:57:00 2018 +0900 # Node ID feeb2881059ed9d102239a16b865b522efdcf408 # Parent 4365cc3f60091ff071d19254e50e3074b64cb317 hgweb: move getblock() closure out of compare() (Please use 'hg diff -w'

[PATCH 04 of 10] hgweb: convert {diff} to a mappinggenerator with named template

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522767000 -32400 # Tue Apr 03 23:50:00 2018 +0900 # Node ID 1e645f7b2fd870569e56a0560a3c65c120319a8e # Parent 61596d8c9f8c083ccac07334e3a4010df7ad9646 hgweb: convert {diff} to a mappinggenerator with named template No more

[PATCH 03 of 10] hgweb: use template context to render {lines} of {diff}

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522766621 -32400 # Tue Apr 03 23:43:41 2018 +0900 # Node ID 61596d8c9f8c083ccac07334e3a4010df7ad9646 # Parent 11a0e939b544d0c091c20b1d82bdc775a3b0b9ff hgweb: use template context to render {lines} of {diff} This is a

Re: [PATCH 1 of 3] test-ssh: add some flush() to make output deterministic

2018-05-11 Thread Gregory Szorc
On Fri, May 11, 2018 at 6:42 PM, Yuya Nishihara wrote: > On Fri, 11 May 2018 14:08:18 -0700, Gregory Szorc wrote: > > On Mon, May 7, 2018 at 6:11 AM, Yuya Nishihara wrote: > > > > > # HG changeset patch > > > # User Yuya Nishihara > > > # Date

[PATCH 05 of 10] hgweb: move compline() closure out of compare()

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522767248 -32400 # Tue Apr 03 23:54:08 2018 +0900 # Node ID 4365cc3f60091ff071d19254e50e3074b64cb317 # Parent 1e645f7b2fd870569e56a0560a3c65c120319a8e hgweb: move compline() closure out of compare() diff --git

Re: [PATCH] phabricator: drop support for the deprecated `phabricator.token` config

2018-05-11 Thread Matt Harbison
On Fri, 11 May 2018 22:51:27 -0400, Yuya Nishihara wrote: On Fri, 11 May 2018 21:31:48 -0400, Matt Harbison wrote: > phabricator: drop support for the deprecated `phabricator.token` config BTW, are there any plans to move this into the bundled extensions? Perhaps someone

Re: D3536: json: reject unicode on py2 as well

2018-05-11 Thread Yuya Nishihara
> `unicode` is not a type on Python 3. I think this should be changed to > `(str, pycompat.unicode)`. Alternatively, it could be `type(u'')`. I have no preference though. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D3536: json: reject unicode on py2 as well

2018-05-11 Thread yuja (Yuya Nishihara)
yuja added a comment. > `unicode` is not a type on Python 3. I think this should be changed to `(str, pycompat.unicode)`. Alternatively, it could be `type(u'')`. I have no preference though. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3536 To:

D3444: tests: comprehensively test exit handling

2018-05-11 Thread yuja (Yuya Nishihara)
yuja added a comment. > > I generally like the direction of this series, but I think there's no point > > to extend Mercurial's exit code handling to support all weird Python types. > > > > Only ints and (None for 0) are ever valid. > > > The reason I did this is

Re: [PATCH] phabricator: drop support for the deprecated `phabricator.token` config

2018-05-11 Thread Matt Harbison
On Fri, 11 May 2018 21:16:09 -0400, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1526004793 14400 # Thu May 10 22:13:13 2018 -0400 # Node ID 35b230be2610a6ba4b6d6b60e228ec4a8ddfdfae # Parent

Re: [PATCH] phabricator: drop support for the deprecated `phabricator.token` config

2018-05-11 Thread Yuya Nishihara
On Fri, 11 May 2018 21:16:09 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1526004793 14400 > # Thu May 10 22:13:13 2018 -0400 > # Node ID 35b230be2610a6ba4b6d6b60e228ec4a8ddfdfae > # Parent

Re: [PATCH] debugextensions: process extensions loaded from the local repository too

2018-05-11 Thread Yuya Nishihara
On Fri, 11 May 2018 22:19:05 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1526090863 14400 > # Fri May 11 22:07:43 2018 -0400 > # Node ID 473978e20a079edc925c920dd1245ea959630c9a > # Parent

Re: [PATCH 1 of 5] extensions: drop dead code trying to exclude deprecated disabled commands

2018-05-11 Thread Gregory Szorc
On Fri, May 11, 2018 at 6:29 AM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1525338823 -32400 > # Thu May 03 18:13:43 2018 +0900 > # Node ID 7eca762c4cb88d42c9239c60fee743327f477c1a > # Parent

D3454: Assign to result from block.

2018-05-11 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. It looks like this is based on top of https://phab.mercurial-scm.org/D3447. So I'll just hook up the dependency and we'll land it as soon as my series is landed. REPOSITORY rHG

D3445: dispatch: validate return type from dispatch() return value

2018-05-11 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 8654. indygreg edited the summary of this revision. indygreg retitled this revision from "dispatch: shore up exit handling" to "dispatch: validate return type from dispatch() return value". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3446: dispatch: move sys.exit() to caller (API)

2018-05-11 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 8655. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3446?vs=8461=8655 REVISION DETAIL https://phab.mercurial-scm.org/D3446 AFFECTED FILES contrib/hgperf hg mercurial/dispatch.py CHANGE DETAILS diff --git

D3537: dispatch: minor code refactor

2018-05-11 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This hopefully makes things slightly easier to read. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3537 AFFECTED FILES

[PATCH] phabricator: drop support for the deprecated `phabricator.token` config

2018-05-11 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1526004793 14400 # Thu May 10 22:13:13 2018 -0400 # Node ID 35b230be2610a6ba4b6d6b60e228ec4a8ddfdfae # Parent 3ac950cd597857af7797f75bb3a6b4c3694cc79c phabricator: drop support for the deprecated `phabricator.token`

Re: [PATCH] filemerge: support specfiying a python function to custom merge-tools

2018-05-11 Thread Yuya Nishihara
On Fri, 11 May 2018 12:05:50 -0600, Tom Hindle wrote: > > I think it's better to pass parameters by variables (e.g. base=basepath), > > instead of a packed argslist. In which case, we'll probably add a separate > > function (e.g. _pymerge().) > Sorry I don't understand this. I meant the user

Re: [PATCH 1 of 3] test-ssh: add some flush() to make output deterministic

2018-05-11 Thread Yuya Nishihara
On Fri, 11 May 2018 14:08:18 -0700, Gregory Szorc wrote: > On Mon, May 7, 2018 at 6:11 AM, Yuya Nishihara wrote: > > > # HG changeset patch > > # User Yuya Nishihara > > # Date 1521963557 -32400 > > # Sun Mar 25 16:39:17 2018 +0900 > > # Node ID

Re: [PATCH] phabricator: drop support for the deprecated `phabricator.token` config

2018-05-11 Thread Yuya Nishihara
On Fri, 11 May 2018 21:31:48 -0400, Matt Harbison wrote: > > phabricator: drop support for the deprecated `phabricator.token` config > > BTW, are there any plans to move this into the bundled extensions? Perhaps someone will have to spend some time on making it testable. FWIW, the new config

Re: [PATCH] phabricator: drop support for the deprecated `phabricator.token` config

2018-05-11 Thread Gregory Szorc
On Fri, May 11, 2018 at 8:01 PM, Matt Harbison wrote: > On Fri, 11 May 2018 22:51:27 -0400, Yuya Nishihara wrote: > > On Fri, 11 May 2018 21:31:48 -0400, Matt Harbison wrote: >> >>> > phabricator: drop support for the deprecated `phabricator.token` config

[PATCH] phabricator: migrate [phabricator.auth] to [auth]

2018-05-11 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1526099641 14400 # Sat May 12 00:34:01 2018 -0400 # Node ID 6c6d0679de6cca2d740874812d87a649f8d8dde8 # Parent b9e6b71dc27246d1f4d6437edfdc9788188aa306 phabricator: migrate [phabricator.auth] to [auth] This resurrects

D3536: json: reject unicode on py2 as well

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This makes it consistent with the behavior on py3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3536 AFFECTED FILES

[PATCH 08 of 10] hgweb: rename 'context' argument of webutil.compare() to avoid name conflicts

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522844070 -32400 # Wed Apr 04 21:14:30 2018 +0900 # Node ID 94ed335f53c7c5fb2b2c9b36d452c3ae47d0c8f1 # Parent 7abacae707546867c2a1cd0f2046297805b89299 hgweb: rename 'context' argument of webutil.compare() to avoid name

[PATCH 07 of 10] hgweb: convert comparison {lines} to a mappinggenerator with named template

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522768090 -32400 # Wed Apr 04 00:08:10 2018 +0900 # Node ID 7abacae707546867c2a1cd0f2046297805b89299 # Parent feeb2881059ed9d102239a16b865b522efdcf408 hgweb: convert comparison {lines} to a mappinggenerator with named

[PATCH 09 of 10] hgweb: convert {comparison} to a mappinggenerator with named template

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522844230 -32400 # Wed Apr 04 21:17:10 2018 +0900 # Node ID c0f7a01a162982f383e69a69ecd2fd89b031d2cb # Parent 94ed335f53c7c5fb2b2c9b36d452c3ae47d0c8f1 hgweb: convert {comparison} to a mappinggenerator with named template No

[PATCH 10 of 10] hgweb: drop unused argument 'tmpl' from webutil.compare()

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522844275 -32400 # Wed Apr 04 21:17:55 2018 +0900 # Node ID d41d6392f2312cdfb72085f312f4c39826741851 # Parent c0f7a01a162982f383e69a69ecd2fd89b031d2cb hgweb: drop unused argument 'tmpl' from webutil.compare() diff --git

[PATCH] debugextensions: process extensions loaded from the local repository too

2018-05-11 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1526090863 14400 # Fri May 11 22:07:43 2018 -0400 # Node ID 473978e20a079edc925c920dd1245ea959630c9a # Parent 35b230be2610a6ba4b6d6b60e228ec4a8ddfdfae debugextensions: process extensions loaded from the local

Re: [PATCH 01 of 10] hgweb: move prettyprintlines() closure out of diffs()

2018-05-11 Thread Gregory Szorc
On Fri, May 11, 2018 at 8:35 PM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1522766299 -32400 > # Tue Apr 03 23:38:19 2018 +0900 > # Node ID 093cd239abcc1a6a79e80f03f3536df427753ebe > # Parent

Re: D3444: tests: comprehensively test exit handling

2018-05-11 Thread Yuya Nishihara
> > I generally like the direction of this series, but I think there's no > point > > to extend Mercurial's exit code handling to support all weird Python > types. > > > > Only ints and (None for 0) are ever valid. > > > The reason I did this is because from the context or

[Bug 5884] New: 4.6 fails to install in msys2

2018-05-11 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5884 Bug ID: 5884 Summary: 4.6 fails to install in msys2 Product: Mercurial Version: 4.6 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature

D3444: tests: comprehensively test exit handling

2018-05-11 Thread indygreg (Gregory Szorc)
indygreg added a comment. In https://phab.mercurial-scm.org/D3444#54922, @yuja wrote: > I generally like the direction of this series, but I think there's no point > to extend Mercurial's exit code handling to support all weird Python types. > > Only ints and (None for 0) are ever

D3536: json: reject unicode on py2 as well

2018-05-11 Thread indygreg (Gregory Szorc)
indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. `unicode` is not a type on Python 3. I think this should be changed to `(str, pycompat.unicode)`. That will evaluate to `(str, unicode)` on Python 2 and `(str, str)` on

Re: [PATCH] util: drop remainder of dateutil/procutil aliases (API)

2018-05-11 Thread Gregory Szorc
On Fri, May 11, 2018 at 6:25 AM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1526043206 -32400 > # Fri May 11 21:53:26 2018 +0900 > # Node ID e2effc80f4388b5c9dc7effa3bd895350b5cf4ce > # Parent

D3532: wireprotov2: define and implement "rawstorefile" command

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > wireprotov2server.py:548-549 > + > +with repo.lock(): > +topfiles = list(repo.store.topfiles()) > + I understand that you don't want to lock the repo for the entire operation, but I assume that also means that the result may fail

[PATCH 1 of 2 STABLE] test-hgweb: add test for foo-bar name lookup

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1526036910 -32400 # Fri May 11 20:08:30 2018 +0900 # Branch stable # Node ID 69381a28b45640fef484e71482a5896ebe5ad163 # Parent 326b174c6a4790a5f282300b38ffc8bc6a727b62 test-hgweb: add test for foo-bar name lookup This is

[PATCH 2 of 2 STABLE] revset: pass in lookup function to matchany() (issue5879)

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1526037022 -32400 # Fri May 11 20:10:22 2018 +0900 # Branch stable # Node ID edb28a6d95b73079a7dd6f8cf0486a8e5a3d9fac # Parent 69381a28b45640fef484e71482a5896ebe5ad163 revset: pass in lookup function to matchany() (issue5879)

Re: D3528: tests: port test-simplekeyvaluefile.py to Python 3

2018-05-11 Thread Yuya Nishihara
> -scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write(d) > +scmutil.simplekeyvaluefile(self.vfs, 'bkvfile').write(d) Fixed as `b'kvfile'` in flight. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

Re: [PATCH 06 of 12] cmdutil: drop deprecated precursor of registrar.command

2018-05-11 Thread Yuya Nishihara
On Fri, 11 May 2018 01:11:19 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1526003628 14400 > # Thu May 10 21:53:48 2018 -0400 > # Node ID 2510563dd5b28a1dbe26cae22cb8964cc73eaeaa > # Parent

Re: D3502: shortest: move revnum-disambiguation out of revlog

2018-05-11 Thread Yuya Nishihara
> +def disambiguate(prefix): > +"""Disambiguate against revnums.""" > +hexnode = hex(node) > +for length in range(len(prefix), 41): Nit: `range(len(prefix), len(hexnode) + 1)` seems slightly better than using a magic number outside the revlog module. > +

Re: D3499: revlog: use node tree (native code) for shortest() calculation

2018-05-11 Thread Yuya Nishihara
> +static int nt_shortest(indexObject *self, const char *node) > +{ > + int level, off; > + > + if (nt_init(self) == -1) > + return -3; > + if (nt_populate(self) == -1) > + return -3; > + > + for (level = off = 0; level < 40; level++) { > + int

[PATCH] util: drop remainder of dateutil/procutil aliases (API)

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1526043206 -32400 # Fri May 11 21:53:26 2018 +0900 # Node ID e2effc80f4388b5c9dc7effa3bd895350b5cf4ce # Parent 7932be8b05591c0f80dffb28868afb2812b67169 util: drop remainder of dateutil/procutil aliases (API) diff --git

Re: [PATCH 5 of 5] scmutil: remove deprecated revpairnodes method

2018-05-11 Thread Yuya Nishihara
On Fri, 11 May 2018 00:57:28 -0400, Augie Fackler wrote: > > On May 11, 2018, at 12:55 AM, Augie Fackler wrote: > > > > # HG changeset patch > > # User Augie Fackler > > # Date 1526014501 14400 > > # Fri May 11 00:55:01 2018 -0400 > > # Node ID

Re: D3517: shelve: reduce scope of config override

2018-05-11 Thread Yuya Nishihara
> > > +shelvectx = _rebaserestoredcommit(ui, repo, opts, tr, > oldtiprev, > > > + basename, pctx, tmpwctx, > > > + shelvectx, branchtorestore, > > > +

[PATCH 3 of 5] help: load module doc of disabled extension in extensions.disabledcmd()

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1525339322 -32400 # Thu May 03 18:22:02 2018 +0900 # Node ID dd2a166e87eae4c5029a1d0c1194a6076c544a37 # Parent ad36b4eb9903d325bc157831a482c8e30fe6e819 help: load module doc of disabled extension in extensions.disabledcmd()

[PATCH 2 of 5] extensions: extract closure that looks for commands from disabled module

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1525338943 -32400 # Thu May 03 18:15:43 2018 +0900 # Node ID ad36b4eb9903d325bc157831a482c8e30fe6e819 # Parent 7eca762c4cb88d42c9239c60fee743327f477c1a extensions: extract closure that looks for commands from disabled module

[PATCH 4 of 5] extensions: peek command table of disabled extensions without importing

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1525340282 -32400 # Thu May 03 18:38:02 2018 +0900 # Node ID a7e3d6f705355cc993619faee28b3dac09bf1ab4 # Parent dd2a166e87eae4c5029a1d0c1194a6076c544a37 extensions: peek command table of disabled extensions without importing

[PATCH 5 of 5] extensions: remove strip_init=True from _disabledpaths()

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1525340398 -32400 # Thu May 03 18:39:58 2018 +0900 # Node ID 4810c6c8635cbc20137b14ddd440d8f514376b7b # Parent a7e3d6f705355cc993619faee28b3dac09bf1ab4 extensions: remove strip_init=True from _disabledpaths() It's no longer

[PATCH 1 of 5] extensions: drop dead code trying to exclude deprecated disabled commands

2018-05-11 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1525338823 -32400 # Thu May 03 18:13:43 2018 +0900 # Node ID 7eca762c4cb88d42c9239c60fee743327f477c1a # Parent e2effc80f4388b5c9dc7effa3bd895350b5cf4ce extensions: drop dead code trying to exclude deprecated disabled commands

Re: [PATCH] tests: fix deprecation warning in test-url.py

2018-05-11 Thread Yuya Nishihara
On Fri, 11 May 2018 00:55:11 -0400, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1526014221 14400 > # Fri May 11 00:50:21 2018 -0400 > # Node ID aaba341a89374e364598b9fd27262a9003d4feac > # Parent 5f3bad9e4193c9f1a63bfe858602cc8645250669 >

Re: [PATCH 04 of 12] util: drop deprecated forwarding to stringutil

2018-05-11 Thread Yuya Nishihara
On Fri, 11 May 2018 01:11:17 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1526002480 14400 > # Thu May 10 21:34:40 2018 -0400 > # Node ID 86f8c466db666c1d19b5a84bcbdfb0647771b5f5 > # Parent

[Bug 5882] New: 'hg push' fails on read-only filesystem

2018-05-11 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5882 Bug ID: 5882 Summary: 'hg push' fails on read-only filesystem Product: Mercurial Version: unspecified Hardware: PC OS: Other Status: UNCONFIRMED Severity:

Re: [PATCH] filemerge: support specfiying a python function to custom merge-tools

2018-05-11 Thread Tom Hindle
Hi Yuya, Thanks for the review! replying inline... On 05/10/2018 07:53 AM, Yuya Nishihara wrote: On Wed, 09 May 2018 12:33:49 -0600, tom_hin...@sil.org wrote: # HG changeset patch # User hindlemail # Date 1525890682 21600 # Wed May 09 12:31:22 2018 -0600 # Node ID

[PATCH] filemerge: support specfiying a python function to custom merge-tools

2018-05-11 Thread tom_hindle
# HG changeset patch # User hindlemail # Date 1526062578 21600 # Fri May 11 12:16:18 2018 -0600 # Node ID b72357aa21eb1516c4f14446ddd4963558bd2806 # Parent 8b86acc7aa64130f5b6fa69f5fc20ef4d0b09c42 filemerge: support specfiying a python function to custom merge-tools

Re: [PATCH 2 of 2 STABLE] revset: pass in lookup function to matchany() (issue5879)

2018-05-11 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, May 11, 2018 at 4:20 AM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1526037022 -32400 > # Fri May 11 20:10:22 2018 +0900 > # Branch stable > # Node ID edb28a6d95b73079a7dd6f8cf0486a8e5a3d9fac > # Parent

D3533: wireprotov2: define and implement "filehistory" command

2018-05-11 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY There are two parts to file storage: index data and revision data. While the storage interfaces and implementation don't yet have a strong division between

D3532: wireprotov2: define and implement "rawstorefile" command

2018-05-11 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY stream_out - the previous command for sending raw revlog files - was not carried forward to protocol version 2. This commit introduces a minimal viable

D3534: wireprotov2: define and implement "filerevision" command

2018-05-11 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The new wire protocol command introduced in this commit allows obtaining the fulltext revision data for a single file revision. Using this plus the recently

D3535: wireprotov2: define and implement "filerevisionsslice" command

2018-05-11 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This command can be thought of as a batch version of "filerevision." Clients specify a changeset and a pair of paths. For each path within that range, file

mercurial@37864: 12 new changesets (2 on stable)

2018-05-11 Thread Mercurial Commits
12 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/69381a28b456 changeset: 37853:69381a28b456 branch: stable parent: 37842:326b174c6a47 user:Yuya Nishihara date:Fri May 11 20:08:30 2018 +0900 summary: test-hgweb:

D3499: revlog: use node tree (native code) for shortest() calculation

2018-05-11 Thread yuja (Yuya Nishihara)
yuja added a comment. > +static int nt_shortest(indexObject *self, const char *node) > +{ > + int level, off; > + > + if (nt_init(self) == -1) > + return -3; > + if (nt_populate(self) == -1) > + return -3; > + > + for (level = off = 0; level <

D3528: tests: port test-simplekeyvaluefile.py to Python 3

2018-05-11 Thread yuja (Yuya Nishihara)
yuja added a comment. > - scmutil.simplekeyvaluefile(self.vfs, 'kvfile').write(d) + scmutil.simplekeyvaluefile(self.vfs, 'bkvfile').write(d) Fixed as `b'kvfile'` in flight. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3528 To: durin42,

D3517: shelve: reduce scope of merge tool config override

2018-05-11 Thread yuja (Yuya Nishihara)
yuja added a comment. > > > +shelvectx = _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev, > > > + basename, pctx, tmpwctx, > > > + shelvectx, branchtorestore, > > > +

D3502: shortest: move revnum-disambiguation out of revlog

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3ac950cd5978: shortest: move revnum-disambiguation out of revlog (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3499: revlog: use node tree (native code) for shortest() calculation

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0304f22497fa: revlog: use node tree (native code) for shortest() calculation (authored by martinvonz, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D3499?vs=8624=8639#toc

D3501: shortest: remove unnecessary check for revnum in isvalid()

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG76e933e0ccc9: shortest: remove unnecessary check for revnum in isvalid() (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3530: revlog: handle error from node lookup

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 8636. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3530?vs=8635=8636 REVISION DETAIL https://phab.mercurial-scm.org/D3530 AFFECTED FILES mercurial/cext/revlog.c CHANGE DETAILS diff --git

D3531: shortest: avoid magic number "41"

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As suggested by Yuya. Feel free to fold into https://phab.mercurial-scm.org/D3502. REPOSITORY rHG Mercurial REVISION DETAIL

D3499: revlog: use node tree (native code) for shortest() calculation

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D3499#55925, @yuja wrote: > > +static int nt_shortest(indexObject *self, const char *node) > > +{ > > +int level, off; > > + > > +if (nt_init(self) == -1) > > +return -3; > > +

D3502: shortest: move revnum-disambiguation out of revlog

2018-05-11 Thread yuja (Yuya Nishihara)
yuja added a comment. > +def disambiguate(prefix): > +"""Disambiguate against revnums.""" > +hexnode = hex(node) > +for length in range(len(prefix), 41): Nit: `range(len(prefix), len(hexnode) + 1)` seems slightly better than using a magic number

D3530: revlog: handle error from node lookup

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I missed this in https://phab.mercurial-scm.org/D3499. Thanks to Yuya for spotting it. REPOSITORY rHG Mercurial REVISION DETAIL

D3517: shelve: reduce scope of merge tool config override

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG7932be8b0559: shelve: reduce scope of merge tool config override (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3500: shortest: make pure code also disambigute against revnums at end

2018-05-11 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG0db7fe7c34d3: shortest: make pure code also disambigute against revnums at end (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

Re: [PATCH 1 of 3] test-ssh: add some flush() to make output deterministic

2018-05-11 Thread Gregory Szorc
On Mon, May 7, 2018 at 6:11 AM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1521963557 -32400 > # Sun Mar 25 16:39:17 2018 +0900 > # Node ID 2be95f3cc4f8a4b59f7c50af093ea033d1d09c5e > # Parent

[Bug 5883] New: Rebase on Windows loses the executable bit

2018-05-11 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5883 Bug ID: 5883 Summary: Rebase on Windows loses the executable bit Product: Mercurial Version: 4.5.3 Hardware: PC OS: Windows Status: UNCONFIRMED Severity:

mercurial@37954: 90 new changesets

2018-05-11 Thread Mercurial Commits
90 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/da083d9fafab changeset: 37865:da083d9fafab user:Martin von Zweigbergk date:Sat May 05 00:16:43 2018 -0700 summary: shortest: don't keep checking for longer prefix if node

mercurial@37971: 17 new changesets

2018-05-11 Thread Mercurial Commits
17 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d088810c496e changeset: 37955:d088810c496e user:Augie Fackler date:Fri May 11 00:50:21 2018 -0400 summary: tests: fix deprecation warning in test-url.py