Re: [PATCH 2 of 2 V2] extdiff: add --mode option

> I was just speaking about the current implementation (without your patch.) > Maybe I should say .gui flag isn't checked because the current extdiff never > spawns more than one processes at a time. Yeah, and I meant that I don't understand what's the difference between one vs. multiple processe

D5570: hg-docker: fix Python 3.4 compatibility (for CentOS 7)

Mathiasdm added a comment. In https://phab.mercurial-scm.org/D5570#82332, @yuja wrote: > > +if p.returncode: > > +raise Exception('failed to build docker image: %s %s' % (p.stdout, p.stderr)) > > Can you change the exception type? test-check-code.t complains about it.

Re: [PATCH 2 of 2 V2] extdiff: add --mode option

On Sun, 13 Jan 2019 15:31:07 -0800, Ludovic Chabant wrote: > > A separate patch seems fine. To make clear, there's no need to check if the > > tool is console-based or not unless multiple diff processes are spawned > > simultaneously. Currently the .gui flag is tested only by filemerge.py. > > So

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

yuja added a comment. > > `_performrevert()` would be in the same boat, but it was explicitly flagged on > > at https://phab.mercurial-scm.org/rHGf37a69ec3f4717fdb4f00699ca06c225f106696c. This implies that the `diff.ignorews` option would be used > > in practice to exclude whites

Re: D5490: commit: remove ignore whitespace option on --interactive (issue6042)

> > `_performrevert()` would be in the same boat, but it was explicitly > flagged on > > at > https://phab.mercurial-scm.org/rHGf37a69ec3f4717fdb4f00699ca06c225f106696c. > This implies that the `diff.ignorews` option would be used > > in practice to exclude whitespace changes while inter

D5495: revset: add "branch" positional arguments to the merge revset

yuja added a comment. Generally looks good. Can you fix a couple of nits? And if possible, fold the tests from https://phab.mercurial-scm.org/D5577 into this and the next patch. We prefer including relevant test in each commit. > -@predicate('merge()', safe=True) > +@predicate

D5496: revset: add "samebranch" keyword argument to the merge revset

yuja added a comment. > -@predicate('merge(withbranch)', safe=True) > +@predicate('merge(withbranch, samebranch=True)', safe=True) `[, samebranch]` or [, samebranch=False]`. > withbranch = '' > if 'withbranch' in args: > withbranch = getstring(args['withbranch'], >

Re: D5495: revset: add "branch" positional arguments to the merge revset

Generally looks good. Can you fix a couple of nits? And if possible, fold the tests from D5577 into this and the next patch. We prefer including relevant test in each commit. > -@predicate('merge()', safe=True) > +@predicate('merge(withbranch)', safe=True) `merge([withbranch])` as it is an optio

Re: D5496: revset: add "samebranch" keyword argument to the merge revset

> -@predicate('merge(withbranch)', safe=True) > +@predicate('merge(withbranch, samebranch=True)', safe=True) `[, samebranch]` or [, samebranch=False]`. > withbranch = '' > if 'withbranch' in args: > withbranch = getstring(args['withbranch'], > _(

D5577: tests: replaced mockmakedate function in test-amend.t

This revision was automatically updated to reflect the committed changes. Closed by commit rHG8633c716f908: tests: replace mockmakedate function in test-amend.t (authored by taapas1128, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5577?vs

Re: [PATCH] update: fix edge-case with update.atomic-file and read-only files

On Sun, 13 Jan 2019 10:28:33 +0100, Boris FELD wrote: > On 12/01/2019 04:32, Yuya Nishihara wrote: > >> self._tempname = mktempcopy(name, emptyok=('w' in mode), > >> createmode=createmode) > >> + > >> +# If we are gonna write on the tempfile, we

Re: [PATCH V2] update: fix edge-case with update.atomic-file and read-only files

On Sun, 13 Jan 2019 10:38:37 +0100, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1547128621 -3600 > # Thu Jan 10 14:57:01 2019 +0100 > # Node ID d46392ed9a76773561c74c8df2063aaad4c3c952 > # Parent 963462786f6e028563bcedc9008622e0f3b59c86 > # EXP-Topic atomic-update-r

Re: [PATCH 8 of 8] revset: introduce an API that avoids `formatspec` input serialization

On Sun, 13 Jan 2019 18:53:13 +0900, Yuya Nishihara wrote: > So here we have string to parse, b''.join(ret), and replacements, inputs. > If b''.join(ret) contained '$0' instead of 'internal(0)', and if inputs > were dict of {'$0': alias('$0', ..., ('smartset', inputs[0]))}, we can just > feed them t

Re: [PATCH 2 of 2 V2] extdiff: add --mode option

> A separate patch seems fine. To make clear, there's no need to check if the > tool is console-based or not unless multiple diff processes are spawned > simultaneously. Currently the .gui flag is tested only by filemerge.py. So you mean I don't need to modify the previous code path (dir-diff), n

D5497: revset: add tests for the new merge() arguments (withbranch and samebranch)

angel.ezquerra updated this revision to Diff 13206. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5497?vs=13019&id=13206 REVISION DETAIL https://phab.mercurial-scm.org/D5497 AFFECTED FILES tests/test-help.t tests/test-revset.t CHANGE DETAILS diff

D5496: revset: add "samebranch" keyword argument to the merge revset

angel.ezquerra updated this revision to Diff 13205. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5496?vs=13018&id=13205 REVISION DETAIL https://phab.mercurial-scm.org/D5496 AFFECTED FILES mercurial/revset.py CHANGE DETAILS diff --git a/mercurial/r

D5495: revset: add "branch" positional arguments to the merge revset

angel.ezquerra updated this revision to Diff 13204. angel.ezquerra edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5495?vs=13017&id=13204 REVISION DETAIL https://phab.mercurial-scm.org/D5495 AFFECTED FILES mercurial

Re: [PATCH] update: fix edge-case with update.atomic-file and read-only files

On Sun, Jan 13, 2019, 01:26 Boris FELD Thank you for the thorough review > On 11/01/2019 18:24, Martin von Zweigbergk via Mercurial-devel wrote: > > > > On Fri, Jan 11, 2019 at 7:26 AM Boris Feld > wrote: > > + >> + $ find * -printf "%f:%p:%m\n" >> + a1:a1:644 >> + a2:a2:755 >> + b1:b1:644 >>

D5577: tests: replaced mockmakedate function in test-amend.t

taapas1128 added a subscriber: yuja. taapas1128 added a comment. @yuja please review this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5577 To: taapas1128, #hg-reviewers Cc: yuja, mercurial-devel ___ Mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

navaneeth.suresh added a comment. > `_performrevert()` would be in the same boat, but it was explicitly flagged on > at https://phab.mercurial-scm.org/rHGf37a69ec3f4717fdb4f00699ca06c225f106696c. This implies that the `diff.ignorews` option would be used > in practice to exclude whites

D5554: histedit: added rewrite.update-timestamp to fold and mess

taapas1128 added a comment. @yuja thanks for the edits and queuing . REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5554 To: taapas1128, durin42, #hg-reviewers Cc: yuja, pulkit, mercurial-devel ___ Mercurial-devel mail

D5577: tests: replaced mockmakedate function in test-amend.t

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/D5577 AFFECTED FILES tests/test-amend.t CHANGE DETAILS diff --git a/tests/test-amend.t b/tests/test

D5554: histedit: added rewrite.update-timestamp to fold and mess

This revision was automatically updated to reflect the committed changes. Closed by commit rHG6459797090ea: histedit: add rewrite.update-timestamp support to fold and mess (authored by taapas1128, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D5554?vs=13201&id=13202#toc

D5554: histedit: added rewrite.update-timestamp to fold and mess

yuja added a comment. Queued with minor modifications, thanks. > - a/tests/test-histedit-fold.t +++ b/tests/test-histedit-fold.t @@ -15,6 +15,7 @@ > logt = log --template '{rev}:{node|short} {desc|firstline}\n' > [extensions] > histedit= + > mockmakedate = $TESTDIR/mockmakedate.py > EOF

Re: D5554: histedit: added rewrite.update-timestamp to fold and mess

Queued with minor modifications, thanks. > --- a/tests/test-histedit-fold.t > +++ b/tests/test-histedit-fold.t > @@ -15,6 +15,7 @@ >> logt = log --template '{rev}:{node|short} {desc|firstline}\n' >> [extensions] >> histedit= > + > mockmakedate = $TESTDIR/mockmakedate.py >> EOF >

Re: [PATCH 8 of 8] revset: introduce an API that avoids `formatspec` input serialization

On Sun, 13 Jan 2019 08:40:41 +0100, Boris FELD wrote: > On 12/01/2019 06:00, Yuya Nishihara wrote: > > On Fri, 11 Jan 2019 12:29:10 +0100, Boris Feld wrote: > >> # HG changeset patch > >> # User Boris Feld > >> # Date 1546605681 -3600 > >> # Fri Jan 04 13:41:21 2019 +0100 > >> # Node ID 73926

Re: [PATCH 7 of 8] revset: detect integer list on parsing

On Sun, 13 Jan 2019 08:38:47 +0100, Boris FELD wrote: > On 12/01/2019 05:38, Yuya Nishihara wrote: > > On Fri, 11 Jan 2019 12:29:09 +0100, Boris Feld wrote: > >> # HG changeset patch > >> # User Boris Feld > >> # Date 1546575973 -3600 > >> # Fri Jan 04 05:26:13 2019 +0100 > >> # Node ID 4a56f

Re: [PATCH 4 of 8] revset: enforce "%d" to be interpreted as literal revision number (API)

On Sun, 13 Jan 2019 08:37:47 +0100, Boris FELD wrote: > > On 12/01/2019 05:04, Yuya Nishihara wrote: > > On Fri, 11 Jan 2019 12:29:06 +0100, Boris Feld wrote: > >> # HG changeset patch > >> # User Boris Feld > >> # Date 1547130238 -3600 > >> # Thu Jan 10 15:23:58 2019 +0100 > >> # Node ID 38

[PATCH V2] update: fix edge-case with update.atomic-file and read-only files

# HG changeset patch # User Boris Feld # Date 1547128621 -3600 # Thu Jan 10 14:57:01 2019 +0100 # Node ID d46392ed9a76773561c74c8df2063aaad4c3c952 # Parent 963462786f6e028563bcedc9008622e0f3b59c86 # EXP-Topic atomic-update-read-only # Available At https://bitbucket.org/octobus/mercurial-deve

Re: [PATCH] update: fix edge-case with update.atomic-file and read-only files

On 12/01/2019 04:32, Yuya Nishihara wrote: >> self._tempname = mktempcopy(name, emptyok=('w' in mode), >> createmode=createmode) >> + >> +# If we are gonna write on the tempfile, we need to make sure we >> have >> +# the permission to d

Re: [PATCH] update: fix edge-case with update.atomic-file and read-only files

Thank you for the thorough review On 11/01/2019 18:24, Martin von Zweigbergk via Mercurial-devel wrote: > > > On Fri, Jan 11, 2019 at 7:26 AM Boris Feld > wrote: > > # HG changeset patch > # User Boris Feld > > # Date