This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6d734a3a76e2: dirstate: perform transactions with _map
using single call, where possible (authored by mbolin, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
yuja accepted this revision.
yuja added a comment.
This revision is now accepted and ready to land.
Queued, thanks.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D663
To: mbolin, #hg-reviewers, phillco, yuja
Cc: yuja, phillco, mercurial-devel
mbolin added inline comments.
INLINE COMMENTS
> yuja wrote in dirstate.py:554
> test-add.t fails here. It was `self[d]`, not `self._map[d]`.
My bad: fixed without bringing the extra lookup back.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D663
To: mbolin,
mbolin updated this revision to Diff 1817.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D663?vs=1687=1817
REVISION DETAIL
https://phab.mercurial-scm.org/D663
AFFECTED FILES
mercurial/dirstate.py
CHANGE DETAILS
diff --git a/mercurial/dirstate.py
yuja requested changes to this revision.
yuja added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> dirstate.py:554
> +entry = self._map.get(d)
> +if entry is not None and entry != 'r':
> raise error.Abort(
phillco accepted this revision.
phillco added a comment.
These look good to me.
INLINE COMMENTS
> dirstate.py:585-587
> # if there is a merge going on and the file was either
> # in state 'm' (-1) or coming from other parent (-2) before
> # being
mbolin created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This is in the same style as https://phab.mercurial-scm.org/D493.
In general, this replaces patterns such as:
f in self._map:
entry =
