This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7620

merge: add commands.merge.require-rev to require an argument to hg merge
ClosedPublic

Authored by spectral on Dec 12 2019, 5:49 PM.

Details

Reviewers
dlax
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8caec25f5d8f: merge: add commands.merge.require-rev to require an argument to hg merge
Summary

This is related to commands.rebase.requiredest, commands.update.requiredest, and
commands.push.require-revs. Since it isn't really a "destination", I went with
require-rev to be similar to push's require-revs.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Dec 12 2019, 5:49 PM
dlax requested changes to this revision.Dec 13 2019, 3:10 AM
dlax added a subscriber: dlax.

This should be documented in mercurial/helptext/config.txt I think.

Otherwise, this look sensible to me.

This revision now requires changes to proceed.Dec 13 2019, 3:10 AM
spectral updated this revision to Diff 18722.Dec 13 2019, 8:38 PM
spectral added a comment.Dec 13 2019, 8:38 PM
In D7620#112376, @dlax wrote:

This should be documented in mercurial/helptext/config.txt I think.

Done.

dlax accepted this revision.Dec 14 2019, 4:32 AM
pulkit accepted this revision.Dec 16 2019, 12:39 AM
This revision is now accepted and ready to land.Dec 16 2019, 12:39 AM

Revision Contents
Changeset List

Diff 18742

mercurial/commands.py

raise error.Abort(_(b"please specify just one revision")) raise error.Abort(_(b"please specify just one revision"))
if not node: if not node:
node = opts.get(b'rev') node = opts.get(b'rev')
if node: if node:
node = scmutil.revsingle(repo, node).node() node = scmutil.revsingle(repo, node).node()
if not node and not abort: if not node and not abort:
if ui.configbool(b'commands', b'merge.require-rev'):
raise error.Abort(
_(
b'configuration requires specifying revision to merge '
b'with'
)
)
node = repo[destutil.destmerge(repo)].node() node = repo[destutil.destmerge(repo)].node()
if opts.get(b'preview'): if opts.get(b'preview'):
# find nodes that are ancestors of p2 but not of p1 # find nodes that are ancestors of p2 but not of p1
p1 = repo.lookup(b'.') p1 = repo.lookup(b'.')
p2 = node p2 = node
nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) nodes = repo.changelog.findmissing(common=[p1], heads=[p2])

mercurial/configitems.py

_registerdiffopts(section=b'commands', configprefix=b'commit.interactive.') _registerdiffopts(section=b'commands', configprefix=b'commit.interactive.')
coreconfigitem( coreconfigitem(
b'commands', b'commit.post-status', default=False, b'commands', b'commit.post-status', default=False,
) )
coreconfigitem( coreconfigitem(
b'commands', b'grep.all-files', default=False, experimental=True, b'commands', b'grep.all-files', default=False, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'commands', b'merge.require-rev', default=False,
)
coreconfigitem(
b'commands', b'push.require-revs', default=False, b'commands', b'push.require-revs', default=False,
) )
coreconfigitem( coreconfigitem(
b'commands', b'resolve.confirm', default=False, b'commands', b'resolve.confirm', default=False,
) )
coreconfigitem( coreconfigitem(
b'commands', b'resolve.explicit-re-merge', default=False, b'commands', b'resolve.explicit-re-merge', default=False,
) )

mercurial/helptext/config.txt

``commands`` ``commands``
------------ ------------
``commit.post-status`` ``commit.post-status``
Show status of files in the working directory after successful commit. Show status of files in the working directory after successful commit.
(default: False) (default: False)
``merge.require-rev``
Require that the revision to merge the current commit with be specified on
the command line. If this is enabled and a revision is not specified, the
command aborts.
(default: False)
``push.require-revs`` ``push.require-revs``
Require revisions to push be specified using one or more mechanisms such as Require revisions to push be specified using one or more mechanisms such as
specifying them positionally on the command line, using ``-r``, ``-b``, specifying them positionally on the command line, using ``-r``, ``-b``,
and/or ``-B`` on the command line, or using ``paths.<path>:pushrev`` in the and/or ``-B`` on the command line, or using ``paths.<path>:pushrev`` in the
configuration. If this is enabled and revisions are not specified, the configuration. If this is enabled and revisions are not specified, the
command aborts. command aborts.
(default: False) (default: False)

tests/test-merge-default.t

Should fail because > 2 heads: Should fail because > 2 heads:
$ HGMERGE=internal:other; export HGMERGE $ HGMERGE=internal:other; export HGMERGE
$ hg merge $ hg merge
abort: branch 'default' has 3 heads - please merge with an explicit rev abort: branch 'default' has 3 heads - please merge with an explicit rev
(run 'hg heads .' to see heads, specify rev with -r) (run 'hg heads .' to see heads, specify rev with -r)
[255] [255]
Should succeed: Should succeed (we're specifying commands.merge.require-rev=True just to test
that it allows merge to succeed if we specify a revision):
$ hg merge 2 $ hg merge 2 --config commands.merge.require-rev=True
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg id -Tjson $ hg id -Tjson
[ [
{ {
"bookmarks": [], "bookmarks": [],
"branch": "default", "branch": "default",
"dirty": "+", "dirty": "+",
"id": "f25cbe84d8b320e298e7703f18a25a3959518c23+2d95304fed5d89bc9d70b2a0d02f0d567469c3ab+", "id": "f25cbe84d8b320e298e7703f18a25a3959518c23+2d95304fed5d89bc9d70b2a0d02f0d567469c3ab+",
"node": "ffffffffffffffffffffffffffffffffffffffff", "node": "ffffffffffffffffffffffffffffffffffffffff",
"parents": ["f25cbe84d8b320e298e7703f18a25a3959518c23", "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab"], "parents": ["f25cbe84d8b320e298e7703f18a25a3959518c23", "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab"],
"tags": ["tip"] "tags": ["tip"]
} }
] ]
$ hg commit -mm1 $ hg commit -mm1
Should fail because we didn't specify a revision (even though it would have
succeeded without this):
$ hg merge --config commands.merge.require-rev=True
abort: configuration requires specifying revision to merge with
[255]
Should succeed - 2 heads: Should succeed - 2 heads:
$ hg merge -P $ hg merge -P
changeset: 3:ea9ff125ff88 changeset: 3:ea9ff125ff88
parent: 1:1846eede8b68 parent: 1:1846eede8b68
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: d summary: d
"bookmarks": [], "bookmarks": [],
"branch": "default", "branch": "default",
"id": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1", "id": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
"node": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1", "node": "1846eede8b6886d8cc8a88c96a687b7fe8f3b9d1",
"tags": [] "tags": []
} }
] ]
Should fail because we didn't specify a revision (even though it would have
failed without this due to being on tip, but this check comes first):
$ hg merge --config commands.merge.require-rev=True
abort: configuration requires specifying revision to merge with
[255]
Should fail because at tip: Should fail because at tip:
$ hg merge $ hg merge
abort: nothing to merge abort: nothing to merge
[255] [255]
$ hg up 0 $ hg up 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-merge-tools.t

test merge-tools configuration - mostly exercising filemerge.py test merge-tools configuration - mostly exercising filemerge.py
$ unset HGMERGE # make sure HGMERGE doesn't interfere with the test $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> merge= > merge=
> [commands]
> merge.require-rev=True
> EOF > EOF
$ hg init repo $ hg init repo
$ cd repo $ cd repo
revision 0 revision 0
$ echo "revision 0" > f $ echo "revision 0" > f
$ echo "space" >> f $ echo "space" >> f
> --config merge-patterns.re:[a-z]=:other > --config merge-patterns.re:[a-z]=:other
warning: check merge-patterns configurations, if ':merge-other' for binary file 'b' is unintentional warning: check merge-patterns configurations, if ':merge-other' for binary file 'b' is unintentional
(see 'hg help merge-tools' for binary files capability) (see 'hg help merge-tools' for binary files capability)
merging b merging b
warning: b looks like a binary file. warning: b looks like a binary file.
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
(Testing that commands.merge.require-rev doesn't break --abort)
$ hg merge --abort -q $ hg merge --abort -q
(for ui.merge, ignored unintentionally) (for ui.merge, ignored unintentionally)
$ hg merge 9 \ $ hg merge 9 \
> --config merge-tools.:other.binary=true \ > --config merge-tools.:other.binary=true \
> --config ui.merge=:other > --config ui.merge=:other
tool :other (for pattern b) can't handle binary tool :other (for pattern b) can't handle binary