Mercurial > public > mercurial-scm > hg

comparison mercurial/mergestate.py @ 48946:642e31cb55f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use class X: instead of class X(object): The inheritance from object is implied in Python 3. So this should be equivalent. This change was generated via an automated search and replace. So there may have been some accidental changes. Differential Revision: https://phab.mercurial-scm.org/D12352
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 21 Feb 2022 13:08:28 -0700
parents 2cce2fa5bcf7
children 2e726c934fcd
comparison
equal deleted inserted replaced
48945:55d132525155 48946:642e31cb55f0
98 CHANGE_ADDED = b'added' 98 CHANGE_ADDED = b'added'
99 CHANGE_REMOVED = b'removed' 99 CHANGE_REMOVED = b'removed'
100 CHANGE_MODIFIED = b'modified' 100 CHANGE_MODIFIED = b'modified'
101 101
102 102
103 class MergeAction(object): 103 class MergeAction:
104 """represent an "action" merge need to take for a given file 104 """represent an "action" merge need to take for a given file
105 105
106 Attributes: 106 Attributes:
107 107
108 _short: internal representation used to identify each action 108 _short: internal representation used to identify each action
192 ACTION_CHANGED_DELETED, 192 ACTION_CHANGED_DELETED,
193 ACTION_DELETED_CHANGED, 193 ACTION_DELETED_CHANGED,
194 ) 194 )
195 195
196 196
197 class _mergestate_base(object): 197 class _mergestate_base:
198 """track 3-way merge state of individual files 198 """track 3-way merge state of individual files
199 199
200 The merge state is stored on disk when needed. Two files are used: one with 200 The merge state is stored on disk when needed. Two files are used: one with
201 an old format (version 1), and one with a new format (version 2). Version 2 201 an old format (version 1), and one with a new format (version 2). Version 2
202 stores a superset of the data in version 1, including new kinds of records 202 stores a superset of the data in version 1, including new kinds of records