Yuya Nishihara <yuya@tcha.org> [Sat, 24 Mar 2018 13:38:04 +0900] rev 37118
procutil: move process/executable management functions to new module
std* files, pipe helpers, and findexe()s are moved as well since they are
likely to be used with sub processes.
Yuya Nishihara <yuya@tcha.org> [Sat, 24 Mar 2018 14:32:34 +0900] rev 37117
util: stop using readfile() in tempfilter()
To unblock code move to utils.*. It's merely two lines of very Pythonic code.
No helper function should be needed.
Yuya Nishihara <yuya@tcha.org> [Sat, 24 Mar 2018 14:38:34 +0900] rev 37116
util: mark filtertable as private constant
Prepares for porting to utils.*.
Yuya Nishihara <yuya@tcha.org> [Sat, 24 Mar 2018 17:04:43 +0900] rev 37115
util: mark platform-specific gethgcmd() as private
util.hgcmd() is the public interface for gethgcmd().
Matt Harbison <matt_harbison@yahoo.com> [Sat, 24 Mar 2018 22:10:58 -0400] rev 37114
test-pathconflicts-merge: stop requiring symlink support
The errors from the last time I took a shot at this back in early November have
disappeared, so let's just enable this.
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 05 Mar 2018 17:50:54 -0800] rev 37113
commands: use constants for merge things
We have nice constants now. Let's use them to make the code
easier to reason about.
Differential Revision: https://phab.mercurial-scm.org/D2702
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 05 Mar 2018 18:10:36 -0800] rev 37112
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
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 05 Mar 2018 14:21:57 -0500] rev 37111
merge: use constants for merge record state
Named constants are easier to read than short string values.
Differential Revision: https://phab.mercurial-scm.org/D2700
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 05 Mar 2018 14:15:31 -0500] rev 37110
merge: use constants for merge driver state
Named constants are superior to magic values.
Differential Revision: https://phab.mercurial-scm.org/D2699
Gregory Szorc <gregory.szorc@gmail.com> [Mon, 05 Mar 2018 14:09:23 -0500] rev 37109
merge: use constants for merge state record types
merge.py is using multiple discrete sets of 1 and 2 letter constants
to define types and behavior. To the uninitiated, the code is very
difficult to reason about. I didn't even realize there were multiple
sets of constants in play initially!
We begin our sanity injection with merge state records. The record
types (which are serialized to disk) are now defined in RECORD_*
constants.
Differential Revision: https://phab.mercurial-scm.org/D2698