This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12603

diff: graduate merge diffs from experimental and add to tweakdefaults
Needs RevisionPublic

Authored by durin42 on Wed, May 4, 12:19 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Summary

I've been using this functionality for two years without incident and
it's been outstanding. In my opinion it's time to both remove the
experimental warning label and move this straight into tweakdefaults.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

durin42 created this revision.Wed, May 4, 12:19 PM
martinvonz requested changes to this revision.Wed, May 4, 12:37 PM
martinvonz added a subscriber: martinvonz.

I agree, except that I've seen it crash sometimes. I wrote a little script to find such cases now. Here's an example: hg diff --change 7c2921a6. So we need to fix that first. Sorry I never bothered to report a bug for it.

This revision now requires changes to proceed.Wed, May 4, 12:37 PM
durin42 added a comment.Wed, May 4, 1:10 PM
In D12603#193005, @martinvonz wrote:

I agree, except that I've seen it crash sometimes. I wrote a little script to find such cases now. Here's an example: hg diff --change 7c2921a6. So we need to fix that first. Sorry I never bothered to report a bug for it.

That doesn't crash for me! Even HGRCPATH=/dev/null hg diff --change 7c2921a6 --config diff.merge=1 works...can you try and figure out why you're seeing a crash?

mharbison72 added a subscriber: mharbison72.Wed, May 4, 3:01 PM

Do we still have the problem of not being able to individually disable options enabled by tweakdefaults? I think there was a bug about it that probably got auto-closed.

martinvonz added a comment.Thu, May 5, 12:08 AM
In D12603#193012, @durin42 wrote:
In D12603#193005, @martinvonz wrote:

I agree, except that I've seen it crash sometimes. I wrote a little script to find such cases now. Here's an example: hg diff --change 7c2921a6. So we need to fix that first. Sorry I never bothered to report a bug for it.

That doesn't crash for me! Even HGRCPATH=/dev/null hg diff --change 7c2921a6 --config diff.merge=1 works...can you try and figure out why you're seeing a crash?

It wasn't easy to find, but I've finally isolated it to this:

HGRCPATH= hg diff --change 7c2921a6 --config diff.merge=1 --config experimental.copies.read-from=changeset-only

Revision Contents
Changeset List

PathPackages
Mmercurial/configitems.py (1 line)
Mmercurial/ui.py (2 lines)

Diff 33353

mercurial/configitems.py

b'discovery.sample-size.initial', b'discovery.sample-size.initial',
default=100, default=100,
) )
_registerdiffopts(section=b'diff') _registerdiffopts(section=b'diff')
coreconfigitem( coreconfigitem(
b'diff', b'diff',
b'merge', b'merge',
default=False, default=False,
experimental=True,
) )
coreconfigitem( coreconfigitem(
b'email', b'email',
b'bcc', b'bcc',
default=None, default=None,
) )
coreconfigitem( coreconfigitem(
b'email', b'email',

mercurial/ui.py

status.verbose = True status.verbose = True
# Make `hg resolve` with no action (like `-m`) fail instead of re-merging. # Make `hg resolve` with no action (like `-m`) fail instead of re-merging.
resolve.explicit-re-merge = True resolve.explicit-re-merge = True
[diff] [diff]
git = 1 git = 1
showfunc = 1 showfunc = 1
word-diff = 1 word-diff = 1
# use merge-diff functionality to make `diff` of a merge easier to understand
merge = yes
""" """
samplehgrcs = { samplehgrcs = {
b'user': b"""# example user config (see 'hg help config' for more info) b'user': b"""# example user config (see 'hg help config' for more info)
[ui] [ui]
# name and email, e.g. # name and email, e.g.
# username = Jane Doe <jdoe@example.com> # username = Jane Doe <jdoe@example.com>
username = username =