Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 34522:bed1d2eaa108
configitems: register 'merge.checkunknown' and 'merge.checkignored'
They both use the same function defining a default, so we need to update them at
the same time.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Sun, 08 Oct 2017 21:48:40 +0200 |
| parents | a57c938e7ac8 |
| children | 1913162854f2 |
comparison
equal
deleted
inserted
replaced
| 34521:aacb17cc0ee4 | 34522:bed1d2eaa108 |
|---|---|
| 601 | 601 |
| 602 Meant for use by custom merge drivers.""" | 602 Meant for use by custom merge drivers.""" |
| 603 self._results[f] = 0, 'g' | 603 self._results[f] = 0, 'g' |
| 604 | 604 |
| 605 def _getcheckunknownconfig(repo, section, name): | 605 def _getcheckunknownconfig(repo, section, name): |
| 606 config = repo.ui.config(section, name, default='abort') | 606 config = repo.ui.config(section, name) |
| 607 valid = ['abort', 'ignore', 'warn'] | 607 valid = ['abort', 'ignore', 'warn'] |
| 608 if config not in valid: | 608 if config not in valid: |
| 609 validstr = ', '.join(["'" + v + "'" for v in valid]) | 609 validstr = ', '.join(["'" + v + "'" for v in valid]) |
| 610 raise error.ConfigError(_("%s.%s not valid " | 610 raise error.ConfigError(_("%s.%s not valid " |
| 611 "('%s' is none of %s)") | 611 "('%s' is none of %s)") |