Mercurial > hg

diff mercurial/configitems.py @ 43873:8caec25f5d8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add commands.merge.require-rev to require an argument to hg merge 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. Differential Revision: https://phab.mercurial-scm.org/D7620
author Kyle Lippincott <spectral@google.com>
date Wed, 11 Dec 2019 19:42:05 -0800
parents acbb55b8e9dc
children 8042856c90b6
line wrap: on
line diff
--- a/mercurial/configitems.py	Thu Dec 12 09:59:03 2019 -0800
+++ b/mercurial/configitems.py	Wed Dec 11 19:42:05 2019 -0800
@@ -228,6 +228,9 @@
     b'commands', b'grep.all-files', default=False, experimental=True,
 )
 coreconfigitem(
+    b'commands', b'merge.require-rev', default=False,
+)
+coreconfigitem(
     b'commands', b'push.require-revs', default=False,
 )
 coreconfigitem(