[Bug 5937] New: Support using an external tool like kdiff3 to do a three-way diff of three commits.

https://bz.mercurial-scm.org/show_bug.cgi?id=5937 Bug ID: 5937 Summary: Support using an external tool like kdiff3 to do a three-way diff of three commits. Product: Mercurial Version: unspecified Hardware: PC

Re: [PATCH 3 of 3] test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg

On Fri, 06 Jul 2018 11:51:07 -0400, Yuya Nishihara wrote: On Thu, 05 Jul 2018 22:11:35 -0400, Matt Harbison wrote: # HG changeset patch # User Matt Harbison # Date 1530817649 14400 # Thu Jul 05 15:07:29 2018 -0400 # Node ID 7ba60a5ffc69e2fc713f0510a7b53e36b3dbdc10 # Parent

D3885: histedit: improve help text for --no-backup option

khanchi97 added inline comments. INLINE COMMENTS > martinvonz wrote in histedit.py:928 > To me, the "of files" makes it sounds like it's about .orig files, but I > don't think that's what it actually is. Can we make it clearer? How about "do not save backup copies of performed actions"?

D3826: grep: change default behaviour of grep

yuja added a comment. > +if not opts.get('rev'): > +opts.get('rev').append("wdir()") > +opts['allfiles'] = True So, this breaks `hg grep --diff|--all`? And this is a behavior change. We should at least document how we can get back the original behavior.

Re: D3826: grep: change default behaviour of grep

> +if not opts.get('rev'): > +opts.get('rev').append("wdir()") > +opts['allfiles'] = True So, this breaks `hg grep --diff|--all`? And this is a behavior change. We should at least document how we can get back the original behavior.

D3893: ui: make the large file warning limit fully configurable

yuja added a comment. The idea looks good. > While add --large can be used to override it selectively, often enough > the user simply doesn't care about machines with less than 100MB RAM or > so, so make it possible to just specify a larger limit in hgrc. I think --large is

D3887: rebase: add --no-backup option

yuja added a comment. > @yuja @pulkit Definitely, adding a config option is better than any other alternative. Can I start to work on this? (I mean adding config option which will work for all history editing commands) Sounds good to me, though I don't have any good name for the

Re: D3887: rebase: add --no-backup option

> @yuja @pulkit Definitely, adding a config option is better than any other > alternative. Can I start to work on this? (I mean adding config option which > will work for all history editing commands) Sounds good to me, though I don't have any good name for the config option. To be clear, I

Re: D3893: ui: make the large file warning limit fully configurable

The idea looks good. > While add --large can be used to override it selectively, often enough > the user simply doesn't care about machines with less than 100MB RAM or > so, so make it possible to just specify a larger limit in hgrc. I think --large is the option to add a file as largefile

D3895: context: raise ProgrammingError on repo['my-tag']

This revision was automatically updated to reflect the committed changes. Closed by commit rHG91618801d5c3: context: raise ProgrammingError on repo[my-tag] (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3894: fix: add test case that shows why --whole with --base is useful

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf068495a1c28: fix: add test case that shows why --whole with --base is useful (authored by hooper, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3895: context: raise ProgrammingError on repo['my-tag']

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We had an internal extension that I had failed to migrate off of the deprecated API and its "'my-tag' in repo" check just started returning False. It took a

D3894: fix: add test case that shows why --whole with --base is useful

hooper 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/D3894 AFFECTED FILES hgext/fix.py tests/test-fix.t CHANGE DETAILS diff --git a/tests/test-fix.t

mercurial@38549: 14 new changesets

14 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/5ffe2041d427 changeset: 38536:5ffe2041d427 user:Danny Hooper date:Tue Jun 26 15:30:49 2018 -0700 summary: fix: use a worker pool to parallelize running tools

D3885: histedit: improve help text for --no-backup option

martinvonz added inline comments. INLINE COMMENTS > histedit.py:928 > ('o', 'outgoing', False, _('changesets not found in destination')), > - ('', 'no-backup', False, _('no backup')), > + ('', 'no-backup', False, _('do not save backup copies of files')), > ('f', 'force',

Re: [PATCH 7 of 7] diffutil: move the module out of utils package

On Fri, Jul 6, 2018 at 6:04 AM Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1530881365 -32400 > # Fri Jul 06 21:49:25 2018 +0900 > # Node ID 0f88a9a4a691f90636c55b04fd7e0b842cce8d86 > # Parent c83051a12b0c5d269f00813b89ae9fa1cfd7cce8 > diffutil: move the

D3893: ui: make the large file warning limit fully configurable

joerg.sonnenberger created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY While add --large can be used to override it selectively, often enough the user simply doesn't care about machines with less than 100MB RAM or so, so

Re: [PATCH 3 of 3] test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg

On Thu, 05 Jul 2018 22:11:35 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1530817649 14400 > # Thu Jul 05 15:07:29 2018 -0400 > # Node ID 7ba60a5ffc69e2fc713f0510a7b53e36b3dbdc10 > # Parent 7871e05503668294a5cf35697fe51db0045d8086 > test-convert:

Re: [PATCH 5 of 7] match: resolve 'set:' patterns first in _buildmatch()

On Fri, Jul 6, 2018 at 5:20 AM Yuya Nishihara wrote: > On Thu, 5 Jul 2018 11:42:05 -0700, Martin von Zweigbergk wrote: > > On Thu, Jul 5, 2018 at 7:15 AM Yuya Nishihara wrote: > > > > > # HG changeset patch > > > # User Yuya Nishihara > > > # Date 1528613547 -32400 > > > # Sun Jun 10

D3886: strip: improve help text for --no-backup option

This revision was automatically updated to reflect the committed changes. Closed by commit rHGf442c9494ec7: strip: improve help text for --no-backup option (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

[PATCH 7 of 7] diffutil: move the module out of utils package

# HG changeset patch # User Yuya Nishihara # Date 1530881365 -32400 # Fri Jul 06 21:49:25 2018 +0900 # Node ID 0f88a9a4a691f90636c55b04fd7e0b842cce8d86 # Parent c83051a12b0c5d269f00813b89ae9fa1cfd7cce8 diffutil: move the module out of utils package mercurial.utils modules inherit the

[PATCH 6 of 7] diffutil: remove diffopts() in favor of diffallopts()

# HG changeset patch # User Yuya Nishihara # Date 1530880896 -32400 # Fri Jul 06 21:41:36 2018 +0900 # Node ID c83051a12b0c5d269f00813b89ae9fa1cfd7cce8 # Parent 4ee2c39c085c9175efead3a9197b533dfe890bcb diffutil: remove diffopts() in favor of diffallopts() patch.diffopts() exists only for

[PATCH 4 of 7] hgweb: pass ui to diffstatgen() explicitly

# HG changeset patch # User Yuya Nishihara # Date 1530880547 -32400 # Fri Jul 06 21:35:47 2018 +0900 # Node ID 71f6aea244c46ba63b404ffe2d9c651da7d7e6a1 # Parent 75f22f0f24a95921b0e4d8fce53a990f144a0b7b hgweb: pass ui to diffstatgen() explicitly diff --git a/mercurial/hgweb/webutil.py

[PATCH 5 of 7] obsutil: use public interface to access to repo.ui

# HG changeset patch # User Yuya Nishihara # Date 1530880713 -32400 # Fri Jul 06 21:38:33 2018 +0900 # Node ID 4ee2c39c085c9175efead3a9197b533dfe890bcb # Parent 71f6aea244c46ba63b404ffe2d9c651da7d7e6a1 obsutil: use public interface to access to repo.ui diff --git a/mercurial/obsutil.py

[PATCH 1 of 7] context: remove unneeded alias of diffopts

# HG changeset patch # User Yuya Nishihara # Date 1530880082 -32400 # Fri Jul 06 21:28:02 2018 +0900 # Node ID 36567c3231fe2a7c26a01f7981e6795514bc5aaa # Parent 050fbd9d103ad4f4b2085e721e4d175791fc8b4c context: remove unneeded alias of diffopts diff --git a/mercurial/context.py

[PATCH 2 of 7] templatekw: obtain ui directly from the template context

# HG changeset patch # User Yuya Nishihara # Date 1530880145 -32400 # Fri Jul 06 21:29:05 2018 +0900 # Node ID 51201504373d536eafaab28693a3ca588318eb7c # Parent 36567c3231fe2a7c26a01f7981e6795514bc5aaa templatekw: obtain ui directly from the template context diff --git

Re: [PATCH 5 of 7] match: resolve 'set:' patterns first in _buildmatch()

On Thu, 5 Jul 2018 11:42:05 -0700, Martin von Zweigbergk wrote: > On Thu, Jul 5, 2018 at 7:15 AM Yuya Nishihara wrote: > > > # HG changeset patch > > # User Yuya Nishihara > > # Date 1528613547 -32400 > > # Sun Jun 10 15:52:27 2018 +0900 > > # Node ID

Re: [PATCH 1 of 9 V2] diffutil: extract diff options code into a dedicated util-module

On Fri, 06 Jul 2018 00:25:59 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1530195073 -7200 > # Thu Jun 28 16:11:13 2018 +0200 > # Node ID a8ab7fcf8de8c3ad51787ea345a7c194d4c94421 > # Parent 600d8d9b8551088ee78e8005646d2dedd7a8d0c2 > # EXP-Topic diff-cleanup >

Re: [PATCH 1 of 3] test-bzr: use a fixed commit time

On Thu, 05 Jul 2018 22:11:33 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1530817649 14400 > # Thu Jul 05 15:07:29 2018 -0400 > # Node ID 3ec161a15ecfe089dacecee2a192162fe6e741d4 > # Parent 600d8d9b8551088ee78e8005646d2dedd7a8d0c2 > test-bzr: use a