D5064: style: run black on a subset of mercurial

2018-11-13 Thread av6 (Anton Shestakov)
av6 added a comment. I look at the changes and see nitpicks at best. On the one hand, black proved better than any linter that we can already write consistent code. On the other, if black were a linter... I'd switch to flake8, which at least is configurable

[PATCH] tests: document a known failing interaction between narrow and lfs

2018-11-13 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1542171263 18000 # Tue Nov 13 23:54:23 2018 -0500 # Node ID 9b3e22e87fc38c5e2ffd66b5ba044be810cdd500 # Parent d2c997b8001ff5fff0ae3d042362f321a707dd55 tests: document a known failing interaction between narrow and lfs This is one of the two

D5243: resolve: fix mark-check when a file was deleted on one side (issue6020)

2018-11-13 Thread spectral (Kyle Lippincott)
spectral planned changes to this revision. spectral added a comment. (not sure when I'll get to the changes, but removing from Needs Review, sorry I delayed so long doing that) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5243 To: spectral, #hg-reviewers Cc:

D5268: shelve: use matcher to restrict prefetch to just the modified files

2018-11-13 Thread spectral (Kyle Lippincott)
spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Shelve currently operates by: - make a temp commit - identify all the bases necessary to shelve, put them in the bundle - use exportfile to export the

D5064: style: run black on a subset of mercurial

2018-11-13 Thread indygreg (Gregory Szorc)
indygreg added a comment. Where do we stand on the intent to mass reformat the code base? I'm not super thrilled at some of black's decisions (like using double quotes for all strings and merging imports into the same line which leads to excessive code churn later). But the exact style

mercurial@40614: 5 new changesets

2018-11-13 Thread Mercurial Commits
5 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/13d4ad8d7801 changeset: 40610:13d4ad8d7801 user:Pulkit Goyal date:Tue Nov 13 17:41:26 2018 +0300 summary: py3: fix keyword arguments handling in hgext/remotefilelog/

D5170: branchmap: pass changelog into revbranchcache.branchinfo()

2018-11-13 Thread indygreg (Gregory Szorc)
indygreg added a comment. I think this patch can be abandoned because of other work late in the 4.8 cycle? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5170 To: pulkit, #hg-reviewers Cc: indygreg, yuja, mercurial-devel

Re: [PATCH] templater: check invalid use of list expression properly (issue5920)

2018-11-13 Thread Augie Fackler
queued, thanks > On Nov 13, 2018, at 8:39 AM, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1542114930 -32400 > # Tue Nov 13 22:15:30 2018 +0900 > # Node ID 5c7dff08eea9b3f05995380e612546c9bc7a17ad > # Parent 526ee887c4d512e4d2812edaef30908eba3fafc4 >

Re: [PATCH stable v2] tests: fix wireproto redirection test on systems without tls1.2

2018-11-13 Thread Gregory Szorc
On Tue, Nov 13, 2018 at 4:51 PM Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1542156468 18000 > # Tue Nov 13 19:47:48 2018 -0500 > # Branch stable > # Node ID 5c9d315298fc3c2576a0beeffd994e7f3a8187ed > # Parent 7e2c58b08e74514541101f5049eea8a1ff4ba4a7 >

[PATCH stable v2] tests: fix wireproto redirection test on systems without tls1.2

2018-11-13 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1542156468 18000 # Tue Nov 13 19:47:48 2018 -0500 # Branch stable # Node ID 5c9d315298fc3c2576a0beeffd994e7f3a8187ed # Parent 7e2c58b08e74514541101f5049eea8a1ff4ba4a7 tests: fix wireproto redirection test on systems without tls1.2 Our

Re: [PATCH stable] tests: fix wireproto redirection test on systems without tls1.2

2018-11-13 Thread Augie Fackler
> On Nov 13, 2018, at 15:43, Augie Fackler wrote: > > # HG changeset patch > # User Augie Fackler > # Date 1542141748 18000 > # Tue Nov 13 15:42:28 2018 -0500 > # Branch stable > # Node ID 53b7b24c957b0ecbfb8c20dab0c820b07b12ddd0 > # Parent 7e2c58b08e74514541101f5049eea8a1ff4ba4a7 >

mercurial@40609: 63 new changesets

2018-11-13 Thread Mercurial Commits
63 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/840cd57cde32 changeset: 40547:840cd57cde32 parent: 40543:7bffbbe03e90 user:Yuya Nishihara date:Sat Nov 03 19:42:50 2018 +0900 summary: ui: add config knob to redirect status messages to stderr

Re: [PATCH] tests: fix wireproto redirection test on systems without tls1.2

2018-11-13 Thread Augie Fackler
ignore this version - forgot to flag for stable > On Nov 13, 2018, at 15:43, Augie Fackler wrote: > > # HG changeset patch > # User Augie Fackler > # Date 1542141748 18000 > # Tue Nov 13 15:42:28 2018 -0500 > # Branch stable > # Node ID 53b7b24c957b0ecbfb8c20dab0c820b07b12ddd0 > # Parent

[Bug 6022] New: histedit curses ui has prefixes in changeset data

2018-11-13 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6022 Bug ID: 6022 Summary: histedit curses ui has prefixes in changeset data Product: Mercurial Version: 4.8 Hardware: All OS: Linux Status: UNCONFIRMED

[PATCH stable] tests: fix wireproto redirection test on systems without tls1.2

2018-11-13 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1542141748 18000 # Tue Nov 13 15:42:28 2018 -0500 # Branch stable # Node ID 53b7b24c957b0ecbfb8c20dab0c820b07b12ddd0 # Parent 7e2c58b08e74514541101f5049eea8a1ff4ba4a7 tests: fix wireproto redirection test on systems without tls1.2 Our

[PATCH] tests: fix wireproto redirection test on systems without tls1.2

2018-11-13 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1542141748 18000 # Tue Nov 13 15:42:28 2018 -0500 # Branch stable # Node ID 53b7b24c957b0ecbfb8c20dab0c820b07b12ddd0 # Parent 7e2c58b08e74514541101f5049eea8a1ff4ba4a7 tests: fix wireproto redirection test on systems without tls1.2 Our

D5267: revlog: automatically read from opened file handles

2018-11-13 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The revlog reading code commonly opens a new file handle for reading on demand. There is support for passing a file handle to revlog.revision(). But it is

D5265: revlog: use single file handle when de-inlining revlog

2018-11-13 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY _getsegmentforrevs() will eventually call into _datareadfp() to resolve a file handle to read revision data. If no file handle is passed into

D5266: revlog: detect incomplete revlog reads

2018-11-13 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY _readsegment() is supposed to return N bytes of revlog revision data starting at a file offset. Surprisingly, its behavior before this patch never verified

D5263: py3: add b suffix to make sure file is opened in bytes mode

2018-11-13 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGaa588bf40a08: py3: add b suffix to make sure file is opened in bytes mode (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5262: py3: don't use dict.iterkeys()

2018-11-13 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9769e0f6ffe0: py3: dont use dict.iterkeys() (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5262?vs=12519=12525 REVISION

D5259: py3: fix keyword arguments handling in hgext/remotefilelog/

2018-11-13 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG13d4ad8d7801: py3: fix keyword arguments handling in hgext/remotefilelog/ (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5261: py3: use node.hex(h.digest()) instead of h.hexdigest()

2018-11-13 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG3fa4183e7803: py3: use node.hex(h.digest()) instead of h.hexdigest() (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5260: py3: make second argument of fdopen() a str

2018-11-13 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5e3b3f88c2e4: py3: make second argument of fdopen() a str (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5260?vs=12517=12523

D5263: py3: add b suffix to make sure file is opened in bytes mode

2018-11-13 Thread indygreg (Gregory Szorc)
indygreg added a comment. Ideally we'd be using the vfs layer for I/O. But that is scope bloat and I'm not going to make you rewrite RFL to do things more correctly. INLINE COMMENTS > fileserverclient.py:485 > if fetches: > -msg = ("%s files fetched over %d fetches - "

D5262: py3: don't use dict.iterkeys()

2018-11-13 Thread indygreg (Gregory Szorc)
indygreg added inline comments. INLINE COMMENTS > repack.py:510 > ancestors = {} > -nodes = list(node for node in entries.iterkeys()) > +nodes = list(node for node in entries) > nohistory = [] This can be reduced to `list(entries)`. >

Using internal phase for history rewriting

2018-11-13 Thread Gregory Szorc
At the 4.8 sprint, we decided that we wanted to use "internal" phases for hiding rewritten changesets. From the notes: * We will use internal phase to hide rewritten changesets * hg pull / hg unbundle receiving an internal phase changeset will bump the phase and unhide the changeset * We will

D5264: store: raise ProgrammingError if unable to decode a storage path

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Right now, the function magically return False which is dangerous, so let's raise ProgrammingError. Suggested by Augie in

Re: [PATCH 12 of 14] sparse-revlog: introduce native (C) implementation of slicechunktodensity

2018-11-13 Thread Boris FELD
On 12/11/2018 15:50, Yuya Nishihara wrote: > On Mon, 12 Nov 2018 10:55:47 +0100, Boris Feld wrote: >> # HG changeset patch >> # User Boris Feld >> # Date 1541785632 -3600 >> # Fri Nov 09 18:47:12 2018 +0100 >> # Node ID 4a1104eade1dfb1697517d60d2c5fd7a98b8c7f0 >> # Parent

D5263: py3: add b suffix to make sure file is opened in bytes mode

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit 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/D5263 AFFECTED FILES hgext/remotefilelog/basepack.py hgext/remotefilelog/basestore.py

D5262: py3: don't use dict.iterkeys()

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY dict.iterkeys() is not present on Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5262 AFFECTED FILES

D5261: py3: use node.hex(h.digest()) instead of h.hexdigest()

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY hashlib.sha1.hexdigest() returns str on Python 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5261 AFFECTED FILES

D5259: py3: fix keyword arguments handling in hgext/remotefilelog/

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Keys of kwargs on Python 3 should be strings. This patch fixes them by appending r'' prefixes, and using pycompat.byteskwargs() and pycompat.strkwargs().

D5260: py3: make second argument of fdopen() a str

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 1. skip-blame as just r'' prefixes REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5260 AFFECTED FILES

D5039: py3: add __pycache__ to .hgignore

2018-11-13 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGee9981bc8b44: py3: add __pycache__ to .hgignore (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5039?vs=12514=12515 REVISION

D3771: py3: make contrib/perf.py compatible to Python 3

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Not applicable anymore. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3771 To: pulkit, #hg-reviewers Cc: yuja, mercurial-devel ___ Mercurial-devel mailing list

D4887: narrow: don't include the manifests while widening a narrow clone

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. Abandoing this one and https://phab.mercurial-scm.org/D4886 as @martinvonz's better fix landed as https://phab.mercurial-scm.org/D4895. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4887 To: pulkit,

D4849: store: introduce a function to get tracked path from a fncache entry

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. This was an incorrect implementation. A better implementation has been pushed as part of https://phab.mercurial-scm.org/D5139. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4849 To: pulkit,

D5173: py3: make debugindexstats output printing compatible

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit abandoned this revision. pulkit added a comment. I remember reading @yuja patches which took care of it. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5173 To: pulkit, #hg-reviewers Cc: yuja, mercurial-devel

[PATCH 4 of 4] logtoprocess: drop support for ui.log() call with invalid msg arguments (BC)

2018-11-13 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1541908558 -32400 # Sun Nov 11 12:55:58 2018 +0900 # Node ID 2f72218f9cfe8799617126ab453876f007d13b28 # Parent 355cce9374b1f3ca2ecee3c29957b37447b565a4 logtoprocess: drop support for ui.log() call with invalid msg arguments (BC) Before, the

[PATCH 3 of 4] py3: byte-stringify inline extension in test-logtoprocess.t

2018-11-13 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1541907338 -32400 # Sun Nov 11 12:35:38 2018 +0900 # Node ID 355cce9374b1f3ca2ecee3c29957b37447b565a4 # Parent f05dc9a1613a2086e8effb1dda5f446d52d5237f py3: byte-stringify inline extension in test-logtoprocess.t diff --git

[PATCH 1 of 4] logtoprocess: leverage procutil.shellenviron() to stringify variables (BC)

2018-11-13 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1541906843 -32400 # Sun Nov 11 12:27:23 2018 +0900 # Node ID acd1e5000af16058913ff547e08a35d4583a6dac # Parent 5c7dff08eea9b3f05995380e612546c9bc7a17ad logtoprocess: leverage procutil.shellenviron() to stringify variables (BC) This should

[PATCH 2 of 4] logtoprocess: rewrite dict building in py3-compatible way

2018-11-13 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1541907194 -32400 # Sun Nov 11 12:33:14 2018 +0900 # Node ID f05dc9a1613a2086e8effb1dda5f446d52d5237f # Parent acd1e5000af16058913ff547e08a35d4583a6dac logtoprocess: rewrite dict building in py3-compatible way diff --git

[PATCH] templater: check invalid use of list expression properly (issue5920)

2018-11-13 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1542114930 -32400 # Tue Nov 13 22:15:30 2018 +0900 # Node ID 5c7dff08eea9b3f05995380e612546c9bc7a17ad # Parent 526ee887c4d512e4d2812edaef30908eba3fafc4 templater: check invalid use of list expression properly (issue5920) The error message

D5039: py3: add __pycache__ to .hgignore

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit updated this revision to Diff 12514. pulkit retitled this revision from "py3: add more py3 specific output to test" to "py3: add __pycache__ to .hgignore". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5039?vs=11973=12514 REVISION DETAIL

Re: [PATCH 11 of 14] sparse-revlog: add a `_trimchunk` function in C

2018-11-13 Thread Yuya Nishihara
On Mon, 12 Nov 2018 10:55:46 +0100, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1541785523 -3600 > # Fri Nov 09 18:45:23 2018 +0100 > # Node ID 0ea42453fa491793d1e145f5093b65e84cb65e97 > # Parent 036a7425b869b5b8e3e7f528ed6d992c48ebb52e > # EXP-Topic sparse-perf >

Re: [PATCH 07 of 14] sparse-revlog: rework the way we enforce chunk size limit

2018-11-13 Thread Yuya Nishihara
On Mon, 12 Nov 2018 10:55:42 +0100, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1541782717 -3600 > # Fri Nov 09 17:58:37 2018 +0100 > # Node ID b77a6b74ef31e1b3706c1c6127a15eede0334f71 > # Parent ddafb271512fc26de60da5dceffc1509bb023d66 > # EXP-Topic sparse-perf >

Re: [PATCH 06 of 14] sparse-revlog: stop using a heap to track selected gap

2018-11-13 Thread Yuya Nishihara
On Mon, 12 Nov 2018 10:55:41 +0100, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1541689636 -3600 > # Thu Nov 08 16:07:16 2018 +0100 > # Node ID ddafb271512fc26de60da5dceffc1509bb023d66 > # Parent 8ebe5520cc4ae87f6fccba20897d292489a651db > # EXP-Topic sparse-perf >

D5146: histedit: import chistedit curses UI from hg-experimental

2018-11-13 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGc36175456350: histedit: import chistedit curses UI from hg-experimental (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5146: histedit: import chistedit curses UI from hg-experimental

2018-11-13 Thread pulkit (Pulkit Goyal)
pulkit accepted this revision. pulkit added a comment. Queueing this, many thanks for importing this in core. Can you add some documentation about the new config option to enable curses interface as followup? Also, how do you feel about histedit using curses interface if

D5258: manifest: perform cheap checks before potentially allocating memory

2018-11-13 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGda4478ca0e32: manifest: perform cheap checks before potentially allocating memory (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5257: manifest: also reject obviously-too-short lines when parsing lines

2018-11-13 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf27f8e9ef1e7: manifest: also reject obviously-too-short lines when parsing lines (authored by durin42, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5235: revlog: replace PyInt_AS_LONG with a more portable helper function

2018-11-13 Thread durin42 (Augie Fackler)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGfa33196088c4: revlog: replace PyInt_AS_LONG with a more portable helper function (authored by durin42, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D5235?vs=12502=12509#toc

D5257: manifest: also reject obviously-too-short lines when parsing lines

2018-11-13 Thread yuja (Yuya Nishihara)
yuja added a comment. > + if ((next - data) < 22) { > + /* We should have at least 22 bytes in a line: > + 1 byte filename > + 1 NUL > + 20 bytes of hash Queued, but I think it should be

Re: D5257: manifest: also reject obviously-too-short lines when parsing lines

2018-11-13 Thread Yuya Nishihara
> + if ((next - data) < 22) { > + /* We should have at least 22 bytes in a line: > +1 byte filename > +1 NUL > +20 bytes of hash Queued, but I think it should be **40** bytes of hexadecimal