| Alphare |
| hg-reviewers |
We will need a different name in the next changesets. Changing the name is
actually not that trivial so we do it in its own changeset.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (4 lines) | |||
| M | mercurial/transaction.py (5 lines) |
| def write(self, tr): | def write(self, tr): | ||||
| if not self._dirty: | if not self._dirty: | ||||
| return | return | ||||
| filename = self._filename | filename = self._filename | ||||
| if tr: | if tr: | ||||
| # delay writing in-memory changes out | # delay writing in-memory changes out | ||||
| tr.addfilegenerator( | tr.addfilegenerator( | ||||
| b'dirstate', | b'dirstate-1-main', | ||||
| (self._filename,), | (self._filename,), | ||||
| lambda f: self._writedirstate(tr, f), | lambda f: self._writedirstate(tr, f), | ||||
| location=b'plain', | location=b'plain', | ||||
| ) | ) | ||||
| return | return | ||||
| file = lambda f: self._opener(f, b"w", atomictemp=True, checkambig=True) | file = lambda f: self._opener(f, b"w", atomictemp=True, checkambig=True) | ||||
| with file(self._filename) as f: | with file(self._filename) as f: | ||||
| self._opener(filename, b"w", atomictemp=True, checkambig=True), | self._opener(filename, b"w", atomictemp=True, checkambig=True), | ||||
| ) | ) | ||||
| if tr: | if tr: | ||||
| # ensure that subsequent tr.writepending returns True for | # ensure that subsequent tr.writepending returns True for | ||||
| # changes written out above, even if dirstate is never | # changes written out above, even if dirstate is never | ||||
| # changed after this | # changed after this | ||||
| tr.addfilegenerator( | tr.addfilegenerator( | ||||
| b'dirstate', | b'dirstate-1-main', | ||||
| (self._filename,), | (self._filename,), | ||||
| lambda f: self._writedirstate(tr, f), | lambda f: self._writedirstate(tr, f), | ||||
| location=b'plain', | location=b'plain', | ||||
| ) | ) | ||||
| # ensure that pending file written above is unlinked at | # ensure that pending file written above is unlinked at | ||||
| # failure, even if tr.writepending isn't invoked until the | # failure, even if tr.writepending isn't invoked until the | ||||
| # end of this transaction | # end of this transaction | ||||
| ) | ) | ||||
| from .utils import stringutil | from .utils import stringutil | ||||
| version = 2 | version = 2 | ||||
| # These are the file generators that should only be executed after the | # These are the file generators that should only be executed after the | ||||
| # finalizers are done, since they rely on the output of the finalizers (like | # finalizers are done, since they rely on the output of the finalizers (like | ||||
| # the changelog having been written). | # the changelog having been written). | ||||
| postfinalizegenerators = {b'bookmarks', b'dirstate'} | postfinalizegenerators = { | ||||
| b'bookmarks', | |||||
| b'dirstate-1-main', | |||||
| } | |||||
| GEN_GROUP_ALL = b'all' | GEN_GROUP_ALL = b'all' | ||||
| GEN_GROUP_PRE_FINALIZE = b'prefinalize' | GEN_GROUP_PRE_FINALIZE = b'prefinalize' | ||||
| GEN_GROUP_POST_FINALIZE = b'postfinalize' | GEN_GROUP_POST_FINALIZE = b'postfinalize' | ||||
| def active(func): | def active(func): | ||||
| def _active(self, *args, **kwds): | def _active(self, *args, **kwds): | ||||