Patchwork [04,of,13] mergestate: remove unused unsupported related mergestate records

login
register
mail settings
Submitter Pulkit Goyal
Date July 17, 2020, 8:59 a.m.
Message ID <6879b715405d2ff35deb.1594976365@workspace>
Download mbox | patch
Permalink /patch/46777/
State Accepted
Headers show

Comments

Pulkit Goyal - July 17, 2020, 8:59 a.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1594292982 -19800
#      Thu Jul 09 16:39:42 2020 +0530
# Node ID 6879b715405d2ff35deb35eac97104bb82c1aff2
# Parent  ed6b80e5ed265851feb59d7855641b5d5254953b
# EXP-Topic mergestate-refactor
mergestate: remove unused unsupported related mergestate records

I tried to find users of this but was unable to find. Seems like RECORD_OVERRIDE
is doing for what they were used before.

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

Patch

diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -53,8 +53,6 @@  RECORD_PATH_CONFLICT = b'P'
 
 RECORD_MERGE_DRIVER_STATE = b'm'
 RECORD_OVERRIDE = b't'
-RECORD_UNSUPPORTED_MANDATORY = b'X'
-RECORD_UNSUPPORTED_ADVISORY = b'x'
 
 MERGE_DRIVER_STATE_UNMARKED = b'u'
 MERGE_DRIVER_STATE_MARKED = b'm'
@@ -115,8 +113,6 @@  class mergestate(object):
     m: the external merge driver defined for this merge plus its run state
        (experimental)
     f: a (filename, dictionary) tuple of optional values for a given file
-    X: unsupported mandatory record type (used in tests)
-    x: unsupported advisory record type (used in tests)
     l: the labels for the parts of the merge.
 
     Merge driver run states (experimental):