comparison mercurial/localrepo.py @ 26748:5ba0a99ff27f

dirstate: make dirstate.write() callers pass transaction object to it

Now, 'dirstate.write(tr)' delays writing in-memory changes out, if a
transaction is running.

This may cause treating this revision as "the first bad one" at
bisecting in some cases using external hook process inside transaction
scope, because some external hooks and editor process are still
invoked without HG_PENDING and pending changes aren't visible to them.

'dirstate.write()' callers below in localrepo.py explicitly use 'None'
as 'tr', because they can assume that no transaction is running:

  - just before starting transaction
  - at closing transaction, or
  - at unlocking wlock

26747:beff0b2481b3

            raise error.RepoError(
                _("abandoned transaction found"),
                hint=_("run 'hg recover' to clean up transaction"))

        # make journal.dirstate contain in-memory changes at this point
        self.dirstate.write()

        idbase = "%.40f#%f" % (random.random(), time.time())
        txnid = 'TXN:' + util.sha1(idbase).hexdigest()
        self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid)

                # this should be explicitly invoked here, because
                # in-memory changes aren't written out at closing
                # transaction, if tr.addfilegenerator (via
                # dirstate.write or so) isn't invoked while
                # transaction running
                repo.dirstate.write()
            else:
                # prevent in-memory changes from being written out at
                # the end of outer wlock scope or so
                repo.dirstate.invalidate()

        def unlock():
            if self.dirstate.pendingparentchange():
                self.dirstate.invalidate()
            else:
                self.dirstate.write()

            self._filecache['dirstate'].refresh()

        l = self._lock(self.vfs, "wlock", wait, unlock,
                       self.invalidatedirstate, _('working directory of %s') %

26748:5ba0a99ff27f

            raise error.RepoError(
                _("abandoned transaction found"),
                hint=_("run 'hg recover' to clean up transaction"))

        # make journal.dirstate contain in-memory changes at this point
        self.dirstate.write(None)

        idbase = "%.40f#%f" % (random.random(), time.time())
        txnid = 'TXN:' + util.sha1(idbase).hexdigest()
        self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid)

                # this should be explicitly invoked here, because
                # in-memory changes aren't written out at closing
                # transaction, if tr.addfilegenerator (via
                # dirstate.write or so) isn't invoked while
                # transaction running
                repo.dirstate.write(None)
            else:
                # prevent in-memory changes from being written out at
                # the end of outer wlock scope or so
                repo.dirstate.invalidate()

        def unlock():
            if self.dirstate.pendingparentchange():
                self.dirstate.invalidate()
            else:
                self.dirstate.write(None)

            self._filecache['dirstate'].refresh()

        l = self._lock(self.vfs, "wlock", wait, unlock,
                       self.invalidatedirstate, _('working directory of %s') %