D2701: merge: use constants for actions

2018-03-26 Thread yuja (Yuya Nishihara)
yuja added a comment. If the perf hit was because of lookup of global variables, maybe we can alias them in functions where hot loop exists. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2701 To: indygreg, #hg-reviewers, phillco, durin42 Cc: yuja, quark,

D2701: merge: use constants for actions

2018-03-24 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG43ffd9070da1: merge: use constants for actions (authored by indygreg, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2701?vs=6662=7278 REVISION

Re: D2701: merge: use constants for actions

2018-03-06 Thread Pulkit Goyal
I also faced difficulty in past understanding these magic single or double character values. I am +1 on this series. On Mar 5, 2018 7:15 PM, "indygreg (Gregory Szorc)" < phabrica...@mercurial-scm.org> wrote: indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added

D2701: merge: use constants for actions

2018-03-06 Thread indygreg (Gregory Szorc)
indygreg marked an inline comment as done. indygreg added a comment. In https://phab.mercurial-scm.org/D2701#43478, @phillco wrote: > btw, @quark mentioned there could be a perf hit (@sid0 mentioned this too a long time ago iirc) Are we sure about that? I could see a perf hit for

D2701: merge: use constants for actions

2018-03-05 Thread phillco (Phil Cohen)
phillco added subscribers: sid0, quark. phillco added a comment. btw, @quark mentioned there could be a perf hit (@sid0 mentioned this too a long time ago iirc) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2701 To: indygreg, #hg-reviewers, phillco Cc: quark,

D2701: merge: use constants for actions

2018-03-05 Thread phillco (Phil Cohen)
phillco added inline comments. INLINE COMMENTS > indygreg wrote in merge.py:909 > Done. > > What's... amusing is that ``dr`` and ``rd`` are not actions in the current > code base. lol REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2701 To: indygreg,

D2701: merge: use constants for actions

2018-03-05 Thread indygreg (Gregory Szorc)
indygreg updated this revision to Diff 6662. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2701?vs=6661=6662 REVISION DETAIL https://phab.mercurial-scm.org/D2701 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py

D2701: merge: use constants for actions

2018-03-05 Thread indygreg (Gregory Szorc)
indygreg marked an inline comment as done. indygreg added inline comments. INLINE COMMENTS > phillco wrote in merge.py:909 > Update this too? Done. What's... amusing is that ``dr`` and ``rd`` are not actions in the current code base. REPOSITORY rHG Mercurial REVISION DETAIL

D2701: merge: use constants for actions

2018-03-05 Thread phillco (Phil Cohen)
phillco added inline comments. INLINE COMMENTS > merge.py:909 > if actions: > # k, dr, e and rd are no-op > +for m in (ACTION_ADD, ACTION_ADD_MODIFIED, ACTION_FORGET, ACTION_GET, Update this too? REPOSITORY rHG Mercurial REVISION DETAIL

D2701: merge: use constants for actions

2018-03-05 Thread phillco (Phil Cohen)
phillco accepted this revision. phillco added a comment. Strong +1 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2701 To: indygreg, #hg-reviewers, phillco Cc: phillco, pulkit, mercurial-devel ___ Mercurial-devel

D2701: merge: use constants for actions

2018-03-05 Thread indygreg (Gregory Szorc)
indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We finish up establishing named constants in this file with actions. I remember scratching my head trying to figure out what this code was doing as part