Mercurial > hg

changeset 45161:9abdc0bd2ab9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: add comments about couple of record types and minor reorder I am trying to divide the records into certain groups and then have dedicated objects for them. Taking baby steps in that direction. Differential Revision: https://phab.mercurial-scm.org/D8717
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 09 Jul 2020 16:38:24 +0530
parents fcd0cff3400a
children 8530022f968e
files mercurial/mergestate.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/mergestate.py	Thu Jul 09 15:50:02 2020 +0530
+++ b/mercurial/mergestate.py	Thu Jul 09 16:38:24 2020 +0530
@@ -41,13 +41,17 @@
 # Merge state record types. See ``mergestate`` docs for more.
 RECORD_LOCAL = b'L'
 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_CHANGEDELETE_CONFLICT = b'C'
 RECORD_MERGE_DRIVER_MERGE = b'D'
 RECORD_PATH_CONFLICT = b'P'
+
 RECORD_MERGE_DRIVER_STATE = b'm'
-RECORD_FILE_VALUES = b'f'
-RECORD_LABELS = b'l'
 RECORD_OVERRIDE = b't'
 RECORD_UNSUPPORTED_MANDATORY = b'X'
 RECORD_UNSUPPORTED_ADVISORY = b'x'