mercurial@37977: 6 new changesets

2018-05-12 Thread Mercurial Commits
6 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/59f1e33f74a6 changeset: 37972:59f1e33f74a6 user:Yuya Nishihara date:Fri May 11 21:53:26 2018 +0900 summary: util: drop remainder of dateutil/procutil aliases (API)

D3536: json: reject unicode on py2 as well

2018-05-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In https://phab.mercurial-scm.org/D3536#56022, @indygreg wrote: > `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 Python 3. If you go this

D3536: json: reject unicode on py2 as well

2018-05-12 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 8657. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3536?vs=8652=8657 REVISION DETAIL https://phab.mercurial-scm.org/D3536 AFFECTED FILES mercurial/templatefilters.py CHANGE DETAILS diff --git

D3537: dispatch: minor code refactor

2018-05-12 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGe9c588802529: dispatch: minor code refactor (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3537?vs=8653=8656 REVISION

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

2018-05-12 Thread Matt Harbison
On Sat, 12 May 2018 11:18:18 -0400, Augie Fackler wrote: On May 11, 2018, at 9:31 PM, Matt Harbison wrote: I dabbled with Reviewboard this week, but I like how this can download a series, remember what review a commit is associated with, etc.

[PATCH] dispatch: unify handling of None returned by a command function

2018-05-12 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1526106789 -32400 # Sat May 12 15:33:09 2018 +0900 # Node ID f5d41abf680b6830b21de4aca1c81532eda36d90 # Parent e9c5888025293fc06bc7865e54a11de6b17d12bc dispatch: unify handling of None returned by a command function A command

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

2018-05-12 Thread Augie Fackler
> On May 11, 2018, at 9:31 PM, Matt Harbison wrote: > > BTW, are there any plans to move this into the bundled extensions? Broadly, yes. The big blocker is having a testing story, because right now the “best” options I’ve heard are: 1) use a docker container to spin

Re: [PATCH] dispatch: unify handling of None returned by a command function

2018-05-12 Thread Gregory Szorc
On Sat, May 12, 2018 at 6:09 AM, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1526106789 -32400 > # Sat May 12 15:33:09 2018 +0900 > # Node ID f5d41abf680b6830b21de4aca1c81532eda36d90 > # Parent

Re: [PATCH 2 of 3] sshserver: do setbinary() by caller (API)

2018-05-12 Thread Matt Harbison
On Mon, 07 May 2018 09:11:23 -0400, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1521963324 -32400 # Sun Mar 25 16:35:24 2018 +0900 # Node ID ea801aa5d559e37f68fb9bdda47dec6e58abcb88 # Parent

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

2018-05-12 Thread Matt Harbison
On Sat, 12 May 2018 14:53:38 -0400, Gregory Szorc wrote: On Sat, May 12, 2018 at 8:18 AM, Augie Fackler wrote: > On May 11, 2018, at 9:31 PM, Matt Harbison wrote: > > BTW, are there any plans to move this into the

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

2018-05-12 Thread Augie Fackler
> On May 12, 2018, at 11:46 AM, Matt Harbison wrote: > > On Sat, 12 May 2018 11:18:18 -0400, Augie Fackler wrote: > >> >> >>> On May 11, 2018, at 9:31 PM, Matt Harbison wrote: >>> >>> I dabbled with Reviewboard this week,

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

2018-05-12 Thread Julien Cristau
Hi, On Fri, May 11, 2018 at 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-12 Thread Gregory Szorc
On Sat, May 12, 2018 at 8:18 AM, Augie Fackler wrote: > > > > On May 11, 2018, at 9:31 PM, Matt Harbison > wrote: > > > > BTW, are there any plans to move this into the bundled extensions? > > Broadly, yes. The big blocker is having a testing story,

D3538: bdiff: fix yet more fallout from xdiff long/int64 conversion (issue5885)

2018-05-12 Thread jcristau (Julien Cristau)
jcristau created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY "l" in Py_BuildValue's format string means long, so passing int64_t instead results in fireworks on 32bit architectures. REPOSITORY rHG Mercurial REVISION

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

2018-05-12 Thread Matt Harbison
On Sat, 12 May 2018 17:34:33 -0400, Julien Cristau wrote: Hi, On Fri, May 11, 2018 at 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

D3553: notify: add option to include function names in the diff output

2018-05-12 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is the equivalent of ``hg diff -p``. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3553 AFFECTED FILES

D3532: wireprotov2: define and implement "rawstorefile" command

2018-05-12 Thread joerg.sonnenberger (Joerg Sonnenberger)
joerg.sonnenberger added a comment. Similar to Martin's question, I would like to allow streaming clones without any locks. For that to work, one party needs to know how to truncate additional undesired data. That can be fully done by the client or the client could send a size or revision

D3532: wireprotov2: define and implement "rawstorefile" command

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg added a comment. In order to support streaming clone without any locks *and* for the result of that clone to pass `hg verify` with no warnings about unreferenced revisions (assuming the server was clean to begin with), I believe we would need to scan the changelog for all

D3540: setup: reformat options argument

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This makes things a bit more easier to manage IMO. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3540 AFFECTED FILES setup.py

D3539: contrib: remove fixpax.py

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This was used as part of bdist_mpkg. And we stopped using bdist_mpkg after https://phab.mercurial-scm.org/rHGdb5084d27df5fb19eec75b4b2b57fc3cf499f695.

[Bug 5885] New: xdiff tests fail on 32bit linux

2018-05-12 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5885 Bug ID: 5885 Summary: xdiff tests fail on 32bit linux Product: Mercurial Version: 4.6 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature

D3547: packaging: move contrib/debian to contrib/packaging/

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg 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/D3547 AFFECTED FILES contrib/debian/cacerts.rc contrib/debian/changelog contrib/debian/compat

D3548: packaging: move build-linux-wheels.sh to contrib/packaging/

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg 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/D3548 AFFECTED FILES Makefile contrib/build-linux-wheels.sh

D3546: packaging: move buildrpm to contrib/packaging/

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg 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/D3546 AFFECTED FILES Makefile contrib/buildrpm contrib/packaging/buildrpm

D3551: packaging: make packaging scripts less reliant on pwd

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The scripts currently assume they are executed from the repo root. This feels like an arbitrary restriction. Let's fix that. REPOSITORY rHG Mercurial

D3552: packaging: move most packaging targets to own Makefile

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Since we're putting everything packaging under one roof, let's define the make targets related to packaging there as well. I didn't move the "osx" target

D3543: packaging: move packagelib.sh into contrib/packaging/

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This required some minor path adjustments in scripts referencing this path. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3543

D3545: packaging: move mercurial.spec to contrib/packaging/

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg 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/D3545 AFFECTED FILES contrib/buildrpm contrib/mercurial.spec contrib/packaging/mercurial.spec

D3549: packaging: move linux-wheel-centos5-blacklist to contrib/packaging/

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg 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/D3549 AFFECTED FILES contrib/linux-wheel-centos5-blacklist contrib/packaging/build-linux-wheels.sh

D3542: packaging: move some docker scripts into contrib/packaging/

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This required some minor path adjustments in the scripts. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3542 AFFECTED FILES

D3544: packaging: move builddeb into contrib/packaging/

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg 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/D3544 AFFECTED FILES Makefile contrib/builddeb contrib/packaging/builddeb

D3541: packaging: move most of contrib/docker to contrib/packaging/docker

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY contrib/ is kind of a dumping ground for all kinds of random things. Many of the files in contrib/ are related to packaging. But sorting out how everything

D3550: packaging: move contrib/macosx to contrib/packaging/

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY And update various references throughout the code. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3550 AFFECTED FILES Makefile

D3536: json: reject unicode on py2 as well

2018-05-12 Thread yuja (Yuya Nishihara)
yuja added a comment. > - elif isinstance(obj, str): > - # This branch is unreachable on Python 2, because bytes == str > - # and we'll return in the next-earlier block in the elif > - # ladder. On Python 3, this helps us catch bugs before they > - # hurt someone. +elif

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

2018-05-12 Thread Yuya Nishihara
> -elif isinstance(obj, str): > -# This branch is unreachable on Python 2, because bytes == str > -# and we'll return in the next-earlier block in the elif > -# ladder. On Python 3, this helps us catch bugs before they > -# hurt someone. > +elif

Re: [PATCH 2 of 2] test-http-branchmap: fix stdio mode on Windows

2018-05-12 Thread Matt Harbison
On Sat, 12 May 2018 22:27:15 -0400, Yuya Nishihara wrote: # HG changeset patch # User Yuya Nishihara # Date 1526177393 -32400 # Sun May 13 11:09:53 2018 +0900 # Node ID 74982ab8ca762a3cfe3648740dae27555232476b # Parent

[PATCH 7 of 7] hgweb: wrap {entries}* of tags with mappinggenerator

2018-05-12 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522840708 -32400 # Wed Apr 04 20:18:28 2018 +0900 # Node ID 972fb3ad116dfe162a566e21c014ae951d4dfa27 # Parent a4560b4d1b0ea2d1c81e0ac0baca0e0ce2070557 hgweb: wrap {entries}* of tags with mappinggenerator They were functions

[PATCH 1 of 7] hgweb: wrap {diffstat} with mappedgenerator

2018-05-12 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522768777 -32400 # Wed Apr 04 00:19:37 2018 +0900 # Node ID 19ec816173c015626e2001e14ed3fe2be7a13d8b # Parent 74982ab8ca762a3cfe3648740dae27555232476b hgweb: wrap {diffstat} with mappedgenerator This can't be a

[PATCH 6 of 7] hgweb: wrap {fentries} and {dentries} of manifest with mappinggenerator

2018-05-12 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522840459 -32400 # Wed Apr 04 20:14:19 2018 +0900 # Node ID a4560b4d1b0ea2d1c81e0ac0baca0e0ce2070557 # Parent fbec01b4ef2287ede8255e14ac42ac3e6ef79906 hgweb: wrap {fentries} and {dentries} of manifest with mappinggenerator

[PATCH 4 of 7] hgweb: wrap {lines} of filerevision with mappinggenerator

2018-05-12 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522769049 -32400 # Wed Apr 04 00:24:09 2018 +0900 # Node ID 074088cc1a58201566d9a0c024db122c45149d79 # Parent 94e0c9ba279d1269f9ed8c602a0e20d44dd59321 hgweb: wrap {lines} of filerevision with mappinggenerator No bare

[PATCH 5 of 7] hgweb: wrap {entries}* of changelog with mappinglist

2018-05-12 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522840280 -32400 # Wed Apr 04 20:11:20 2018 +0900 # Node ID fbec01b4ef2287ede8255e14ac42ac3e6ef79906 # Parent 074088cc1a58201566d9a0c024db122c45149d79 hgweb: wrap {entries}* of changelog with mappinglist They were lists of

D3547: packaging: move contrib/debian to contrib/packaging/

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 8674. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3547?vs=8667=8674 REVISION DETAIL https://phab.mercurial-scm.org/D3547 AFFECTED FILES contrib/debian/cacerts.rc contrib/debian/changelog

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

2018-05-12 Thread Yuya Nishihara
On Sat, 12 May 2018 00:36:58 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1526099641 14400 > # Sat May 12 00:34:01 2018 -0400 > # Node ID 6c6d0679de6cca2d740874812d87a649f8d8dde8 > # Parent

[PATCH 3 of 7] hgweb: drop unused argument 'tmpl' from webutil.diffstat()

2018-05-12 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522768912 -32400 # Wed Apr 04 00:21:52 2018 +0900 # Node ID 94e0c9ba279d1269f9ed8c602a0e20d44dd59321 # Parent 672d62e1224e0bd7350a917d45e6a38e82adfc29 hgweb: drop unused argument 'tmpl' from webutil.diffstat() diff --git

[PATCH 2 of 7] hgweb: use template context to render {diffstat}

2018-05-12 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1522768847 -32400 # Wed Apr 04 00:20:47 2018 +0900 # Node ID 672d62e1224e0bd7350a917d45e6a38e82adfc29 # Parent 19ec816173c015626e2001e14ed3fe2be7a13d8b hgweb: use template context to render {diffstat} This is a preferred way

Re: [PATCH 2 of 3] sshserver: do setbinary() by caller (API)

2018-05-12 Thread Yuya Nishihara
On Sat, 12 May 2018 17:49:30 -0400, Matt Harbison wrote: > On Mon, 07 May 2018 09:11:23 -0400, Yuya Nishihara wrote: > > > # HG changeset patch > > # User Yuya Nishihara > > # Date 1521963324 -32400 > > # Sun Mar 25 16:35:24 2018 +0900 > > # Node ID

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

2018-05-12 Thread Yuya Nishihara
On Fri, 11 May 2018 20:35:03 -0700, Gregory Szorc wrote: > 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 1 of 2] test-http-branchmap: fix encoding test to wrap the server stream

2018-05-12 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1526177315 -32400 # Sun May 13 11:08:35 2018 +0900 # Node ID af07d426066dd8326c50a5686d7ecd25072d67b3 # Parent 6f9ac3cb098750529b832ab902ad93c72dc5b8c8 test-http-branchmap: fix encoding test to wrap the server stream Wrapping

[PATCH 2 of 2] test-http-branchmap: fix stdio mode on Windows

2018-05-12 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1526177393 -32400 # Sun May 13 11:09:53 2018 +0900 # Node ID 74982ab8ca762a3cfe3648740dae27555232476b # Parent af07d426066dd8326c50a5686d7ecd25072d67b3 test-http-branchmap: fix stdio mode on Windows diff --git

D3552: packaging: move most packaging targets to own Makefile

2018-05-12 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 8675. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3552?vs=8672=8675 REVISION DETAIL https://phab.mercurial-scm.org/D3552 AFFECTED FILES Makefile contrib/packaging/Makefile CHANGE DETAILS diff --git