Re: [PATCH 2 of 2] phabricator: add a config knob for `phabsend --amend`

2018-05-17 Thread Matt Harbison
On Thu, 17 May 2018 07:51:31 -0400, Yuya Nishihara wrote: On Wed, 16 May 2018 23:03:59 -0400, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1526525604 14400 # Wed May 16 22:53:24 2018 -0400 # Node ID

[PATCH V2] phabricator: register config settings

2018-05-17 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1526525067 14400 # Wed May 16 22:44:27 2018 -0400 # Node ID a2ed1f916bba51cb5d1fec26a97c9668810c6588 # Parent a4a5c3085ea92402224ea4c61fccff3adbc715ec phabricator: register config settings I didn't bother registering

D3575: narrow: filter set of files to check for case-folding to core

2018-05-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3575 AFFECTED FILES hgext/narrow/narrowmerge.py

D3576: narrow: filter copies in core

2018-05-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3576 AFFECTED FILES hgext/narrow/__init__.py

D3574: narrow: filter merge actions in core

2018-05-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Part of the ongoing effort to move narrow into core. REPOSITORY rHG Mercurial REVISION DETAIL

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

2018-05-17 Thread Matt Harbison
On Sun, 13 May 2018 01:23:36 -0400, Matt Harbison wrote: 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

D3573: hgweb: extract code for emitting multiple changelist records

2018-05-17 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY changelistentry() exists so extensions can easily monkeypatch the function to add additional metadata. In at least one case at Mozilla, we have an extension

Re: [PATCH] test-merge-tools: create repo directory to free $TESTTMP for temporary files

2018-05-17 Thread Pulkit Goyal
On Thu, May 17, 2018 at 6:46 PM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1526561700 -32400 > # Thu May 17 21:55:00 2018 +0900 > # Node ID a4a5c3085ea92402224ea4c61fccff3adbc715ec > # Parent

D3556: run-tests: update the test case name format

2018-05-17 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Getting this test failure at the tip of hg-committed with this series applied, can you have a look? --- /home/foobar/repo/pushaccess/tests/test-run-tests.t +++ /home/foobar/repo/pushaccess/tests/test-run-tests.t.err @@ -1634,9 +1634,24 @@ #endif

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

2018-05-17 Thread Tom Hindle
On 05/17/2018 07:14 AM, Yuya Nishihara wrote: On Wed, 16 May 2018 14:22:13 -0600, tom_hin...@sil.org wrote: # HG changeset patch # User hindlemail Can you suggest a proper "user" name? test-check-commit.t complains that "username is not an email address." oops sorry. My Username should have

D3572: state: don't have a dict like interface for cmdstate class

2018-05-17 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in state.py:59-63 > Is this a direct consequence of removing the dict interface or could it be > split out into a separate patch? I will split it into a separate patch. REPOSITORY rHG Mercurial REVISION DETAIL

D2591: state: import the file to write state files from evolve extension

2018-05-17 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in state.py:79 > Looks like you missed this. (If you didn't and you simply disagree, please > explain why you disagree.) I just simply missed it. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2591

D2591: state: import the file to write state files from evolve extension

2018-05-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > indygreg wrote in state.py:79 > We probably want `canonical=True` here so behavior is deterministic. All that > does in reality is sort dicts and sets. I doubt we have any data structures > large enough for this to be a problem. Looks like

D3572: state: don't have a dict like interface for cmdstate class

2018-05-17 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > state.py:59-63 > +try: > +iv = int(version) > +except ValueError: > +raise error.ProgrammingError("version of state file should be" > + " an integer") Is this a

[Bug 5888] New: Send both patch and hg bundle as multipart/alternative

2018-05-17 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5888 Bug ID: 5888 Summary: Send both patch and hg bundle as multipart/alternative Product: Mercurial Version: 4.6 Hardware: PC OS: Linux Status: UNCONFIRMED

[PATCH] test-merge-tools: create repo directory to free $TESTTMP for temporary files

2018-05-17 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1526561700 -32400 # Thu May 17 21:55:00 2018 +0900 # Node ID a4a5c3085ea92402224ea4c61fccff3adbc715ec # Parent d1134ca5b1a3a3f7d06c5bef4f16fc30f2642ea4 test-merge-tools: create repo directory to free $TESTTMP for temporary

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

2018-05-17 Thread Yuya Nishihara
On Wed, 16 May 2018 14:22:13 -0600, tom_hin...@sil.org wrote: > # HG changeset patch > # User hindlemail Can you suggest a proper "user" name? test-check-commit.t complains that "username is not an email address." > # Date 1526501501 21600 > # Wed May 16 14:11:41 2018 -0600 > # Node ID

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

2018-05-17 Thread yuja (Yuya Nishihara)
yuja added a comment. Queued, thanks. > + $ hg commit -m changefunction > + $ hg --cwd ../b --config notify.show-functions=True pull ../a s/show-functions/showfunc/ REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3553 To: joerg.sonnenberger,

D3569: py3: convert the report to bytes

2018-05-17 Thread pulkit (Pulkit Goyal)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG5046c906b25d: py3: convert the report to bytes (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3569?vs=8719=8723 REVISION

D3571: tests: test-parseindex.t works just fine with chg

2018-05-17 Thread spectral (Kyle Lippincott)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGca890999d317: tests: test-parseindex.t works just fine with chg (authored by spectral, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

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

2018-05-17 Thread joerg.sonnenberger (Joerg Sonnenberger)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGd1134ca5b1a3: notify: add option to include function names in the diff output (authored by joerg.sonnenberger, committed by ). CHANGED PRIOR TO COMMIT

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

2018-05-17 Thread Yuya Nishihara
Queued, thanks. > + $ hg commit -m changefunction > + $ hg --cwd ../b --config notify.show-functions=True pull ../a s/show-functions/showfunc/ ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

D3536: json: reject unicode on py2 as well

2018-05-17 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGf5a1aa8c6987: json: reject unicode on py2 as well (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3536?vs=8717=8722

D3570: tests: update py3 test since json fields are now sorted

2018-05-17 Thread martinvonz (Martin von Zweigbergk)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG1b8238f67bf2: tests: update py3 test since json fields are now sorted (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D2591: state: import the file to write state files from evolve extension

2018-05-17 Thread pulkit (Pulkit Goyal)
pulkit added a comment. @martinvonz @yuja I am trying to get this series reviewed in pieces. This one and it's child https://phab.mercurial-scm.org/D3572 is ready for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2591 To: pulkit, #hg-reviewers,

D3572: state: don't have a dict like interface for cmdstate class

2018-05-17 Thread pulkit (Pulkit Goyal)
pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch changes the cmdstate class to stop having a dict like interface and delete the __nonzero__ function. After this patch, the save fuction takes a dict