| Alphare |
| hg-reviewers |
The method was deprecated in 5.9.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/dirstatenonnormalcheck.py (1 line) | |||
| M | mercurial/dirstate.py (18 lines) | |||
| M | mercurial/interfaces/dirstate.py (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute |
| dirstatecl = dirstate.dirstate | dirstatecl = dirstate.dirstate | ||||
| devel = ui.configbool(b'devel', b'all-warnings') | devel = ui.configbool(b'devel', b'all-warnings') | ||||
| paranoid = ui.configbool(b'experimental', b'nonnormalparanoidcheck') | paranoid = ui.configbool(b'experimental', b'nonnormalparanoidcheck') | ||||
| if devel: | if devel: | ||||
| extensions.wrapfunction(dirstatecl, '_writedirstate', _checkdirstate) | extensions.wrapfunction(dirstatecl, '_writedirstate', _checkdirstate) | ||||
| if paranoid: | if paranoid: | ||||
| # We don't do all these checks when paranoid is disable as it would | # We don't do all these checks when paranoid is disable as it would | ||||
| # make the extension run very slowly on large repos | # make the extension run very slowly on large repos | ||||
| extensions.wrapfunction(dirstatecl, 'otherparent', _checkdirstate) | |||||
| extensions.wrapfunction(dirstatecl, 'write', _checkdirstate) | extensions.wrapfunction(dirstatecl, 'write', _checkdirstate) | ||||
| extensions.wrapfunction(dirstatecl, 'add', _checkdirstate) | extensions.wrapfunction(dirstatecl, 'add', _checkdirstate) | ||||
| extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate) | extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate) | ||||
| extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate) | extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate) | ||||
| extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate) | extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate) | ||||
| extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate) | extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate) | ||||
| extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate) | extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate) | ||||
| extensions.wrapfunction( | extensions.wrapfunction( | ||||
| dirstatecl, 'set_possibly_dirty', _checkdirstate | dirstatecl, 'set_possibly_dirty', _checkdirstate | ||||
| ) | ) | ||||
| extensions.wrapfunction( | extensions.wrapfunction( | ||||
| dirstatecl, 'update_file_p1', _checkdirstate | dirstatecl, 'update_file_p1', _checkdirstate | ||||
| ) | ) | ||||
| extensions.wrapfunction(dirstatecl, 'update_file', _checkdirstate) | extensions.wrapfunction(dirstatecl, 'update_file', _checkdirstate) | ||||
| if source is not None: | if source is not None: | ||||
| self.copy(source, f) | self.copy(source, f) | ||||
| return | return | ||||
| elif entry.merged or entry.from_p2: | elif entry.merged or entry.from_p2: | ||||
| return | return | ||||
| self._addpath(f, possibly_dirty=True) | self._addpath(f, possibly_dirty=True) | ||||
| self._map.copymap.pop(f, None) | self._map.copymap.pop(f, None) | ||||
| def otherparent(self, f): | |||||
| '''Mark as coming from the other parent, always dirty.''' | |||||
| if self.pendingparentchange(): | |||||
| util.nouideprecwarn( | |||||
| b"do not use `otherparent` inside of update/merge context." | |||||
| b" Use `update_file` or `update_file_p1`", | |||||
| b'6.0', | |||||
| stacklevel=2, | |||||
| ) | |||||
| else: | |||||
| util.nouideprecwarn( | |||||
| b"do not use `otherparent` outside of update/merge context." | |||||
| b"It should have been set by the update/merge code", | |||||
| b'6.0', | |||||
| stacklevel=2, | |||||
| ) | |||||
| self._otherparent(f) | |||||
| def _otherparent(self, f): | def _otherparent(self, f): | ||||
| if not self.in_merge: | if not self.in_merge: | ||||
| msg = _(b"setting %r to other parent only allowed in merges") % f | msg = _(b"setting %r to other parent only allowed in merges") % f | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| entry = self._map.get(f) | entry = self._map.get(f) | ||||
| if entry is not None and entry.tracked: | if entry is not None and entry.tracked: | ||||
| # merge-like | # merge-like | ||||
| self._addpath(f, merged=True) | self._addpath(f, merged=True) | ||||
| """Mark dest as a copy of source. Unmark dest if source is None.""" | """Mark dest as a copy of source. Unmark dest if source is None.""" | ||||
| def copied(file): | def copied(file): | ||||
| pass | pass | ||||
| def copies(): | def copies(): | ||||
| pass | pass | ||||
| def otherparent(f): | |||||
| '''Mark as coming from the other parent, always dirty.''' | |||||
| def add(f): | def add(f): | ||||
| '''Mark a file added.''' | '''Mark a file added.''' | ||||
| def remove(f): | def remove(f): | ||||
| '''Mark a file removed.''' | '''Mark a file removed.''' | ||||
| def merge(f): | def merge(f): | ||||
| '''Mark a file merged.''' | '''Mark a file merged.''' | ||||