Show More
@@ -60,7 +60,6 b' def extsetup(ui):' | |||
|
60 | 60 | # We don't do all these checks when paranoid is disable as it would |
|
61 | 61 | # make the extension run very slowly on large repos |
|
62 | 62 | extensions.wrapfunction(dirstatecl, 'write', _checkdirstate) |
|
63 | extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate) | |
|
64 | 63 | extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate) |
|
65 | 64 | extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate) |
|
66 | 65 | extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate) |
@@ -258,7 +258,6 b' def _setupdirstate(ui):' | |||
|
258 | 258 | b'set_tracked', |
|
259 | 259 | b'set_untracked', |
|
260 | 260 | b'copy', |
|
261 | b'merge', | |
|
262 | 261 | ] |
|
263 | 262 | hint = _( |
|
264 | 263 | b'include file with `hg debugsparse --include <pattern>` or use ' |
@@ -762,24 +762,6 b' class dirstate(object):' | |||
|
762 | 762 | self._addpath(filename, added=True) |
|
763 | 763 | self._map.copymap.pop(filename, None) |
|
764 | 764 | |
|
765 | def merge(self, f): | |
|
766 | '''Mark a file merged.''' | |
|
767 | if self.pendingparentchange(): | |
|
768 | util.nouideprecwarn( | |
|
769 | b"do not use `merge` inside of update/merge context." | |
|
770 | b" Use `update_file`", | |
|
771 | b'6.0', | |
|
772 | stacklevel=2, | |
|
773 | ) | |
|
774 | else: | |
|
775 | util.nouideprecwarn( | |
|
776 | b"do not use `merge` outside of update/merge context." | |
|
777 | b"It should have been set by the update/merge code", | |
|
778 | b'6.0', | |
|
779 | stacklevel=2, | |
|
780 | ) | |
|
781 | self._merge(f) | |
|
782 | ||
|
783 | 765 | def _merge(self, f): |
|
784 | 766 | if not self.in_merge: |
|
785 | 767 | return self._normallookup(f) |
General Comments 0
You need to be logged in to leave comments.
Login now