Re: [PATCH 1 of 2] extdiff: support tools that can be run simultaneously

2019-02-02 Thread Ludovic Chabant
One thing I'm not quite sure about this change is how to handle the new "gui" config flag. I wanted to use (abuse?) the difference between False and None in order to figure out if we found the flag in a section or not (and fall back to another section if not). However, passing None as the

[PATCH 1 of 2] extdiff: support tools that can be run simultaneously

2019-02-02 Thread Ludovic Chabant
# HG changeset patch # User Ludovic Chabant # Date 1549173529 28800 # Sat Feb 02 21:58:49 2019 -0800 # Node ID b08ea934c2d5ac097b171ca74e826e4f9dea86a9 # Parent 3a3b053d0882a33ba7ea667052e445b193ffa4df extdiff: support tools that can be run simultaneously diff --git a/hgext/extdiff.py

[PATCH 2 of 2] extdiff: don't run gui programs when in a cli-only environment

2019-02-02 Thread Ludovic Chabant
# HG changeset patch # User Ludovic Chabant # Date 1549173509 28800 # Sat Feb 02 21:58:29 2019 -0800 # Node ID 75d87a5ac4d0d26e02d21df87d2a89ac59c6d535 # Parent b08ea934c2d5ac097b171ca74e826e4f9dea86a9 extdiff: don't run gui programs when in a cli-only environment diff --git

D5803: revert: added prompt before undeleting a file in -i(issue6008)

2019-02-02 Thread taapas1128 (Taapas Agrawal)
taapas1128 added a comment. @yuja thanks for the review . I have updated the revision please tell if anything else needs to be done. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5803 To: taapas1128, #hg-reviewers Cc: yuja, mercurial-devel

D5803: revert: added prompt before undeleting a file in -i(issue6008)

2019-02-02 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 13711. taapas1128 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5803?vs=13703=13711 REVISION DETAIL https://phab.mercurial-scm.org/D5803 AFFECTED FILES

Re: [PATCH] tests: drop some unnecessary globs for Windows

2019-02-02 Thread Yuya Nishihara
On Sat, 2 Feb 2019 21:06:54 -0500, Matt Harbison wrote: > > > On Feb 2, 2019, at 8:28 PM, Yuya Nishihara wrote: > > > >> On Fri, 01 Feb 2019 22:49:59 -0500, Matt Harbison wrote: > >> # HG changeset patch > >> # User Matt Harbison > >> # Date 1549077873 18000 > >> # Fri Feb 01 22:24:33

D5807: py3: add alternate output on Python 3

2019-02-02 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG9955776e2adf: py3: add alternate output on Python 3 (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5807?vs=13707=13710

D5804: zeroconf: Python 3 porting of vendored library

2019-02-02 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG1c85b790ddb0: zeroconf: Python 3 porting of vendored library (authored by indygreg, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D5804?vs=13704=13708#toc REPOSITORY rHG

D5806: py3: add Python 3 output for test-flagprocessor.t

2019-02-02 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGa4392b5c69ce: py3: add Python 3 output for test-flagprocessor.t (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5803: revert: added prompt before undeleting a file in -i(issue6008)

2019-02-02 Thread yuja (Yuya Nishihara)
yuja added a comment. > +if interactive: > +choice = repo.ui.promptchoice( > +_("Undelete file %s (Yn)?$$ $$ ") % f) Nit: "undelete" (no capital letter) per Mercurial's convention. And I don't think "undelete" is good for user-facing

Re: D5803: revert: added prompt before undeleting a file in -i(issue6008)

2019-02-02 Thread Yuya Nishihara
> +if interactive: > +choice = repo.ui.promptchoice( > +_("Undelete file %s (Yn)?$$ $$ ") % f) Nit: "undelete" (no capital letter) per Mercurial's convention. And I don't think "undelete" is good for user-facing messages. Perhaps, it can be phrased as "add

D5805: zeroconf: port to Python 3

2019-02-02 Thread yuja (Yuya Nishihara)
yuja added a comment. > 1. advertise to browsers svc = Zeroconf.ServiceInfo('_http._tcp.local.', > - name + '._http._tcp.local.', + pycompat.bytestr(name + r'._http._tcp.local.'), server = host, port = port, > - properties = {'description': desc, > -

Re: D5805: zeroconf: port to Python 3

2019-02-02 Thread Yuya Nishihara
> # advertise to browsers > svc = Zeroconf.ServiceInfo('_http._tcp.local.', > - name + '._http._tcp.local.', > + pycompat.bytestr(name + > r'._http._tcp.local.'), > server = host, >

D5800: config: introduce a new value for ui.relative-paths getting old behavior

2019-02-02 Thread yuja (Yuya Nishihara)
yuja added a comment. Looks good, but I find it isn't easy to parse the meaning of `getuipathfn(repo, forcevalue=True)`. Perhaps it can be spelled as `forcerelative=True`. > +def getuipathfn(repo, legacyvalue=False, forcevalue=None): > +if forcevalue is not None: > +

Re: D5800: config: introduce a new value for ui.relative-paths getting old behavior

2019-02-02 Thread Yuya Nishihara
Looks good, but I find it isn't easy to parse the meaning of `getuipathfn(repo, forcevalue=True)`. Perhaps it can be spelled as `forcerelative=True`. > +def getuipathfn(repo, legacyvalue=False, forcevalue=None): > +if forcevalue is not None: > +relative = forcevalue > +else: > +

Re: [PATCH] tests: drop some unnecessary globs for Windows

2019-02-02 Thread Matt Harbison
> On Feb 2, 2019, at 8:28 PM, Yuya Nishihara wrote: > >> On Fri, 01 Feb 2019 22:49:59 -0500, Matt Harbison wrote: >> # HG changeset patch >> # User Matt Harbison >> # Date 1549077873 18000 >> # Fri Feb 01 22:24:33 2019 -0500 >> # Node ID 2cdacfe6002918eddc7fb75d47e42f1b26214703 >> #

Re: [PATCH 07 of 11] py3: byteify the decoded JSON responses upon receipt in the LFS blobstore

2019-02-02 Thread Yuya Nishihara
On Sat, 02 Feb 2019 13:18:37 -0500, Matt Harbison wrote: > On Mon, 28 Jan 2019 06:59:44 -0500, Yuya Nishihara wrote: > > > On Mon, 28 Jan 2019 00:20:53 -0500, Matt Harbison wrote: > >> # HG changeset patch > >> # User Matt Harbison > >> # Date 1548629295 18000 > >> # Sun Jan 27 17:48:15

Re: [PATCH 03 of 11] py3: raw stringify various things in the LFS server module

2019-02-02 Thread Yuya Nishihara
On Sat, 02 Feb 2019 13:23:18 -0500, Matt Harbison wrote: > On Mon, 28 Jan 2019 06:58:40 -0500, Yuya Nishihara wrote: > > On Mon, 28 Jan 2019 00:20:49 -0500, Matt Harbison wrote: > >> # HG changeset patch > >> # User Matt Harbison > >> # Date 1548568239 18000 > >> # Sun Jan 27 00:50:39 2019

Re: [PATCH V3] extdiff: add --per-file and --confirm options

2019-02-02 Thread Yuya Nishihara
On Fri, 01 Feb 2019 22:58:54 -0800, Ludovic Chabant wrote: > > My idea is basically as follows: > > > > if cmd and opts found in extdiff: > > # it must be a user-defined tool > > look for extdiff.gui. > > elif cmd.diffargs found in diff-tools: > > # perhaps it's a stock tool

Re: [PATCH] tests: drop some unnecessary globs for Windows

2019-02-02 Thread Yuya Nishihara
On Fri, 01 Feb 2019 22:49:59 -0500, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1549077873 18000 > # Fri Feb 01 22:24:33 2019 -0500 > # Node ID 2cdacfe6002918eddc7fb75d47e42f1b26214703 > # Parent 1bf9a0827395c593144ffd1fd4cd0713bf0b62e6 > tests: drop some

D5807: py3: add alternate output on Python 3

2019-02-02 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is basically the same deal as https://phab.mercurial-scm.org/D5806. Python 3's exception printing output is different. We had to tweak the

D5806: py3: add Python 3 output for test-flagprocessor.t

2019-02-02 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The exception is being generated from ui.traceback(), which simply calls traceback.format_*() to format exceptions. Since the output from the

D5804: zeroconf: Python 3 porting of vendored library

2019-02-02 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY A quick glance through this module reveals that most of it "just works" on Python 3 with the source transformer active. There are a few places where we need to

D5805: zeroconf: port to Python 3

2019-02-02 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 using the source transformer on Python 3, calls into Zeroconf and return values from it are generally bytes. But various socket functions

D5803: revert: added prompt before undeleting a file in -i(issue6008)

2019-02-02 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 13703. taapas1128 retitled this revision from "revert: added prompt before undeleting a file(issue6008)" to "revert: added prompt before undeleting a file in -i(issue6008)". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D5803: revert: added prompt before undeleting a file(issue6008)

2019-02-02 Thread taapas1128 (Taapas Agrawal)
taapas1128 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/D5803 AFFECTED FILES mercurial/cmdutil.py tests/test-revert-interactive.t CHANGE DETAILS diff

Re: [PATCH 04 of 11] py3: byteify the LFS blobstore module

2019-02-02 Thread Matt Harbison
On Mon, 28 Jan 2019 06:41:01 -0500, Yuya Nishihara wrote: On Mon, 28 Jan 2019 00:20:50 -0500, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1548620368 18000 # Sun Jan 27 15:19:28 2019 -0500 # Node ID d639ccd9f7139991165d04b4601b06c3341a79cd # Parent

Re: [PATCH 03 of 11] py3: raw stringify various things in the LFS server module

2019-02-02 Thread Matt Harbison
On Mon, 28 Jan 2019 06:58:40 -0500, Yuya Nishihara wrote: On Mon, 28 Jan 2019 00:20:49 -0500, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1548568239 18000 # Sun Jan 27 00:50:39 2019 -0500 # Node ID 9a35d8754bdfaac20d1931dbd6a82233d11f4722 # Parent

Re: [PATCH 07 of 11] py3: byteify the decoded JSON responses upon receipt in the LFS blobstore

2019-02-02 Thread Matt Harbison
On Mon, 28 Jan 2019 06:59:44 -0500, Yuya Nishihara wrote: On Mon, 28 Jan 2019 00:20:53 -0500, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1548629295 18000 # Sun Jan 27 17:48:15 2019 -0500 # Node ID b98988169d4a9c7890b93091683fa4ec38d61a47 # Parent

D5792: uncommit: added interactive mode(issue6062)

2019-02-02 Thread taapas1128 (Taapas Agrawal)
taapas1128 added a comment. @pulkit I have made an attempt to import the code please review. @lothiraldan can you please review and help me if I have missed out any portion of interactive from `evolve` REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5792 To:

D5792: uncommit: added interactive mode(issue6062)

2019-02-02 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 13701. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5792?vs=13669=13701 REVISION DETAIL https://phab.mercurial-scm.org/D5792 AFFECTED FILES hgext/uncommit.py tests/test-uncommit.t CHANGE DETAILS diff

Re: [PATCH] relnotes: more improvements

2019-02-02 Thread Pulkit Goyal
On Sat, Feb 2, 2019 at 8:07 AM Anton Shestakov wrote: > # HG changeset patch > # User Anton Shestakov > # Date 1548138145 -28800 > # Tue Jan 22 14:22:25 2019 +0800 > # Branch stable > # Node ID b66fff9e37c56d874f8aabcac4153e9b5a3e4148 > # Parent 8b2892d5a9f2c06c998c977015a9ad3e3a3c9b5f >

Re: [PATCH 1 of 2] py3: remove unneeded fsencode() from gitsubrepo

2019-02-02 Thread Pulkit Goyal
On Sat, Feb 2, 2019 at 12:12 PM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1549088495 -32400 > # Sat Feb 02 15:21:35 2019 +0900 > # Node ID 921b4ffa9ced910ea79cb839b86a06287710f29c > # Parent 3a3b053d0882a33ba7ea667052e445b193ffa4df > py3: remove