mercurial-scm/hg-stable: mercurial/mergestate.py annotate

annotate mercurial/mergestate.py @ 45204:7fc3c5fbc65f stable 5.5

mergestate: fix BC breakage introduced because of removal of a merge record In fcd0cff3400a I removed the usage of RECORD_RESOLVED_OTHER. However I also removed the reading support, hence if there is any user who runs into merge conflict with older version of hg, upgrades hg and then tries to read mergestate, they will end up with an MergeRecordUnsupportedError.

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Sat, 01 Aug 2020 18:39:28 +0530
parents	a5be403dd7a0
children	fa18b02df8dd

rev	line source
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	1 from __future__ import absolute_import
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	2
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	3 import errno
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	4 import shutil
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	5 import struct
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	6
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	7 from .i18n import _
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	8 from .node import (
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	9 bin,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	10 hex,
27031 8be0af32e513 mergestate: allow storing and retrieving change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27027 diff changeset	11 nullhex,
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	12 nullid,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	13 )
43090 1f339b503a40 py3: manually import pycompat.delattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	14 from .pycompat import delattr
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	15 from . import (
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26570 diff changeset	16 error,
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	17 filemerge,
30528 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30495 diff changeset	18 pycompat,
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	19 util,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	20 )
44060 a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43816 diff changeset	21 from .utils import hashutil
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	22
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	23 _pack = struct.pack
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	24 _unpack = struct.unpack
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	25
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	26
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	27 def _droponode(data):
3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	28 # used for compatibility for v1
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	29 bits = data.split(b'\0')
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	30 bits = bits[:-2] + bits[-1:]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	31 return b'\0'.join(bits)
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	32
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	33
44930 17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44915 diff changeset	34 def _filectxorabsent(hexnode, ctx, f):
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44915 diff changeset	35 if hexnode == nullhex:
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44915 diff changeset	36 return filemerge.absentfilectx(ctx, f)
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44915 diff changeset	37 else:
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44915 diff changeset	38 return ctx[f]
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44915 diff changeset	39
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44915 diff changeset	40
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	41 # Merge state record types. See ``mergestate`` docs for more.
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	42
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	43 ####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	44 # merge records which records metadata about a current merge
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	45 # exists only once in a mergestate
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	46 #####
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	47 RECORD_LOCAL = b'L'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	48 RECORD_OTHER = b'O'
45161 9abdc0bd2ab9 mergestate: add comments about couple of record types and minor reorder Pulkit Goyal <7895pulkit@gmail.com> parents: 45160 diff changeset	49 # record merge labels
9abdc0bd2ab9 mergestate: add comments about couple of record types and minor reorder Pulkit Goyal <7895pulkit@gmail.com> parents: 45160 diff changeset	50 RECORD_LABELS = b'l'
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	51 # store info about merge driver used and it's state
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	52 RECORD_MERGE_DRIVER_STATE = b'm'
45161 9abdc0bd2ab9 mergestate: add comments about couple of record types and minor reorder Pulkit Goyal <7895pulkit@gmail.com> parents: 45160 diff changeset	53
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	54 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	55 # record extra information about files, with one entry containing info about one
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	56 # file. Hence, multiple of them can exists
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	57 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	58 RECORD_FILE_VALUES = b'f'
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	59
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	60 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	61 # merge records which represents state of individual merges of files/folders
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	62 # These are top level records for each entry containing merge related info.
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	63 # Each record of these has info about one file. Hence multiple of them can
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	64 # exists
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	65 #####
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	66 RECORD_MERGED = b'F'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	67 RECORD_CHANGEDELETE_CONFLICT = b'C'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	68 RECORD_MERGE_DRIVER_MERGE = b'D'
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	69 # the path was dir on one side of merge and file on another
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	70 RECORD_PATH_CONFLICT = b'P'
45161 9abdc0bd2ab9 mergestate: add comments about couple of record types and minor reorder Pulkit Goyal <7895pulkit@gmail.com> parents: 45160 diff changeset	71
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	72 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	73 # possible state which a merge entry can have. These are stored inside top-level
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	74 # merge records mentioned just above.
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	75 #####
37114 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37113 diff changeset	76 MERGE_RECORD_UNRESOLVED = b'u'
aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37113 diff changeset	77 MERGE_RECORD_RESOLVED = b'r'
aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37113 diff changeset	78 MERGE_RECORD_UNRESOLVED_PATH = b'pu'
aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37113 diff changeset	79 MERGE_RECORD_RESOLVED_PATH = b'pr'
aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37113 diff changeset	80 MERGE_RECORD_DRIVER_RESOLVED = b'd'
44688 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	81 # represents that the file was automatically merged in favor
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	82 # of other version. This info is used on commit.
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	83 MERGE_RECORD_MERGED_OTHER = b'o'
37114 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37113 diff changeset	84
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	85 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	86 # top level record which stores other unknown records. Multiple of these can
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	87 # exists
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	88 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	89 RECORD_OVERRIDE = b't'
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	90
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	91 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	92 # possible states which a merge driver can have. These are stored inside a
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	93 # RECORD_MERGE_DRIVER_STATE entry
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	94 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	95 MERGE_DRIVER_STATE_UNMARKED = b'u'
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	96 MERGE_DRIVER_STATE_MARKED = b'm'
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	97 MERGE_DRIVER_STATE_SUCCESS = b's'
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	98
45204 7fc3c5fbc65f mergestate: fix BC breakage introduced because of removal of a merge record Pulkit Goyal <7895pulkit@gmail.com> parents: 45166 diff changeset	99 #####
7fc3c5fbc65f mergestate: fix BC breakage introduced because of removal of a merge record Pulkit Goyal <7895pulkit@gmail.com> parents: 45166 diff changeset	100 # legacy records which are no longer used but kept to prevent breaking BC
7fc3c5fbc65f mergestate: fix BC breakage introduced because of removal of a merge record Pulkit Goyal <7895pulkit@gmail.com> parents: 45166 diff changeset	101 #####
7fc3c5fbc65f mergestate: fix BC breakage introduced because of removal of a merge record Pulkit Goyal <7895pulkit@gmail.com> parents: 45166 diff changeset	102 # This record was release in 5.4 and usage was removed in 5.5
7fc3c5fbc65f mergestate: fix BC breakage introduced because of removal of a merge record Pulkit Goyal <7895pulkit@gmail.com> parents: 45166 diff changeset	103 LEGACY_RECORD_RESOLVED_OTHER = b'R'
7fc3c5fbc65f mergestate: fix BC breakage introduced because of removal of a merge record Pulkit Goyal <7895pulkit@gmail.com> parents: 45166 diff changeset	104
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	105
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	106 ACTION_FORGET = b'f'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	107 ACTION_REMOVE = b'r'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	108 ACTION_ADD = b'a'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	109 ACTION_GET = b'g'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	110 ACTION_PATH_CONFLICT = b'p'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	111 ACTION_PATH_CONFLICT_RESOLVE = b'pr'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	112 ACTION_ADD_MODIFIED = b'am'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	113 ACTION_CREATED = b'c'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	114 ACTION_DELETED_CHANGED = b'dc'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	115 ACTION_CHANGED_DELETED = b'cd'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	116 ACTION_MERGE = b'm'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	117 ACTION_LOCAL_DIR_RENAME_GET = b'dg'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	118 ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	119 ACTION_KEEP = b'k'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	120 ACTION_EXEC = b'e'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	121 ACTION_CREATED_MERGE = b'cm'
44688 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	122 # GET the other/remote side and store this info in mergestate
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	123 ACTION_GET_OTHER_AND_STORE = b'gs'
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	124
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	125
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	126 class mergestate(object):
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	127 '''track 3-way merge state of individual files
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	128
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	129 The merge state is stored on disk when needed. Two files are used: one with
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	130 an old format (version 1), and one with a new format (version 2). Version 2
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	131 stores a superset of the data in version 1, including new kinds of records
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	132 in the future. For more about the new format, see the documentation for
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	133 `_readrecordsv2`.
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	134
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	135 Each record can contain arbitrary content, and has an associated type. This
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	136 `type` should be a letter. If `type` is uppercase, the record is mandatory:
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	137 versions of Mercurial that don't support it should abort. If `type` is
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	138 lowercase, the record can be safely ignored.
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	139
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	140 Currently known records:
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	141
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	142 L: the node of the "local" part of the merge (hexified version)
20591 02c60e380fd0 merge: record the "other" node in merge state Pierre-Yves David <pierre-yves.david@fb.com> parents: 20590 diff changeset	143 O: the node of the "other" part of the merge (hexified version)
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	144 F: a file to be merged entry
27031 8be0af32e513 mergestate: allow storing and retrieving change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27027 diff changeset	145 C: a change/delete or delete/change conflict
26650 6ff5534c8afc merge.mergestate: add support for persisting driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26649 diff changeset	146 D: a file that the external merge driver will merge internally
6ff5534c8afc merge.mergestate: add support for persisting driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26649 diff changeset	147 (experimental)
34545 1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	148 P: a path conflict (file vs directory)
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	149 m: the external merge driver defined for this merge plus its run state
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	150 (experimental)
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30200 diff changeset	151 f: a (filename, dictionary) tuple of optional values for a given file
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	152 l: the labels for the parts of the merge.
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	153
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	154 Merge driver run states (experimental):
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	155 u: driver-resolved files unmarked -- needs to be run next time we're about
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	156 to resolve or commit
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	157 m: driver-resolved files marked -- only needs to be run before commit
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	158 s: success/skipped -- does not need to be run any more
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	159
34545 1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	160 Merge record states (stored in self._state, indexed by filename):
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	161 u: unresolved conflict
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	162 r: resolved conflict
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	163 pu: unresolved path conflict (file conflicts with directory)
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	164 pr: resolved path conflict
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	165 d: driver-resolved conflict
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	166
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	167 The resolve command transitions between 'u' and 'r' for conflicts and
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	168 'pu' and 'pr' for path conflicts.
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	169 '''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	170
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	171 statepathv1 = b'merge/state'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	172 statepathv2 = b'merge/state2'
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	173
26987 416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	174 @staticmethod
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	175 def clean(repo, node=None, other=None, labels=None):
26987 416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	176 """Initialize a brand new merge state, removing any existing state on
416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	177 disk."""
416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	178 ms = mergestate(repo)
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	179 ms.reset(node, other, labels)
26987 416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	180 return ms
416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	181
26991 2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	182 @staticmethod
2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	183 def read(repo):
2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	184 """Initialize the merge state, reading it from disk."""
2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	185 ms = mergestate(repo)
27005 3185c01c551c mergestate: move _read() call to read constructor Siddharth Agarwal <sid0@fb.com> parents: 26991 diff changeset	186 ms._read()
26991 2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	187 return ms
2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	188
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	189 def __init__(self, repo):
27005 3185c01c551c mergestate: move _read() call to read constructor Siddharth Agarwal <sid0@fb.com> parents: 26991 diff changeset	190 """Initialize the merge state.
3185c01c551c mergestate: move _read() call to read constructor Siddharth Agarwal <sid0@fb.com> parents: 26991 diff changeset	191
3185c01c551c mergestate: move _read() call to read constructor Siddharth Agarwal <sid0@fb.com> parents: 26991 diff changeset	192 Do not use this directly! Instead call read() or clean()."""
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	193 self._repo = repo
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	194 self._dirty = False
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	195 self._labels = None
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	196
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	197 def reset(self, node=None, other=None, labels=None):
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	198 self._state = {}
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	199 self._stateextras = {}
21261 6ca05c46aa95 mergestate: consistently set variables to None Gregory Szorc <gregory.szorc@gmail.com> parents: 21203 diff changeset	200 self._local = None
6ca05c46aa95 mergestate: consistently set variables to None Gregory Szorc <gregory.szorc@gmail.com> parents: 21203 diff changeset	201 self._other = None
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	202 self._labels = labels
43421 be384a2052aa py3: don't use bytes with vars() or __dict__ Martin von Zweigbergk <martinvonz@google.com> parents: 43117 diff changeset	203 for var in ('localctx', 'otherctx'):
27130 6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	204 if var in vars(self):
6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	205 delattr(self, var)
7848 89e05c02a4af resolve: move reset to localrepo.commit Matt Mackall <mpm@selenic.com> parents: 7768 diff changeset	206 if node:
89e05c02a4af resolve: move reset to localrepo.commit Matt Mackall <mpm@selenic.com> parents: 7768 diff changeset	207 self._local = node
20591 02c60e380fd0 merge: record the "other" node in merge state Pierre-Yves David <pierre-yves.david@fb.com> parents: 20590 diff changeset	208 self._other = other
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	209 self._readmergedriver = None
26769 5b00ec4c05cb merge.mergestate: set merge driver state to 's' if there's none present Siddharth Agarwal <sid0@fb.com> parents: 26768 diff changeset	210 if self.mergedriver:
37113 1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37112 diff changeset	211 self._mdstate = MERGE_DRIVER_STATE_SUCCESS
26769 5b00ec4c05cb merge.mergestate: set merge driver state to 's' if there's none present Siddharth Agarwal <sid0@fb.com> parents: 26768 diff changeset	212 else:
37113 1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37112 diff changeset	213 self._mdstate = MERGE_DRIVER_STATE_UNMARKED
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	214 shutil.rmtree(self._repo.vfs.join(b'merge'), True)
27074 78b0c88ab0db mergestate._resolve: store return code and action for each file Siddharth Agarwal <sid0@fb.com> parents: 27049 diff changeset	215 self._results = {}
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	216 self._dirty = False
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	217
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	218 def _read(self):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	219 """Analyse each record content to restore a serialized state from disk
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	220
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	221 This function process "record" entry produced by the de-serialization
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	222 of on disk file.
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	223 """
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	224 self._state = {}
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	225 self._stateextras = {}
21261 6ca05c46aa95 mergestate: consistently set variables to None Gregory Szorc <gregory.szorc@gmail.com> parents: 21203 diff changeset	226 self._local = None
6ca05c46aa95 mergestate: consistently set variables to None Gregory Szorc <gregory.szorc@gmail.com> parents: 21203 diff changeset	227 self._other = None
43421 be384a2052aa py3: don't use bytes with vars() or __dict__ Martin von Zweigbergk <martinvonz@google.com> parents: 43117 diff changeset	228 for var in ('localctx', 'otherctx'):
27130 6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	229 if var in vars(self):
6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	230 delattr(self, var)
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	231 self._readmergedriver = None
37113 1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37112 diff changeset	232 self._mdstate = MERGE_DRIVER_STATE_SUCCESS
26986 1ee5e48f09d4 mergestate: raise structured exception for unsupported merge records Siddharth Agarwal <sid0@fb.com> parents: 26975 diff changeset	233 unsupported = set()
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	234 records = self._readrecords()
31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	235 for rtype, record in records:
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	236 if rtype == RECORD_LOCAL:
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	237 self._local = bin(record)
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	238 elif rtype == RECORD_OTHER:
20591 02c60e380fd0 merge: record the "other" node in merge state Pierre-Yves David <pierre-yves.david@fb.com> parents: 20590 diff changeset	239 self._other = bin(record)
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	240 elif rtype == RECORD_MERGE_DRIVER_STATE:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	241 bits = record.split(b'\0', 1)
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	242 mdstate = bits[1]
37113 1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37112 diff changeset	243 if len(mdstate) != 1 or mdstate not in (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	244 MERGE_DRIVER_STATE_UNMARKED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	245 MERGE_DRIVER_STATE_MARKED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	246 MERGE_DRIVER_STATE_SUCCESS,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	247 ):
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	248 # the merge driver should be idempotent, so just rerun it
37113 1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37112 diff changeset	249 mdstate = MERGE_DRIVER_STATE_UNMARKED
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	250
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	251 self._readmergedriver = bits[0]
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	252 self._mdstate = mdstate
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	253 elif rtype in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	254 RECORD_MERGED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	255 RECORD_CHANGEDELETE_CONFLICT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	256 RECORD_PATH_CONFLICT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	257 RECORD_MERGE_DRIVER_MERGE,
45204 7fc3c5fbc65f mergestate: fix BC breakage introduced because of removal of a merge record Pulkit Goyal <7895pulkit@gmail.com> parents: 45166 diff changeset	258 LEGACY_RECORD_RESOLVED_OTHER,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	259 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	260 bits = record.split(b'\0')
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	261 self._state[bits[0]] = bits[1:]
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	262 elif rtype == RECORD_FILE_VALUES:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	263 filename, rawextras = record.split(b'\0', 1)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	264 extraparts = rawextras.split(b'\0')
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	265 extras = {}
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	266 i = 0
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	267 while i < len(extraparts):
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	268 extras[extraparts[i]] = extraparts[i + 1]
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	269 i += 2
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	270
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	271 self._stateextras[filename] = extras
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	272 elif rtype == RECORD_LABELS:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	273 labels = record.split(b'\0', 2)
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	274 self._labels = [l for l in labels if len(l) > 0]
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	275 elif not rtype.islower():
26986 1ee5e48f09d4 mergestate: raise structured exception for unsupported merge records Siddharth Agarwal <sid0@fb.com> parents: 26975 diff changeset	276 unsupported.add(rtype)
45166 a5be403dd7a0 mergestate: document what mergestate._results is for Pulkit Goyal <7895pulkit@gmail.com> parents: 45165 diff changeset	277 # contains a mapping of form:
a5be403dd7a0 mergestate: document what mergestate._results is for Pulkit Goyal <7895pulkit@gmail.com> parents: 45165 diff changeset	278 # {filename : (merge_return_value, action_to_be_performed}
a5be403dd7a0 mergestate: document what mergestate._results is for Pulkit Goyal <7895pulkit@gmail.com> parents: 45165 diff changeset	279 # these are results of re-running merge process
a5be403dd7a0 mergestate: document what mergestate._results is for Pulkit Goyal <7895pulkit@gmail.com> parents: 45165 diff changeset	280 # this dict is used to perform actions on dirstate caused by re-running
a5be403dd7a0 mergestate: document what mergestate._results is for Pulkit Goyal <7895pulkit@gmail.com> parents: 45165 diff changeset	281 # the merge
27074 78b0c88ab0db mergestate._resolve: store return code and action for each file Siddharth Agarwal <sid0@fb.com> parents: 27049 diff changeset	282 self._results = {}
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	283 self._dirty = False
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	284
26986 1ee5e48f09d4 mergestate: raise structured exception for unsupported merge records Siddharth Agarwal <sid0@fb.com> parents: 26975 diff changeset	285 if unsupported:
1ee5e48f09d4 mergestate: raise structured exception for unsupported merge records Siddharth Agarwal <sid0@fb.com> parents: 26975 diff changeset	286 raise error.UnsupportedMergeRecords(unsupported)
1ee5e48f09d4 mergestate: raise structured exception for unsupported merge records Siddharth Agarwal <sid0@fb.com> parents: 26975 diff changeset	287
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	288 def _readrecords(self):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	289 """Read merge state from disk and return a list of record (TYPE, data)
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	290
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20945 diff changeset	291 We read data from both v1 and v2 files and decide which one to use.
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	292
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20945 diff changeset	293 V1 has been used by version prior to 2.9.1 and contains less data than
7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20945 diff changeset	294 v2. We read both versions and check if no data in v2 contradicts
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	295 v1. If there is not contradiction we can safely assume that both v1
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	296 and v2 were written at the same time and use the extract data in v2. If
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	297 there is contradiction we ignore v2 content as we assume an old version
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20945 diff changeset	298 of Mercurial has overwritten the mergestate file and left an old v2
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	299 file around.
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	300
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	301 returns list of record [(TYPE, data), ...]"""
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	302 v1records = self._readrecordsv1()
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	303 v2records = self._readrecordsv2()
26500 5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	304 if self._v1v2match(v1records, v2records):
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	305 return v2records
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	306 else:
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	307 # v1 file is newer than v2 file, use it
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	308 # we have to infer the "other" changeset of the merge
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	309 # we cannot do better than that with v1 of the format
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	310 mctx = self._repo[None].parents()[-1]
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	311 v1records.append((RECORD_OTHER, mctx.hex()))
26500 5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	312 # add place holder "other" file node information
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	313 # nobody is using it yet so we do no need to fetch the data
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	314 # if mctx was wrong `mctx[bits[-2]]` may fails.
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	315 for idx, r in enumerate(v1records):
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	316 if r[0] == RECORD_MERGED:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	317 bits = r[1].split(b'\0')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	318 bits.insert(-2, b'')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	319 v1records[idx] = (r[0], b'\0'.join(bits))
26500 5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	320 return v1records
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	321
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	322 def _v1v2match(self, v1records, v2records):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	323 oldv2 = set() # old format version of v2 record
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	324 for rec in v2records:
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	325 if rec[0] == RECORD_LOCAL:
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	326 oldv2.add(rec)
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	327 elif rec[0] == RECORD_MERGED:
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	328 # drop the onode data (not contained in v1)
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	329 oldv2.add((RECORD_MERGED, _droponode(rec[1])))
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	330 for rec in v1records:
3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	331 if rec not in oldv2:
26500 5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	332 return False
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	333 else:
26500 5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	334 return True
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	335
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	336 def _readrecordsv1(self):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	337 """read on disk merge state for version 1 file
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	338
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	339 returns list of record [(TYPE, data), ...]
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	340
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	341 Note: the "F" data from this file are one entry short
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	342 (no "other file node" entry)
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	343 """
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	344 records = []
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	345 try:
23877 7cc77030c557 localrepo: remove all external users of localrepo.opener Angel Ezquerra <angel.ezquerra@gmail.com> parents: 23656 diff changeset	346 f = self._repo.vfs(self.statepathv1)
6530 4b92591c69a7 merge: replace readline() call, missing from posixfile_nt Patrick Mezard <pmezard@gmail.com> parents: 6518 diff changeset	347 for i, l in enumerate(f):
4b92591c69a7 merge: replace readline() call, missing from posixfile_nt Patrick Mezard <pmezard@gmail.com> parents: 6518 diff changeset	348 if i == 0:
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	349 records.append((RECORD_LOCAL, l[:-1]))
6530 4b92591c69a7 merge: replace readline() call, missing from posixfile_nt Patrick Mezard <pmezard@gmail.com> parents: 6518 diff changeset	350 else:
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	351 records.append((RECORD_MERGED, l[:-1]))
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13323 diff changeset	352 f.close()
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25151 diff changeset	353 except IOError as err:
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	354 if err.errno != errno.ENOENT:
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	355 raise
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	356 return records
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	357
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	358 def _readrecordsv2(self):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	359 """read on disk merge state for version 2 file
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	360
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	361 This format is a list of arbitrary records of the form:
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	362
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	363 [type][length][content]
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	364
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	365 `type` is a single character, `length` is a 4 byte integer, and
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	366 `content` is an arbitrary byte sequence of length `length`.
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	367
27027 a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	368 Mercurial versions prior to 3.7 have a bug where if there are
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	369 unsupported mandatory merge records, attempting to clear out the merge
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	370 state with hg update --clean or similar aborts. The 't' record type
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	371 works around that by writing out what those versions treat as an
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	372 advisory record, but later versions interpret as special: the first
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	373 character is the 'real' record type and everything onwards is the data.
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	374
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	375 Returns list of records [(TYPE, data), ...]."""
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	376 records = []
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	377 try:
23877 7cc77030c557 localrepo: remove all external users of localrepo.opener Angel Ezquerra <angel.ezquerra@gmail.com> parents: 23656 diff changeset	378 f = self._repo.vfs(self.statepathv2)
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	379 data = f.read()
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	380 off = 0
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	381 end = len(data)
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	382 while off < end:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	383 rtype = data[off : off + 1]
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	384 off += 1
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	385 length = _unpack(b'>I', data[off : (off + 4)])[0]
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	386 off += 4
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	387 record = data[off : (off + length)]
20607 abd448767465 merge: fix spelling of length Olle Lundberg <geek@nerd.sh> parents: 20594 diff changeset	388 off += length
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	389 if rtype == RECORD_OVERRIDE:
36566 1d99260c3a81 py3: slice over bytes to prevent getting ascii values Pulkit Goyal <7895pulkit@gmail.com> parents: 36507 diff changeset	390 rtype, record = record[0:1], record[1:]
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	391 records.append((rtype, record))
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	392 f.close()
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25151 diff changeset	393 except IOError as err:
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	394 if err.errno != errno.ENOENT:
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	395 raise
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	396 return records
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	397
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	398 @util.propertycache
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	399 def mergedriver(self):
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	400 # protect against the following:
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	401 # - A configures a malicious merge driver in their hgrc, then
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	402 # pauses the merge
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	403 # - A edits their hgrc to remove references to the merge driver
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	404 # - A gives a copy of their entire repo, including .hg, to B
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	405 # - B inspects .hgrc and finds it to be clean
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	406 # - B then continues the merge and the malicious merge driver
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	407 # gets invoked
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	408 configmergedriver = self._repo.ui.config(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	409 b'experimental', b'mergedriver'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	410 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	411 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	412 self._readmergedriver is not None
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	413 and self._readmergedriver != configmergedriver
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	414 ):
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	415 raise error.ConfigError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	416 _(b"merge driver changed since merge started"),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	417 hint=_(b"revert merge driver change or abort merge"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	418 )
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	419
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	420 return configmergedriver
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	421
26765 45976219eb80 merge.mergestate: add a way to get the other side of the merge Siddharth Agarwal <sid0@fb.com> parents: 26752 diff changeset	422 @util.propertycache
44289 b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	423 def local(self):
27130 6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	424 if self._local is None:
44289 b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	425 msg = b"local accessed but self._local isn't set"
31651 e960eba3581c merge: use ProgrammingError Jun Wu <quark@fb.com> parents: 31522 diff changeset	426 raise error.ProgrammingError(msg)
44289 b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	427 return self._local
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	428
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	429 @util.propertycache
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	430 def localctx(self):
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	431 return self._repo[self.local]
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	432
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	433 @util.propertycache
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	434 def other(self):
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	435 if self._other is None:
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	436 msg = b"other accessed but self._other isn't set"
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	437 raise error.ProgrammingError(msg)
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	438 return self._other
27130 6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	439
6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	440 @util.propertycache
26765 45976219eb80 merge.mergestate: add a way to get the other side of the merge Siddharth Agarwal <sid0@fb.com> parents: 26752 diff changeset	441 def otherctx(self):
44289 b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44286 diff changeset	442 return self._repo[self.other]
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	443
21264 4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	444 def active(self):
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	445 """Whether mergestate is active.
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	446
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	447 Returns True if there appears to be mergestate. This is a rough proxy
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	448 for "is a merge in progress."
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	449 """
44425 5e3402a0b868 mergestate: determine if active without looking for state files on disk Martin von Zweigbergk <martinvonz@google.com> parents: 44414 diff changeset	450 return bool(self._local) or bool(self._state)
21264 4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	451
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	452 def commit(self):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	453 """Write current state on disk (if necessary)"""
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	454 if self._dirty:
27006 9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	455 records = self._makerecords()
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	456 self._writerecords(records)
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	457 self._dirty = False
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	458
27006 9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	459 def _makerecords(self):
9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	460 records = []
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	461 records.append((RECORD_LOCAL, hex(self._local)))
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	462 records.append((RECORD_OTHER, hex(self._other)))
27006 9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	463 if self.mergedriver:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	464 records.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	465 (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	466 RECORD_MERGE_DRIVER_STATE,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	467 b'\0'.join([self.mergedriver, self._mdstate]),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	468 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	469 )
34560 1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	470 # Write out state items. In all cases, the value of the state map entry
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	471 # is written as the contents of the record. The record type depends on
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	472 # the type of state that is stored, and capital-letter records are used
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	473 # to prevent older versions of Mercurial that do not support the feature
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	474 # from loading them.
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	475 for filename, v in pycompat.iteritems(self._state):
37114 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37113 diff changeset	476 if v[0] == MERGE_RECORD_DRIVER_RESOLVED:
34560 1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	477 # Driver-resolved merge. These are stored in 'D' records.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	478 records.append(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	479 (RECORD_MERGE_DRIVER_MERGE, b'\0'.join([filename] + v))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	480 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	481 elif v[0] in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	482 MERGE_RECORD_UNRESOLVED_PATH,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	483 MERGE_RECORD_RESOLVED_PATH,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	484 ):
34560 1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	485 # Path conflicts. These are stored in 'P' records. The current
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	486 # resolution state ('pu' or 'pr') is stored within the record.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	487 records.append(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	488 (RECORD_PATH_CONFLICT, b'\0'.join([filename] + v))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	489 )
44688 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	490 elif v[0] == MERGE_RECORD_MERGED_OTHER:
45160 fcd0cff3400a mergestate: remove unrequired RECORD_RESOLVED_OTHER record Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	491 records.append((RECORD_MERGED, b'\0'.join([filename] + v)))
27031 8be0af32e513 mergestate: allow storing and retrieving change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27027 diff changeset	492 elif v[1] == nullhex or v[6] == nullhex:
34560 1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	493 # Change/Delete or Delete/Change conflicts. These are stored in
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	494 # 'C' records. v[1] is the local file, and is nullhex when the
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	495 # file is deleted locally ('dc'). v[6] is the remote file, and
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	496 # is nullhex when the file is deleted remotely ('cd').
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	497 records.append(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	498 (RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	499 )
27006 9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	500 else:
34560 1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	501 # Normal files. These are stored in 'F' records.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	502 records.append((RECORD_MERGED, b'\0'.join([filename] + v)))
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	503 for filename, extras in sorted(pycompat.iteritems(self._stateextras)):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	504 rawextras = b'\0'.join(
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	505 b'%s\0%s' % (k, v) for k, v in pycompat.iteritems(extras)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	506 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	507 records.append(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	508 (RECORD_FILE_VALUES, b'%s\0%s' % (filename, rawextras))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	509 )
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	510 if self._labels is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	511 labels = b'\0'.join(self._labels)
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	512 records.append((RECORD_LABELS, labels))
27006 9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	513 return records
9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	514
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	515 def _writerecords(self, records):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	516 """Write current state on disk (both v1 and v2)"""
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	517 self._writerecordsv1(records)
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	518 self._writerecordsv2(records)
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	519
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	520 def _writerecordsv1(self, records):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	521 """Write current state on disk in a version 1 file"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	522 f = self._repo.vfs(self.statepathv1, b'wb')
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	523 irecords = iter(records)
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 29148 diff changeset	524 lrecords = next(irecords)
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	525 assert lrecords[0] == RECORD_LOCAL
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	526 f.write(hex(self._local) + b'\n')
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	527 for rtype, data in irecords:
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	528 if rtype == RECORD_MERGED:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	529 f.write(b'%s\n' % _droponode(data))
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	530 f.close()
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	531
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	532 def _writerecordsv2(self, records):
27027 a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	533 """Write current state on disk in a version 2 file
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	534
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	535 See the docstring for _readrecordsv2 for why we use 't'."""
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	536 # these are the records that all version 2 clients can read
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	537 allowlist = (RECORD_LOCAL, RECORD_OTHER, RECORD_MERGED)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	538 f = self._repo.vfs(self.statepathv2, b'wb')
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	539 for key, data in records:
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	540 assert len(key) == 1
37112 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	541 if key not in allowlist:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	542 key, data = RECORD_OVERRIDE, b'%s%s' % (key, data)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	543 format = b'>sI%is' % len(data)
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	544 f.write(_pack(format, key, len(data), data))
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	545 f.close()
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	546
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41053 diff changeset	547 @staticmethod
8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41053 diff changeset	548 def getlocalkey(path):
8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41053 diff changeset	549 """hash the path of a local file context for storage in the .hg/merge
8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41053 diff changeset	550 directory."""
8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41053 diff changeset	551
44060 a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43816 diff changeset	552 return hex(hashutil.sha1(path).digest())
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41053 diff changeset	553
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	554 def add(self, fcl, fco, fca, fd):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	555 """add a new (potentially?) conflicting file the merge state
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	556 fcl: file context for local,
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	557 fco: file context for remote,
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	558 fca: file context for ancestors,
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	559 fd: file path of the resulting merge.
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	560
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	561 note: also write the local version to the `.hg/merge` directory.
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	562 """
27049 0d61f7ec7f76 mergestate.add: store absentfilectxes as nullhex Siddharth Agarwal <sid0@fb.com> parents: 27048 diff changeset	563 if fcl.isabsent():
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41053 diff changeset	564 localkey = nullhex
27049 0d61f7ec7f76 mergestate.add: store absentfilectxes as nullhex Siddharth Agarwal <sid0@fb.com> parents: 27048 diff changeset	565 else:
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41053 diff changeset	566 localkey = mergestate.getlocalkey(fcl.path())
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	567 self._repo.vfs.write(b'merge/' + localkey, fcl.data())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	568 self._state[fd] = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	569 MERGE_RECORD_UNRESOLVED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	570 localkey,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	571 fcl.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	572 fca.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	573 hex(fca.filenode()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	574 fco.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	575 hex(fco.filenode()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	576 fcl.flags(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	577 ]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	578 self._stateextras[fd] = {b'ancestorlinknode': hex(fca.node())}
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	579 self._dirty = True
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	580
45159 e05a488cbed0 mergestate: rename addpath() -> addpathonflict() to prevent confusion Pulkit Goyal <7895pulkit@gmail.com> parents: 44980 diff changeset	581 def addpathconflict(self, path, frename, forigin):
34545 1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	582 """add a new conflicting path to the merge state
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	583 path: the path that conflicts
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	584 frename: the filename the conflicting file was renamed to
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	585 forigin: origin of the file ('l' or 'r' for local/remote)
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	586 """
37114 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37113 diff changeset	587 self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin]
34545 1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	588 self._dirty = True
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	589
44688 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	590 def addmergedother(self, path):
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	591 self._state[path] = [MERGE_RECORD_MERGED_OTHER, nullhex, nullhex]
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	592 self._dirty = True
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	593
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	594 def __contains__(self, dfile):
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	595 return dfile in self._state
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	596
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	597 def __getitem__(self, dfile):
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	598 return self._state[dfile][0]
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	599
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	600 def __iter__(self):
21268 a0b8a912ec81 merge: simplify mergestate iter Mads Kiilerich <mads@kiilerich.com> parents: 21266 diff changeset	601 return iter(sorted(self._state))
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	602
19285 feaf5749d7a4 merge: add a files method to the mergestate class Bryan O'Sullivan <bryano@fb.com> parents: 19226 diff changeset	603 def files(self):
feaf5749d7a4 merge: add a files method to the mergestate class Bryan O'Sullivan <bryano@fb.com> parents: 19226 diff changeset	604 return self._state.keys()
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	605
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	606 def mark(self, dfile, state):
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	607 self._state[dfile][0] = state
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	608 self._dirty = True
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	609
26766 a83110faece1 merge.mergestate: add a way to get the merge driver state Siddharth Agarwal <sid0@fb.com> parents: 26765 diff changeset	610 def mdstate(self):
a83110faece1 merge.mergestate: add a way to get the merge driver state Siddharth Agarwal <sid0@fb.com> parents: 26765 diff changeset	611 return self._mdstate
a83110faece1 merge.mergestate: add a way to get the merge driver state Siddharth Agarwal <sid0@fb.com> parents: 26765 diff changeset	612
21266 19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	613 def unresolved(self):
19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	614 """Obtain the paths of unresolved files."""
19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	615
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	616 for f, entry in pycompat.iteritems(self._state):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	617 if entry[0] in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	618 MERGE_RECORD_UNRESOLVED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	619 MERGE_RECORD_UNRESOLVED_PATH,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	620 ):
21266 19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	621 yield f
19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	622
26740 f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	623 def driverresolved(self):
f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	624 """Obtain the paths of driver-resolved files."""
f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	625
f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	626 for f, entry in self._state.items():
37114 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37113 diff changeset	627 if entry[0] == MERGE_RECORD_DRIVER_RESOLVED:
26740 f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	628 yield f
f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	629
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	630 def extras(self, filename):
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	631 return self._stateextras.setdefault(filename, {})
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	632
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	633 def _resolve(self, preresolve, dfile, wctx):
45165 01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	634 """rerun merge process for file path `dfile`.
01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	635 Returns whether the merge was completed and the return value of merge
01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	636 obtained from filemerge._filemerge().
01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	637 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	638 if self[dfile] in (MERGE_RECORD_RESOLVED, MERGE_RECORD_DRIVER_RESOLVED):
26616 2f1fce0d4e86 merge.mergestate._resolve: also return completed status Siddharth Agarwal <sid0@fb.com> parents: 26615 diff changeset	639 return True, 0
44688 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	640 if self._state[dfile][0] == MERGE_RECORD_MERGED_OTHER:
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	641 return True, 0
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	642 stateentry = self._state[dfile]
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41053 diff changeset	643 state, localkey, lfile, afile, anode, ofile, onode, flags = stateentry
20594 ba619c50a355 resolve: use "other" changeset from merge state (issue4163) Pierre-Yves David <pierre-yves.david@fb.com> parents: 20593 diff changeset	644 octx = self._repo[self._other]
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	645 extras = self.extras(dfile)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	646 anccommitnode = extras.get(b'ancestorlinknode')
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	647 if anccommitnode:
8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	648 actx = self._repo[anccommitnode]
8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	649 else:
8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	650 actx = None
44930 17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44915 diff changeset	651 fcd = _filectxorabsent(localkey, wctx, dfile)
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44915 diff changeset	652 fco = _filectxorabsent(onode, octx, ofile)
27048 86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	653 # TODO: move this to filectxorabsent
37174 daef13da66fe context: avoid using a context object as a changeid Martin von Zweigbergk <martinvonz@google.com> parents: 37128 diff changeset	654 fca = self._repo.filectx(afile, fileid=anode, changectx=actx)
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	655 # "premerge" x flags
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	656 flo = fco.flags()
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	657 fla = fca.flags()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	658 if b'x' in flags + flo + fla and b'l' not in flags + flo + fla:
30161 339f9d93daa6 merge: only show "cannot merge flags for %s" warning if flags are different Mads Kiilerich <madski@unity3d.com> parents: 30096 diff changeset	659 if fca.node() == nullid and flags != flo:
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	660 if preresolve:
dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	661 self._repo.ui.warn(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	662 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	663 b'warning: cannot merge flags for %s '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	664 b'without common ancestor - keeping local flags\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	665 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	666 % afile
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	667 )
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	668 elif flags == fla:
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	669 flags = flo
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	670 if preresolve:
dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	671 # restore local
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41053 diff changeset	672 if localkey != nullhex:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	673 f = self._repo.vfs(b'merge/' + localkey)
33095 05c680ebf512 merge: convert repo.wwrite() calls to wctx[f].write() Phil Cohen <phillco@fb.com> parents: 33094 diff changeset	674 wctx[dfile].write(f.read(), flags)
27048 86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	675 f.close()
86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	676 else:
33094 f9e50ee4c52b merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove() Phil Cohen <phillco@fb.com> parents: 33093 diff changeset	677 wctx[dfile].remove(ignoremissing=True)
45165 01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	678 complete, merge_ret, deleted = filemerge.premerge(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	679 self._repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	680 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	681 self._local,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	682 lfile,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	683 fcd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	684 fco,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	685 fca,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	686 labels=self._labels,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	687 )
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	688 else:
45165 01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	689 complete, merge_ret, deleted = filemerge.filemerge(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	690 self._repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	691 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	692 self._local,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	693 lfile,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	694 fcd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	695 fco,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	696 fca,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	697 labels=self._labels,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	698 )
45165 01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	699 if merge_ret is None:
01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	700 # If return value of merge is None, then there are no real conflict
13536 fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	701 del self._state[dfile]
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	702 self._stateextras.pop(dfile, None)
20792 89059c450c56 merge: mark mergestate as dirty when resolve changes _state Mads Kiilerich <madski@unity3d.com> parents: 20652 diff changeset	703 self._dirty = True
45165 01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	704 elif not merge_ret:
37114 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37113 diff changeset	705 self.mark(dfile, MERGE_RECORD_RESOLVED)
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	706
de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	707 if complete:
27075 6373330155b2 mergestate._resolve: don't return the action any more Siddharth Agarwal <sid0@fb.com> parents: 27074 diff changeset	708 action = None
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	709 if deleted:
27122 77d760ba8dcd mergestate: explicitly forget 'dc' conflicts where the deleted side is picked Siddharth Agarwal <sid0@fb.com> parents: 27121 diff changeset	710 if fcd.isabsent():
77d760ba8dcd mergestate: explicitly forget 'dc' conflicts where the deleted side is picked Siddharth Agarwal <sid0@fb.com> parents: 27121 diff changeset	711 # dc: local picked. Need to drop if present, which may
77d760ba8dcd mergestate: explicitly forget 'dc' conflicts where the deleted side is picked Siddharth Agarwal <sid0@fb.com> parents: 27121 diff changeset	712 # happen on re-resolves.
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	713 action = ACTION_FORGET
27122 77d760ba8dcd mergestate: explicitly forget 'dc' conflicts where the deleted side is picked Siddharth Agarwal <sid0@fb.com> parents: 27121 diff changeset	714 else:
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	715 # cd: remote picked (or otherwise deleted)
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	716 action = ACTION_REMOVE
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	717 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	718 if fcd.isabsent(): # dc: remote picked
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	719 action = ACTION_GET
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	720 elif fco.isabsent(): # cd: local picked
27131 d837da26155e merge: add a new action type representing files to add/mark as modified Siddharth Agarwal <sid0@fb.com> parents: 27130 diff changeset	721 if dfile in self.localctx:
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	722 action = ACTION_ADD_MODIFIED
27131 d837da26155e merge: add a new action type representing files to add/mark as modified Siddharth Agarwal <sid0@fb.com> parents: 27130 diff changeset	723 else:
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	724 action = ACTION_ADD
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	725 # else: regular merges (no action necessary)
45165 01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	726 self._results[dfile] = merge_ret, action
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	727
45165 01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	728 return complete, merge_ret
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	729
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	730 def preresolve(self, dfile, wctx):
26870 ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	731 """run premerge process for dfile
ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	732
ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	733 Returns whether the merge is complete, and the exit code."""
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	734 return self._resolve(True, dfile, wctx)
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	735
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	736 def resolve(self, dfile, wctx):
26870 ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	737 """run merge process (assuming premerge was run) for dfile
ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	738
ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	739 Returns the exit code of the merge."""
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	740 return self._resolve(False, dfile, wctx)[1]
26615 c9223a3979b7 merge.mergestate: add a wrapper around resolve Siddharth Agarwal <sid0@fb.com> parents: 26611 diff changeset	741
27076 09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	742 def counts(self):
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	743 """return counts for updated, merged and removed files in this
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	744 session"""
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	745 updated, merged, removed = 0, 0, 0
43104 74802979dd9d py3: define and use pycompat.itervalues() Gregory Szorc <gregory.szorc@gmail.com> parents: 43090 diff changeset	746 for r, action in pycompat.itervalues(self._results):
27076 09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	747 if r is None:
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	748 updated += 1
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	749 elif r == 0:
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	750 if action == ACTION_REMOVE:
27076 09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	751 removed += 1
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	752 else:
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	753 merged += 1
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	754 return updated, merged, removed
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	755
27077 ca3fbf9dad8c mergestate: add a function to return the number of unresolved files Siddharth Agarwal <sid0@fb.com> parents: 27076 diff changeset	756 def unresolvedcount(self):
ca3fbf9dad8c mergestate: add a function to return the number of unresolved files Siddharth Agarwal <sid0@fb.com> parents: 27076 diff changeset	757 """get unresolved count for this merge (persistent)"""
33311 f8f716da90fa mergestate: implement unresolvedcount() in terms of unresolved() Martin von Zweigbergk <martinvonz@google.com> parents: 33310 diff changeset	758 return len(list(self.unresolved()))
27077 ca3fbf9dad8c mergestate: add a function to return the number of unresolved files Siddharth Agarwal <sid0@fb.com> parents: 27076 diff changeset	759
27079 a88a10a933b2 mergestate: add a method to compute actions to perform on dirstate Siddharth Agarwal <sid0@fb.com> parents: 27078 diff changeset	760 def actions(self):
a88a10a933b2 mergestate: add a method to compute actions to perform on dirstate Siddharth Agarwal <sid0@fb.com> parents: 27078 diff changeset	761 """return lists of actions to perform on the dirstate"""
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	762 actions = {
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	763 ACTION_REMOVE: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	764 ACTION_FORGET: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	765 ACTION_ADD: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	766 ACTION_ADD_MODIFIED: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	767 ACTION_GET: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	768 }
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	769 for f, (r, action) in pycompat.iteritems(self._results):
27079 a88a10a933b2 mergestate: add a method to compute actions to perform on dirstate Siddharth Agarwal <sid0@fb.com> parents: 27078 diff changeset	770 if action is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	771 actions[action].append((f, None, b"merge result"))
27079 a88a10a933b2 mergestate: add a method to compute actions to perform on dirstate Siddharth Agarwal <sid0@fb.com> parents: 27078 diff changeset	772 return actions
a88a10a933b2 mergestate: add a method to compute actions to perform on dirstate Siddharth Agarwal <sid0@fb.com> parents: 27078 diff changeset	773
27090 ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	774 def queueremove(self, f):
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	775 """queues a file to be removed from the dirstate
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	776
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	777 Meant for use by custom merge drivers."""
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	778 self._results[f] = 0, ACTION_REMOVE
27090 ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	779
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	780 def queueadd(self, f):
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	781 """queues a file to be added to the dirstate
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	782
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	783 Meant for use by custom merge drivers."""
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	784 self._results[f] = 0, ACTION_ADD
27090 ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	785
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	786 def queueget(self, f):
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	787 """queues a file to be marked modified in the dirstate
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	788
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	789 Meant for use by custom merge drivers."""
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	790 self._results[f] = 0, ACTION_GET
27090 ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	791
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	792
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	793 def recordupdates(repo, actions, branchmerge, getfiledata):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43752 diff changeset	794 """record merge actions to the dirstate"""
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	795 # remove (must come first)
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	796 for f, args, msg in actions.get(ACTION_REMOVE, []):
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	797 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	798 repo.dirstate.remove(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	799 else:
21389 e741972017d9 merge: change priority / ordering of merge actions Mads Kiilerich <madski@unity3d.com> parents: 21269 diff changeset	800 repo.dirstate.drop(f)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	801
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	802 # forget (must come first)
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	803 for f, args, msg in actions.get(ACTION_FORGET, []):
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	804 repo.dirstate.drop(f)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	805
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	806 # resolve path conflicts
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	807 for f, args, msg in actions.get(ACTION_PATH_CONFLICT_RESOLVE, []):
44980 818b4f19ef23 merge: move an inspection of the dirstate from record to calculate phase Martin von Zweigbergk <martinvonz@google.com> parents: 44930 diff changeset	808 (f0, origf0) = args
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	809 repo.dirstate.add(f)
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	810 repo.dirstate.copy(origf0, f)
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	811 if f0 == origf0:
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	812 repo.dirstate.remove(f0)
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	813 else:
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	814 repo.dirstate.drop(f0)
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	815
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	816 # re-add
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	817 for f, args, msg in actions.get(ACTION_ADD, []):
27132 baa7571f40c5 merge.recordupdates: mark 'a' files as added unconditionally Siddharth Agarwal <sid0@fb.com> parents: 27131 diff changeset	818 repo.dirstate.add(f)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	819
27131 d837da26155e merge: add a new action type representing files to add/mark as modified Siddharth Agarwal <sid0@fb.com> parents: 27130 diff changeset	820 # re-add/mark as modified
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	821 for f, args, msg in actions.get(ACTION_ADD_MODIFIED, []):
27131 d837da26155e merge: add a new action type representing files to add/mark as modified Siddharth Agarwal <sid0@fb.com> parents: 27130 diff changeset	822 if branchmerge:
d837da26155e merge: add a new action type representing files to add/mark as modified Siddharth Agarwal <sid0@fb.com> parents: 27130 diff changeset	823 repo.dirstate.normallookup(f)
d837da26155e merge: add a new action type representing files to add/mark as modified Siddharth Agarwal <sid0@fb.com> parents: 27130 diff changeset	824 else:
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	825 repo.dirstate.add(f)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	826
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	827 # exec change
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	828 for f, args, msg in actions.get(ACTION_EXEC, []):
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	829 repo.dirstate.normallookup(f)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	830
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	831 # keep
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	832 for f, args, msg in actions.get(ACTION_KEEP, []):
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	833 pass
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	834
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	835 # get
42529 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42472 diff changeset	836 for f, args, msg in actions.get(ACTION_GET, []):
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	837 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	838 repo.dirstate.otherparent(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	839 else:
42529 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42472 diff changeset	840 parentfiledata = getfiledata[f] if getfiledata else None
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	841 repo.dirstate.normal(f, parentfiledata=parentfiledata)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	842
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	843 # merge
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	844 for f, args, msg in actions.get(ACTION_MERGE, []):
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	845 f1, f2, fa, move, anc = args
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	846 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	847 # We've done a branch merge, mark this file as merged
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	848 # so that we properly record the merger later
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	849 repo.dirstate.merge(f)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	850 if f1 != f2: # copy/rename
3308 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3307 diff changeset	851 if move:
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	852 repo.dirstate.remove(f1)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	853 if f1 != f:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	854 repo.dirstate.copy(f1, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	855 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	856 repo.dirstate.copy(f2, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	857 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	858 # We've update-merged a locally modified file, so
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	859 # we set the dirstate to emulate a normal checkout
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	860 # of that file some time in the past. Thus our
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	861 # merge will appear as a normal local file
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	862 # modification.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	863 if f2 == f: # file not locally copied/moved
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	864 repo.dirstate.normallookup(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	865 if move:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	866 repo.dirstate.drop(f1)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	867
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	868 # directory rename, move local
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	869 for f, args, msg in actions.get(ACTION_DIR_RENAME_MOVE_LOCAL, []):
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	870 f0, flag = args
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	871 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	872 repo.dirstate.add(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	873 repo.dirstate.remove(f0)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	874 repo.dirstate.copy(f0, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	875 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	876 repo.dirstate.normal(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	877 repo.dirstate.drop(f0)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	878
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	879 # directory rename, get
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	880 for f, args, msg in actions.get(ACTION_LOCAL_DIR_RENAME_GET, []):
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	881 f0, flag = args
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	882 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	883 repo.dirstate.add(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	884 repo.dirstate.copy(f0, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	885 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	886 repo.dirstate.normal(f)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/mergestate.py @ 45204:7fc3c5fbc65f stable 5.5