Mercurial > hg
comparison doc/hgrc.5.txt @ 13751:85d74f6babf6
patch: deprecate ui.patch / external patcher feature
Why?
- Mercurial internal patcher works correctly for regular patches and git
patches, is much faster at least on Windows and is more extensible.
- In theory, the external patcher can be used to handle exotic patch formats. I
do not know any and have not heard about any such use in years.
- Most patch programs cannot handle git format patches, which makes the API
caller to decide either to ignore ui.patch by calling patch.internalpatch()
directly, or take the risk of random failures with valid inputs.
- One thing a patch program could do Mercurial patcher cannot is applying with
--reverse. Apparently several shelve like extensions try to use that,
including passing the "reverse" option to Mercurial patcher, which has been
removed mid-2009. I never heard anybody complain about that, and would prefer
reimplementing it anyway.
And from the technical perspective:
- The external patcher makes everything harder to maintain and implement. EOL
normalization is not implemented, and I would bet file renames, if supported
by the patcher, are not correctly recorded in the dirstate.
- No tests.
How?
- Remove related documentation
- Clearly mark patch.externalpatch() as private
- Remove the debuginstall check. This deprecation request was actually
triggered by this last point. debuginstall is the only piece of code patching
without a repository. When migrating to an integrated patch() + updatedir()
call, this was really a showstopper, all workarounds were either ugly or
uselessly complicated to implement. If we do not support external patcher
anymore, the debuginstall check is not useful anymore.
- Remove patch.externalpatch() after 1.9 release.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 24 Mar 2011 10:28:29 +0100 |
parents | 984175605311 |
children | a1e418070ff6 |
comparison
equal
deleted
inserted
replaced
13750:7eb82f88e157 | 13751:85d74f6babf6 |
---|---|
909 Template string for commands that print changesets. | 909 Template string for commands that print changesets. |
910 ``merge`` | 910 ``merge`` |
911 The conflict resolution program to use during a manual merge. | 911 The conflict resolution program to use during a manual merge. |
912 For more information on merge tools see :hg:`help merge-tools`. | 912 For more information on merge tools see :hg:`help merge-tools`. |
913 For configuring merge tools see the merge-tools_ section. | 913 For configuring merge tools see the merge-tools_ section. |
914 ``patch`` | |
915 command to use to apply patches. Look for ``gpatch`` or ``patch`` in | |
916 PATH if unset. | |
917 ``quiet`` | 914 ``quiet`` |
918 Reduce the amount of output printed. True or False. Default is False. | 915 Reduce the amount of output printed. True or False. Default is False. |
919 ``remotecmd`` | 916 ``remotecmd`` |
920 remote command to use for clone/push/pull operations. Default is ``hg``. | 917 remote command to use for clone/push/pull operations. Default is ``hg``. |
921 ``report_untrusted`` | 918 ``report_untrusted`` |