HomePhabricator

merge: use constants for actions

Authored by indygreg.

Description

merge: use constants for actions

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 of addressing a recent security issue with
subrepos. Having the named constants in place definitely makes
things easier to read.

I'm not convinced the new constants have the best names (I'm not
an expert in this code). But they can be changed easily enough.

Also, since these constants are internal only, we might want
to change their values to something more human readable to
facilitate debugging. Or maybe we could employ an enum type
some day...

Differential Revision: https://phab.mercurial-scm.org/D2701

Details

Committed
indygregMar 5 2018, 9:10 PM
Differential Revision
D2701: merge: use constants for actions
Parents
rHGaa5199c7aa42: merge: use constants for merge record state
Branches
Unknown
Tags
Unknown