comparison mercurial/dirstate.py @ 51700:7f0cb9ee0534

Backout accidental publication of a large range of revisions

I accidentally published 25e7f9dcad0f::bd1483fd7088, this is the inverse.

51699:bd1483fd7088

CHANGE_TYPE_FILES = "files"


@interfaceutil.implementer(intdirstate.idirstate)
class dirstate:
    # used by largefile to avoid overwritting transaction callback
    _tr_key_suffix = b''

    def __init__(
        self,

        p1_tracked,
        p2_info=False,
        possibly_dirty=False,
        parentfiledata=None,
    ):
        # note: I do not think we need to double check name clash here since we
        # are in a update/merge case that should already have taken care of
        # this. The test agrees

        self._dirty = True

        # XXX move before the dirty check once `unlock` stop calling `write`
        assert not self._invalidated_context

        write_key = self._use_tracked_hint and self._dirty_tracked_set
        if tr:
            self._setup_tr_abort(tr)
            self._attached_to_a_transaction = True

            def on_success(f):
                self._attached_to_a_transaction = False

                    results[nf] = st
                else:
                    badfn(ff, badtype(kind))
                    if nf in dmap:
                        results[nf] = None
            except OSError as inst:
                # nf not found on disk - it is dirstate only
                if nf in dmap:  # does it exactly match a missing file?
                    results[nf] = None
                else:  # does it match a missing directory?
                    if self._map.hasdir(nf):

51700:7f0cb9ee0534

CHANGE_TYPE_FILES = "files"


@interfaceutil.implementer(intdirstate.idirstate)
class dirstate:

    # used by largefile to avoid overwritting transaction callback
    _tr_key_suffix = b''

    def __init__(
        self,

        p1_tracked,
        p2_info=False,
        possibly_dirty=False,
        parentfiledata=None,
    ):

        # note: I do not think we need to double check name clash here since we
        # are in a update/merge case that should already have taken care of
        # this. The test agrees

        self._dirty = True

        # XXX move before the dirty check once `unlock` stop calling `write`
        assert not self._invalidated_context

        write_key = self._use_tracked_hint and self._dirty_tracked_set
        if tr:

            self._setup_tr_abort(tr)
            self._attached_to_a_transaction = True

            def on_success(f):
                self._attached_to_a_transaction = False

                    results[nf] = st
                else:
                    badfn(ff, badtype(kind))
                    if nf in dmap:
                        results[nf] = None
            except (OSError) as inst:
                # nf not found on disk - it is dirstate only
                if nf in dmap:  # does it exactly match a missing file?
                    results[nf] = None
                else:  # does it match a missing directory?
                    if self._map.hasdir(nf):