This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8717

mergestate: add comments about couple of record types and minor reorder
ClosedPublic

Authored by pulkit on Jul 9 2020, 8:37 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9abdc0bd2ab9: mergestate: add comments about couple of record types and minor reorder
Summary

I am trying to divide the records into certain groups and then have dedicated
objects for them. Taking baby steps in that direction.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Jul 9 2020, 8:37 AM
pulkit added a commit: rHG9abdc0bd2ab9: mergestate: add comments about couple of record types and minor reorder.Jul 19 2020, 6:38 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG9abdc0bd2ab9: mergestate: add comments about couple of record types and minor reorder (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (8 lines)

Diff 21969

mercurial/mergestate.py

return filemerge.absentfilectx(ctx, f) return filemerge.absentfilectx(ctx, f)
else: else:
return ctx[f] return ctx[f]
# Merge state record types. See ``mergestate`` docs for more. # Merge state record types. See ``mergestate`` docs for more.
RECORD_LOCAL = b'L' RECORD_LOCAL = b'L'
RECORD_OTHER = b'O' RECORD_OTHER = b'O'
# record extra information about files
RECORD_FILE_VALUES = b'f'
# record merge labels
RECORD_LABELS = b'l'
RECORD_MERGED = b'F' RECORD_MERGED = b'F'
RECORD_CHANGEDELETE_CONFLICT = b'C' RECORD_CHANGEDELETE_CONFLICT = b'C'
RECORD_MERGE_DRIVER_MERGE = b'D' RECORD_MERGE_DRIVER_MERGE = b'D'
RECORD_PATH_CONFLICT = b'P' RECORD_PATH_CONFLICT = b'P'
RECORD_MERGE_DRIVER_STATE = b'm' RECORD_MERGE_DRIVER_STATE = b'm'
RECORD_FILE_VALUES = b'f'
RECORD_LABELS = b'l'
RECORD_OVERRIDE = b't' RECORD_OVERRIDE = b't'
RECORD_UNSUPPORTED_MANDATORY = b'X' RECORD_UNSUPPORTED_MANDATORY = b'X'
RECORD_UNSUPPORTED_ADVISORY = b'x' RECORD_UNSUPPORTED_ADVISORY = b'x'
MERGE_DRIVER_STATE_UNMARKED = b'u' MERGE_DRIVER_STATE_UNMARKED = b'u'
MERGE_DRIVER_STATE_MARKED = b'm' MERGE_DRIVER_STATE_MARKED = b'm'
MERGE_DRIVER_STATE_SUCCESS = b's' MERGE_DRIVER_STATE_SUCCESS = b's'