Mercurial > public > mercurial-scm > hg
comparison mercurial/ui.py @ 38652:bfcd5c7cbf9a
grep: restore pre-9ef10437bb88 behavior, enable wdir search by tweakdefaults
Unfortunately, python-hglib relies on the original grep behavior and is
documented as such. Even though we agreed to introduce the BC, we shouldn't
break existing libraries.
So this patch flips the default again and move the new default to
ui.tweakdefaults. We could instead use HGPLAIN to turn this flag off, but
that would be rather confusing as the old/new behaviors are quite different.
Differential Revision: https://phab.mercurial-scm.org/D3919
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Wed, 11 Jul 2018 22:06:04 +0900 |
parents | 92c845c097aa |
children | d79f3afb079e |
comparison
equal
deleted
inserted
replaced
38651:5e4027db52f4 | 38652:bfcd5c7cbf9a |
---|---|
57 statuscopies = yes | 57 statuscopies = yes |
58 # Prefer curses UIs when available. Revert to plain-text with `text`. | 58 # Prefer curses UIs when available. Revert to plain-text with `text`. |
59 interface = curses | 59 interface = curses |
60 | 60 |
61 [commands] | 61 [commands] |
62 # Grep working directory by default. | |
63 grep.all-files = True | |
62 # Make `hg status` emit cwd-relative paths by default. | 64 # Make `hg status` emit cwd-relative paths by default. |
63 status.relative = yes | 65 status.relative = yes |
64 # Refuse to perform an `hg update` that would cause a file content merge | 66 # Refuse to perform an `hg update` that would cause a file content merge |
65 update.check = noconflict | 67 update.check = noconflict |
66 # Show conflicts information in `hg status` | 68 # Show conflicts information in `hg status` |