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

annotate mercurial/mergestate.py @ 45625:c11099cc1de4

log: map --removed to walkopts.force_changelog_traversal This is the flag to forcibly enable the slowpath. I'm not sure if the slowpath parameter should be merged with this flag, so let's keep it as an immutable flag for now. I'll add another flag to support "grep --all-files". These two will be the flags which aren't directly mapped from the command-line options.

author	Yuya Nishihara <yuya@tcha.org>
date	Sat, 12 Sep 2020 21:54:58 +0900
parents	9f14bb4d59ea
children	ecf6d7aa874b

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
45381 ede4c121239e mergestate: use collections.defaultdict(dict) for _stateextras Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	3 import collections
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	4 import errno
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	5 import shutil
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	6 import struct
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	7
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	8 from .i18n import _
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	9 from .node import (
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	10 bin,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	11 hex,
27031 8be0af32e513 mergestate: allow storing and retrieving change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27027 diff changeset	12 nullhex,
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	13 nullid,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	14 )
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,
30519 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30486 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: 43798 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: 42972 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: 42972 diff changeset	33
44871 17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44856 diff changeset	34 def _filectxorabsent(hexnode, ctx, f):
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44856 diff changeset	35 if hexnode == nullhex:
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44856 diff changeset	36 return filemerge.absentfilectx(ctx, f)
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44856 diff changeset	37 else:
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44856 diff changeset	38 return ctx[f]
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44856 diff changeset	39
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44856 diff changeset	40
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 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 #####
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	47 RECORD_LOCAL = b'L'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 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'
9abdc0bd2ab9 mergestate: add comments about couple of record types and minor reorder Pulkit Goyal <7895pulkit@gmail.com> parents: 45160 diff changeset	51
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	52 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	53 # 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	54 # 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	55 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	56 RECORD_FILE_VALUES = b'f'
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 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	59 # 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	60 # 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	61 # 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	62 # exists
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	63 #####
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	64 RECORD_MERGED = b'F'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	65 RECORD_CHANGEDELETE_CONFLICT = b'C'
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	66 # the path was dir on one side of merge and file on another
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	67 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	68
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	69 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	70 # 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	71 # merge records mentioned just above.
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	72 #####
37111 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	73 MERGE_RECORD_UNRESOLVED = b'u'
aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	74 MERGE_RECORD_RESOLVED = b'r'
aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	75 MERGE_RECORD_UNRESOLVED_PATH = b'pu'
aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	76 MERGE_RECORD_RESOLVED_PATH = b'pr'
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	77 # 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: 44452 diff changeset	78 # of other version. This info is used on commit.
45382 0652a533fe3c mergestate: use _stateextras instead of merge records for commit related info Pulkit Goyal <7895pulkit@gmail.com> parents: 45381 diff changeset	79 # This is now deprecated and commit related information is now
0652a533fe3c mergestate: use _stateextras instead of merge records for commit related info Pulkit Goyal <7895pulkit@gmail.com> parents: 45381 diff changeset	80 # stored in RECORD_FILE_VALUES
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	81 MERGE_RECORD_MERGED_OTHER = b'o'
37111 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	82
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	83 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	84 # 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	85 # exists
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	86 #####
f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	87 RECORD_OVERRIDE = b't'
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 #####
45271 7fc3c5fbc65f mergestate: fix BC breakage introduced because of removal of a merge record Pulkit Goyal <7895pulkit@gmail.com> parents: 45166 diff changeset	90 # 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	91 #####
7fc3c5fbc65f mergestate: fix BC breakage introduced because of removal of a merge record Pulkit Goyal <7895pulkit@gmail.com> parents: 45166 diff changeset	92 # 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	93 LEGACY_RECORD_RESOLVED_OTHER = b'R'
45518 32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	94 # This record was release in 3.7 and usage was removed in 5.6
32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	95 LEGACY_RECORD_DRIVER_RESOLVED = b'd'
32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	96 # This record was release in 3.7 and usage was removed in 5.6
32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	97 LEGACY_MERGE_DRIVER_STATE = b'm'
32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	98 # This record was release in 3.7 and usage was removed in 5.6
32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	99 LEGACY_MERGE_DRIVER_MERGE = b'D'
45271 7fc3c5fbc65f mergestate: fix BC breakage introduced because of removal of a merge record Pulkit Goyal <7895pulkit@gmail.com> parents: 45166 diff changeset	100
45163 f69253935bf8 mergestate: document mergestate records in an organized way Pulkit Goyal <7895pulkit@gmail.com> parents: 45162 diff changeset	101
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	102 ACTION_FORGET = b'f'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	103 ACTION_REMOVE = b'r'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	104 ACTION_ADD = b'a'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	105 ACTION_GET = b'g'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	106 ACTION_PATH_CONFLICT = b'p'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	107 ACTION_PATH_CONFLICT_RESOLVE = b'pr'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	108 ACTION_ADD_MODIFIED = b'am'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	109 ACTION_CREATED = b'c'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	110 ACTION_DELETED_CHANGED = b'dc'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	111 ACTION_CHANGED_DELETED = b'cd'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	112 ACTION_MERGE = b'm'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	113 ACTION_LOCAL_DIR_RENAME_GET = b'dg'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	114 ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	115 ACTION_KEEP = b'k'
45467 bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45385 diff changeset	116 # the file was absent on local side before merge and we should
bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45385 diff changeset	117 # keep it absent (absent means file not present, it can be a result
bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45385 diff changeset	118 # of file deletion, rename etc.)
bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45385 diff changeset	119 ACTION_KEEP_ABSENT = b'ka'
45524 6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45518 diff changeset	120 # the file is absent on the ancestor and remote side of the merge
6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45518 diff changeset	121 # hence this file is new and we should keep it
6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45518 diff changeset	122 ACTION_KEEP_NEW = b'kn'
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	123 ACTION_EXEC = b'e'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	124 ACTION_CREATED_MERGE = b'cm'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	125
45525 590a840fa367 mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45524 diff changeset	126 # actions which are no op
590a840fa367 mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45524 diff changeset	127 NO_OP_ACTIONS = (
590a840fa367 mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45524 diff changeset	128 ACTION_KEEP,
590a840fa367 mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45524 diff changeset	129 ACTION_KEEP_ABSENT,
590a840fa367 mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45524 diff changeset	130 ACTION_KEEP_NEW,
590a840fa367 mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45524 diff changeset	131 )
590a840fa367 mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45524 diff changeset	132
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	133
45498 cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	134 class _mergestate_base(object):
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	135 '''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	136
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	137 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	138 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	139 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	140 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	141 `_readrecordsv2`.
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	142
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	143 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	144 `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	145 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	146 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	147
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	148 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	149
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	150 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	151 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	152 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	153 C: a change/delete or delete/change conflict
34545 1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	154 P: a path conflict (file vs directory)
30332 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30200 diff changeset	155 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	156 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	157
34545 1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	158 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	159 u: unresolved conflict
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	160 r: resolved conflict
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	161 pu: unresolved path conflict (file conflicts with directory)
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	162 pr: resolved path conflict
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	163
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	164 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	165 '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	166 '''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	167
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	168 def __init__(self, repo):
27005 3185c01c551c mergestate: move _read() call to read constructor Siddharth Agarwal <sid0@fb.com> parents: 26991 diff changeset	169 """Initialize the merge state.
3185c01c551c mergestate: move _read() call to read constructor Siddharth Agarwal <sid0@fb.com> parents: 26991 diff changeset	170
3185c01c551c mergestate: move _read() call to read constructor Siddharth Agarwal <sid0@fb.com> parents: 26991 diff changeset	171 Do not use this directly! Instead call read() or clean()."""
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	172 self._repo = repo
45496 ef3273ac5f6e mergestate: initialize all properties in __init__() Martin von Zweigbergk <martinvonz@google.com> parents: 45495 diff changeset	173 self._state = {}
ef3273ac5f6e mergestate: initialize all properties in __init__() Martin von Zweigbergk <martinvonz@google.com> parents: 45495 diff changeset	174 self._stateextras = collections.defaultdict(dict)
ef3273ac5f6e mergestate: initialize all properties in __init__() Martin von Zweigbergk <martinvonz@google.com> parents: 45495 diff changeset	175 self._local = None
ef3273ac5f6e mergestate: initialize all properties in __init__() Martin von Zweigbergk <martinvonz@google.com> parents: 45495 diff changeset	176 self._other = None
ef3273ac5f6e mergestate: initialize all properties in __init__() Martin von Zweigbergk <martinvonz@google.com> parents: 45495 diff changeset	177 self._labels = None
ef3273ac5f6e mergestate: initialize all properties in __init__() Martin von Zweigbergk <martinvonz@google.com> parents: 45495 diff changeset	178 # contains a mapping of form:
ef3273ac5f6e mergestate: initialize all properties in __init__() Martin von Zweigbergk <martinvonz@google.com> parents: 45495 diff changeset	179 # {filename : (merge_return_value, action_to_be_performed}
ef3273ac5f6e mergestate: initialize all properties in __init__() Martin von Zweigbergk <martinvonz@google.com> parents: 45495 diff changeset	180 # these are results of re-running merge process
ef3273ac5f6e mergestate: initialize all properties in __init__() Martin von Zweigbergk <martinvonz@google.com> parents: 45495 diff changeset	181 # this dict is used to perform actions on dirstate caused by re-running
ef3273ac5f6e mergestate: initialize all properties in __init__() Martin von Zweigbergk <martinvonz@google.com> parents: 45495 diff changeset	182 # the merge
ef3273ac5f6e mergestate: initialize all properties in __init__() Martin von Zweigbergk <martinvonz@google.com> parents: 45495 diff changeset	183 self._results = {}
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	184 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	185
45492 08c6d6962b2a mergestate: split up reset() for its two use cases Martin von Zweigbergk <martinvonz@google.com> parents: 45491 diff changeset	186 def reset(self):
45500 f2efc44213ec mergestate: make in-memory mergestate not clear on-disk mergestate on reset() Martin von Zweigbergk <martinvonz@google.com> parents: 45499 diff changeset	187 pass
45494 9ea4b52ac6bb mergestate: move most of of reset() into start() Martin von Zweigbergk <martinvonz@google.com> parents: 45493 diff changeset	188
9ea4b52ac6bb mergestate: move most of of reset() into start() Martin von Zweigbergk <martinvonz@google.com> parents: 45493 diff changeset	189 def start(self, node, other, labels=None):
9ea4b52ac6bb mergestate: move most of of reset() into start() Martin von Zweigbergk <martinvonz@google.com> parents: 45493 diff changeset	190 self._local = node
9ea4b52ac6bb mergestate: move most of of reset() into start() Martin von Zweigbergk <martinvonz@google.com> parents: 45493 diff changeset	191 self._other = other
9ea4b52ac6bb mergestate: move most of of reset() into start() Martin von Zweigbergk <martinvonz@google.com> parents: 45493 diff changeset	192 self._labels = labels
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	193
26765 45976219eb80 merge.mergestate: add a way to get the other side of the merge Siddharth Agarwal <sid0@fb.com> parents: 26752 diff changeset	194 @util.propertycache
44215 b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	195 def local(self):
27130 6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	196 if self._local is None:
44215 b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	197 msg = b"local accessed but self._local isn't set"
31646 e960eba3581c merge: use ProgrammingError Jun Wu <quark@fb.com> parents: 31515 diff changeset	198 raise error.ProgrammingError(msg)
44215 b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	199 return self._local
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	200
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	201 @util.propertycache
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	202 def localctx(self):
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	203 return self._repo[self.local]
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	204
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	205 @util.propertycache
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	206 def other(self):
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	207 if self._other is None:
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	208 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: 44212 diff changeset	209 raise error.ProgrammingError(msg)
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	210 return self._other
27130 6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	211
6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	212 @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	213 def otherctx(self):
44215 b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	214 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	215
21264 4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	216 def active(self):
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	217 """Whether mergestate is active.
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	218
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	219 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	220 for "is a merge in progress."
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	221 """
44394 5e3402a0b868 mergestate: determine if active without looking for state files on disk Martin von Zweigbergk <martinvonz@google.com> parents: 44383 diff changeset	222 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	223
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	224 def commit(self):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	225 """Write current state on disk (if necessary)"""
27006 9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	226
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	227 @staticmethod
8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	228 def getlocalkey(path):
8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	229 """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: 41050 diff changeset	230 directory."""
8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	231
44060 a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43798 diff changeset	232 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: 41050 diff changeset	233
45497 e833ff4dd0ea mergestate: extract overridable methods for making/restoring file backups Martin von Zweigbergk <martinvonz@google.com> parents: 45496 diff changeset	234 def _make_backup(self, fctx, localkey):
45498 cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	235 raise NotImplementedError()
45497 e833ff4dd0ea mergestate: extract overridable methods for making/restoring file backups Martin von Zweigbergk <martinvonz@google.com> parents: 45496 diff changeset	236
e833ff4dd0ea mergestate: extract overridable methods for making/restoring file backups Martin von Zweigbergk <martinvonz@google.com> parents: 45496 diff changeset	237 def _restore_backup(self, fctx, localkey, flags):
45498 cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	238 raise NotImplementedError()
45497 e833ff4dd0ea mergestate: extract overridable methods for making/restoring file backups Martin von Zweigbergk <martinvonz@google.com> parents: 45496 diff changeset	239
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	240 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	241 """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	242 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	243 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	244 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	245 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	246
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	247 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	248 """
27049 0d61f7ec7f76 mergestate.add: store absentfilectxes as nullhex Siddharth Agarwal <sid0@fb.com> parents: 27048 diff changeset	249 if fcl.isabsent():
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	250 localkey = nullhex
27049 0d61f7ec7f76 mergestate.add: store absentfilectxes as nullhex Siddharth Agarwal <sid0@fb.com> parents: 27048 diff changeset	251 else:
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	252 localkey = mergestate.getlocalkey(fcl.path())
45497 e833ff4dd0ea mergestate: extract overridable methods for making/restoring file backups Martin von Zweigbergk <martinvonz@google.com> parents: 45496 diff changeset	253 self._make_backup(fcl, localkey)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	254 self._state[fd] = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	255 MERGE_RECORD_UNRESOLVED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	256 localkey,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	257 fcl.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	258 fca.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	259 hex(fca.filenode()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	260 fco.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	261 hex(fco.filenode()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	262 fcl.flags(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	263 ]
45583 9f14bb4d59ea mergestate: update _stateextras instead of reassinging Pulkit Goyal <7895pulkit@gmail.com> parents: 45525 diff changeset	264 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	265 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	266
45159 e05a488cbed0 mergestate: rename addpath() -> addpathonflict() to prevent confusion Pulkit Goyal <7895pulkit@gmail.com> parents: 44939 diff changeset	267 def addpathconflict(self, path, frename, forigin):
34545 1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	268 """add a new conflicting path to the merge state
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	269 path: the path that conflicts
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	270 frename: the filename the conflicting file was renamed to
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	271 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	272 """
37111 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	273 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	274 self._dirty = True
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	275
45385 05d19ca33b33 mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45382 diff changeset	276 def addcommitinfo(self, path, data):
05d19ca33b33 mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45382 diff changeset	277 """ stores information which is required at commit
05d19ca33b33 mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45382 diff changeset	278 into _stateextras """
05d19ca33b33 mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45382 diff changeset	279 self._stateextras[path].update(data)
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	280 self._dirty = True
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	281
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	282 def __contains__(self, dfile):
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	283 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	284
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	285 def __getitem__(self, dfile):
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	286 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	287
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	288 def __iter__(self):
21268 a0b8a912ec81 merge: simplify mergestate iter Mads Kiilerich <mads@kiilerich.com> parents: 21266 diff changeset	289 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	290
19285 feaf5749d7a4 merge: add a files method to the mergestate class Bryan O'Sullivan <bryano@fb.com> parents: 19226 diff changeset	291 def files(self):
feaf5749d7a4 merge: add a files method to the mergestate class Bryan O'Sullivan <bryano@fb.com> parents: 19226 diff changeset	292 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	293
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	294 def mark(self, dfile, state):
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	295 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	296 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	297
21266 19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	298 def unresolved(self):
19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	299 """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	300
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	301 for f, entry in pycompat.iteritems(self._state):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	302 if entry[0] in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	303 MERGE_RECORD_UNRESOLVED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	304 MERGE_RECORD_UNRESOLVED_PATH,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	305 ):
21266 19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	306 yield f
19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	307
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	308 def extras(self, filename):
45381 ede4c121239e mergestate: use collections.defaultdict(dict) for _stateextras Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	309 return self._stateextras[filename]
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	310
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	311 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	312 """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	313 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	314 obtained from filemerge._filemerge().
01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	315 """
45518 32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	316 if self[dfile] in (
32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	317 MERGE_RECORD_RESOLVED,
32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	318 LEGACY_RECORD_DRIVER_RESOLVED,
32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	319 ):
26616 2f1fce0d4e86 merge.mergestate._resolve: also return completed status Siddharth Agarwal <sid0@fb.com> parents: 26615 diff changeset	320 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	321 stateentry = self._state[dfile]
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	322 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	323 octx = self._repo[self._other]
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	324 extras = self.extras(dfile)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	325 anccommitnode = extras.get(b'ancestorlinknode')
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	326 if anccommitnode:
8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	327 actx = self._repo[anccommitnode]
8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	328 else:
8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	329 actx = None
44871 17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44856 diff changeset	330 fcd = _filectxorabsent(localkey, wctx, dfile)
17d928f8abaf mergestate: move staticmethod _filectxorabsent to module level Augie Fackler <augie@google.com> parents: 44856 diff changeset	331 fco = _filectxorabsent(onode, octx, ofile)
27048 86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	332 # TODO: move this to filectxorabsent
37172 daef13da66fe context: avoid using a context object as a changeid Martin von Zweigbergk <martinvonz@google.com> parents: 37125 diff changeset	333 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	334 # "premerge" x flags
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	335 flo = fco.flags()
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	336 fla = fca.flags()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	337 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	338 if fca.node() == nullid and flags != flo:
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	339 if preresolve:
dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	340 self._repo.ui.warn(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	341 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	342 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	343 b'without common ancestor - keeping local flags\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	344 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	345 % afile
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	346 )
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	347 elif flags == fla:
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	348 flags = flo
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	349 if preresolve:
dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	350 # restore local
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	351 if localkey != nullhex:
45497 e833ff4dd0ea mergestate: extract overridable methods for making/restoring file backups Martin von Zweigbergk <martinvonz@google.com> parents: 45496 diff changeset	352 self._restore_backup(wctx[dfile], localkey, flags)
27048 86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	353 else:
33082 f9e50ee4c52b merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove() Phil Cohen <phillco@fb.com> parents: 33081 diff changeset	354 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	355 complete, merge_ret, deleted = filemerge.premerge(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	356 self._repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	357 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	358 self._local,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	359 lfile,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	360 fcd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	361 fco,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	362 fca,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	363 labels=self._labels,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	364 )
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	365 else:
45165 01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	366 complete, merge_ret, deleted = filemerge.filemerge(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	367 self._repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	368 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	369 self._local,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	370 lfile,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	371 fcd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	372 fco,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	373 fca,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	374 labels=self._labels,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	375 )
45165 01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	376 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	377 # 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	378 del self._state[dfile]
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	379 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	380 self._dirty = True
45165 01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	381 elif not merge_ret:
37111 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	382 self.mark(dfile, MERGE_RECORD_RESOLVED)
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	383
de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	384 if complete:
27075 6373330155b2 mergestate._resolve: don't return the action any more Siddharth Agarwal <sid0@fb.com> parents: 27074 diff changeset	385 action = None
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	386 if deleted:
27122 77d760ba8dcd mergestate: explicitly forget 'dc' conflicts where the deleted side is picked Siddharth Agarwal <sid0@fb.com> parents: 27121 diff changeset	387 if fcd.isabsent():
77d760ba8dcd mergestate: explicitly forget 'dc' conflicts where the deleted side is picked Siddharth Agarwal <sid0@fb.com> parents: 27121 diff changeset	388 # 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	389 # happen on re-resolves.
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	390 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	391 else:
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	392 # cd: remote picked (or otherwise deleted)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	393 action = ACTION_REMOVE
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	394 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	395 if fcd.isabsent(): # dc: remote picked
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	396 action = ACTION_GET
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	397 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	398 if dfile in self.localctx:
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	399 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	400 else:
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	401 action = ACTION_ADD
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	402 # 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	403 self._results[dfile] = merge_ret, action
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	404
45165 01c4dccfd6b5 mergestate: rename a helpless variable name to bit helpful one Pulkit Goyal <7895pulkit@gmail.com> parents: 45164 diff changeset	405 return complete, merge_ret
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	406
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	407 def preresolve(self, dfile, wctx):
26870 ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	408 """run premerge process for dfile
ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	409
ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	410 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	411 return self._resolve(True, dfile, wctx)
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	412
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	413 def resolve(self, dfile, wctx):
26870 ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	414 """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	415
ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	416 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	417 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	418
27076 09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	419 def counts(self):
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	420 """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	421 session"""
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	422 updated, merged, removed = 0, 0, 0
43104 74802979dd9d py3: define and use pycompat.itervalues() Gregory Szorc <gregory.szorc@gmail.com> parents: 43090 diff changeset	423 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	424 if r is None:
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	425 updated += 1
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	426 elif r == 0:
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	427 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	428 removed += 1
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	429 else:
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	430 merged += 1
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	431 return updated, merged, removed
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	432
27077 ca3fbf9dad8c mergestate: add a function to return the number of unresolved files Siddharth Agarwal <sid0@fb.com> parents: 27076 diff changeset	433 def unresolvedcount(self):
ca3fbf9dad8c mergestate: add a function to return the number of unresolved files Siddharth Agarwal <sid0@fb.com> parents: 27076 diff changeset	434 """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	435 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	436
27079 a88a10a933b2 mergestate: add a method to compute actions to perform on dirstate Siddharth Agarwal <sid0@fb.com> parents: 27078 diff changeset	437 def actions(self):
a88a10a933b2 mergestate: add a method to compute actions to perform on dirstate Siddharth Agarwal <sid0@fb.com> parents: 27078 diff changeset	438 """return lists of actions to perform on the dirstate"""
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	439 actions = {
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	440 ACTION_REMOVE: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	441 ACTION_FORGET: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	442 ACTION_ADD: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	443 ACTION_ADD_MODIFIED: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	444 ACTION_GET: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	445 }
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	446 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	447 if action is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	448 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	449 return actions
a88a10a933b2 mergestate: add a method to compute actions to perform on dirstate Siddharth Agarwal <sid0@fb.com> parents: 27078 diff changeset	450
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	451
45498 cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	452 class mergestate(_mergestate_base):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	453
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	454 statepathv1 = b'merge/state'
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	455 statepathv2 = b'merge/state2'
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	456
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	457 @staticmethod
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	458 def clean(repo):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	459 """Initialize a brand new merge state, removing any existing state on
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	460 disk."""
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	461 ms = mergestate(repo)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	462 ms.reset()
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	463 return ms
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	464
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	465 @staticmethod
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	466 def read(repo):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	467 """Initialize the merge state, reading it from disk."""
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	468 ms = mergestate(repo)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	469 ms._read()
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	470 return ms
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	471
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	472 def _read(self):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	473 """Analyse each record content to restore a serialized state from disk
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	474
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	475 This function process "record" entry produced by the de-serialization
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	476 of on disk file.
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	477 """
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	478 unsupported = set()
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	479 records = self._readrecords()
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	480 for rtype, record in records:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	481 if rtype == RECORD_LOCAL:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	482 self._local = bin(record)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	483 elif rtype == RECORD_OTHER:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	484 self._other = bin(record)
45518 32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	485 elif rtype == LEGACY_MERGE_DRIVER_STATE:
32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	486 pass
45498 cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	487 elif rtype in (
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	488 RECORD_MERGED,
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	489 RECORD_CHANGEDELETE_CONFLICT,
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	490 RECORD_PATH_CONFLICT,
45518 32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	491 LEGACY_MERGE_DRIVER_MERGE,
45498 cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	492 LEGACY_RECORD_RESOLVED_OTHER,
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	493 ):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	494 bits = record.split(b'\0')
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	495 # merge entry type MERGE_RECORD_MERGED_OTHER is deprecated
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	496 # and we now store related information in _stateextras, so
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	497 # lets write to _stateextras directly
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	498 if bits[1] == MERGE_RECORD_MERGED_OTHER:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	499 self._stateextras[bits[0]][b'filenode-source'] = b'other'
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	500 else:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	501 self._state[bits[0]] = bits[1:]
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	502 elif rtype == RECORD_FILE_VALUES:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	503 filename, rawextras = record.split(b'\0', 1)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	504 extraparts = rawextras.split(b'\0')
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	505 extras = {}
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	506 i = 0
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	507 while i < len(extraparts):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	508 extras[extraparts[i]] = extraparts[i + 1]
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	509 i += 2
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	510
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	511 self._stateextras[filename] = extras
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	512 elif rtype == RECORD_LABELS:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	513 labels = record.split(b'\0', 2)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	514 self._labels = [l for l in labels if len(l) > 0]
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	515 elif not rtype.islower():
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	516 unsupported.add(rtype)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	517
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	518 if unsupported:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	519 raise error.UnsupportedMergeRecords(unsupported)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	520
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	521 def _readrecords(self):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	522 """Read merge state from disk and return a list of record (TYPE, data)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	523
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	524 We read data from both v1 and v2 files and decide which one to use.
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	525
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	526 V1 has been used by version prior to 2.9.1 and contains less data than
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	527 v2. We read both versions and check if no data in v2 contradicts
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	528 v1. If there is not contradiction we can safely assume that both v1
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	529 and v2 were written at the same time and use the extract data in v2. If
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	530 there is contradiction we ignore v2 content as we assume an old version
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	531 of Mercurial has overwritten the mergestate file and left an old v2
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	532 file around.
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	533
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	534 returns list of record [(TYPE, data), ...]"""
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	535 v1records = self._readrecordsv1()
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	536 v2records = self._readrecordsv2()
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	537 if self._v1v2match(v1records, v2records):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	538 return v2records
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	539 else:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	540 # v1 file is newer than v2 file, use it
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	541 # we have to infer the "other" changeset of the merge
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	542 # we cannot do better than that with v1 of the format
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	543 mctx = self._repo[None].parents()[-1]
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	544 v1records.append((RECORD_OTHER, mctx.hex()))
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	545 # add place holder "other" file node information
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	546 # nobody is using it yet so we do no need to fetch the data
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	547 # if mctx was wrong `mctx[bits[-2]]` may fails.
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	548 for idx, r in enumerate(v1records):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	549 if r[0] == RECORD_MERGED:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	550 bits = r[1].split(b'\0')
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	551 bits.insert(-2, b'')
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	552 v1records[idx] = (r[0], b'\0'.join(bits))
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	553 return v1records
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	554
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	555 def _v1v2match(self, v1records, v2records):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	556 oldv2 = set() # old format version of v2 record
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	557 for rec in v2records:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	558 if rec[0] == RECORD_LOCAL:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	559 oldv2.add(rec)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	560 elif rec[0] == RECORD_MERGED:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	561 # drop the onode data (not contained in v1)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	562 oldv2.add((RECORD_MERGED, _droponode(rec[1])))
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	563 for rec in v1records:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	564 if rec not in oldv2:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	565 return False
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	566 else:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	567 return True
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	568
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	569 def _readrecordsv1(self):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	570 """read on disk merge state for version 1 file
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	571
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	572 returns list of record [(TYPE, data), ...]
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	573
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	574 Note: the "F" data from this file are one entry short
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	575 (no "other file node" entry)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	576 """
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	577 records = []
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	578 try:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	579 f = self._repo.vfs(self.statepathv1)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	580 for i, l in enumerate(f):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	581 if i == 0:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	582 records.append((RECORD_LOCAL, l[:-1]))
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	583 else:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	584 records.append((RECORD_MERGED, l[:-1]))
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	585 f.close()
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	586 except IOError as err:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	587 if err.errno != errno.ENOENT:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	588 raise
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	589 return records
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	590
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	591 def _readrecordsv2(self):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	592 """read on disk merge state for version 2 file
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	593
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	594 This format is a list of arbitrary records of the form:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	595
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	596 [type][length][content]
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	597
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	598 `type` is a single character, `length` is a 4 byte integer, and
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	599 `content` is an arbitrary byte sequence of length `length`.
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	600
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	601 Mercurial versions prior to 3.7 have a bug where if there are
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	602 unsupported mandatory merge records, attempting to clear out the merge
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	603 state with hg update --clean or similar aborts. The 't' record type
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	604 works around that by writing out what those versions treat as an
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	605 advisory record, but later versions interpret as special: the first
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	606 character is the 'real' record type and everything onwards is the data.
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	607
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	608 Returns list of records [(TYPE, data), ...]."""
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	609 records = []
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	610 try:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	611 f = self._repo.vfs(self.statepathv2)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	612 data = f.read()
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	613 off = 0
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	614 end = len(data)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	615 while off < end:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	616 rtype = data[off : off + 1]
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	617 off += 1
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	618 length = _unpack(b'>I', data[off : (off + 4)])[0]
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	619 off += 4
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	620 record = data[off : (off + length)]
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	621 off += length
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	622 if rtype == RECORD_OVERRIDE:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	623 rtype, record = record[0:1], record[1:]
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	624 records.append((rtype, record))
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	625 f.close()
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	626 except IOError as err:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	627 if err.errno != errno.ENOENT:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	628 raise
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	629 return records
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	630
45501 0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	631 def commit(self):
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	632 if self._dirty:
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	633 records = self._makerecords()
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	634 self._writerecords(records)
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	635 self._dirty = False
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	636
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	637 def _makerecords(self):
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	638 records = []
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	639 records.append((RECORD_LOCAL, hex(self._local)))
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	640 records.append((RECORD_OTHER, hex(self._other)))
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	641 # Write out state items. In all cases, the value of the state map entry
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	642 # is written as the contents of the record. The record type depends on
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	643 # the type of state that is stored, and capital-letter records are used
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	644 # to prevent older versions of Mercurial that do not support the feature
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	645 # from loading them.
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	646 for filename, v in pycompat.iteritems(self._state):
45518 32ce4cbaec4b mergedriver: delete it Martin von Zweigbergk <martinvonz@google.com> parents: 45501 diff changeset	647 if v[0] in (
45501 0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	648 MERGE_RECORD_UNRESOLVED_PATH,
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	649 MERGE_RECORD_RESOLVED_PATH,
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	650 ):
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	651 # Path conflicts. These are stored in 'P' records. The current
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	652 # resolution state ('pu' or 'pr') is stored within the record.
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	653 records.append(
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	654 (RECORD_PATH_CONFLICT, b'\0'.join([filename] + v))
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	655 )
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	656 elif v[1] == nullhex or v[6] == nullhex:
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	657 # Change/Delete or Delete/Change conflicts. These are stored in
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	658 # 'C' records. v[1] is the local file, and is nullhex when the
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	659 # file is deleted locally ('dc'). v[6] is the remote file, and
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	660 # is nullhex when the file is deleted remotely ('cd').
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	661 records.append(
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	662 (RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v))
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	663 )
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	664 else:
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	665 # Normal files. These are stored in 'F' records.
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	666 records.append((RECORD_MERGED, b'\0'.join([filename] + v)))
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	667 for filename, extras in sorted(pycompat.iteritems(self._stateextras)):
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	668 rawextras = b'\0'.join(
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	669 b'%s\0%s' % (k, v) for k, v in pycompat.iteritems(extras)
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	670 )
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	671 records.append(
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	672 (RECORD_FILE_VALUES, b'%s\0%s' % (filename, rawextras))
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	673 )
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	674 if self._labels is not None:
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	675 labels = b'\0'.join(self._labels)
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	676 records.append((RECORD_LABELS, labels))
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	677 return records
0e75c088f0dc mergestate: move commit() from base class to on-disk subclass Martin von Zweigbergk <martinvonz@google.com> parents: 45500 diff changeset	678
45498 cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	679 def _writerecords(self, records):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	680 """Write current state on disk (both v1 and v2)"""
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	681 self._writerecordsv1(records)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	682 self._writerecordsv2(records)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	683
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	684 def _writerecordsv1(self, records):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	685 """Write current state on disk in a version 1 file"""
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	686 f = self._repo.vfs(self.statepathv1, b'wb')
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	687 irecords = iter(records)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	688 lrecords = next(irecords)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	689 assert lrecords[0] == RECORD_LOCAL
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	690 f.write(hex(self._local) + b'\n')
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	691 for rtype, data in irecords:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	692 if rtype == RECORD_MERGED:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	693 f.write(b'%s\n' % _droponode(data))
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	694 f.close()
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	695
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	696 def _writerecordsv2(self, records):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	697 """Write current state on disk in a version 2 file
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	698
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	699 See the docstring for _readrecordsv2 for why we use 't'."""
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	700 # these are the records that all version 2 clients can read
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	701 allowlist = (RECORD_LOCAL, RECORD_OTHER, RECORD_MERGED)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	702 f = self._repo.vfs(self.statepathv2, b'wb')
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	703 for key, data in records:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	704 assert len(key) == 1
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	705 if key not in allowlist:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	706 key, data = RECORD_OVERRIDE, b'%s%s' % (key, data)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	707 format = b'>sI%is' % len(data)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	708 f.write(_pack(format, key, len(data), data))
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	709 f.close()
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	710
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	711 def _make_backup(self, fctx, localkey):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	712 self._repo.vfs.write(b'merge/' + localkey, fctx.data())
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	713
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	714 def _restore_backup(self, fctx, localkey, flags):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	715 with self._repo.vfs(b'merge/' + localkey) as f:
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	716 fctx.write(f.read(), flags)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	717
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	718 def reset(self):
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	719 shutil.rmtree(self._repo.vfs.join(b'merge'), True)
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	720
cc5f811b1f15 mergestate: extract a base class to be shared by future memmergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45497 diff changeset	721
45499 19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	722 class memmergestate(_mergestate_base):
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	723 def __init__(self, repo):
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	724 super(memmergestate, self).__init__(repo)
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	725 self._backups = {}
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	726
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	727 def _make_backup(self, fctx, localkey):
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	728 self._backups[localkey] = fctx.data()
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	729
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	730 def _restore_backup(self, fctx, localkey, flags):
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	731 fctx.write(self._backups[localkey], flags)
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	732
19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45498 diff changeset	733
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	734 def recordupdates(repo, actions, branchmerge, getfiledata):
43787 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43713 diff changeset	735 """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	736 # remove (must come first)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	737 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	738 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	739 repo.dirstate.remove(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	740 else:
21389 e741972017d9 merge: change priority / ordering of merge actions Mads Kiilerich <madski@unity3d.com> parents: 21269 diff changeset	741 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	742
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	743 # forget (must come first)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	744 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	745 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	746
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	747 # resolve path conflicts
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	748 for f, args, msg in actions.get(ACTION_PATH_CONFLICT_RESOLVE, []):
44939 818b4f19ef23 merge: move an inspection of the dirstate from record to calculate phase Martin von Zweigbergk <martinvonz@google.com> parents: 44871 diff changeset	749 (f0, origf0) = args
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	750 repo.dirstate.add(f)
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	751 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	752 if f0 == origf0:
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	753 repo.dirstate.remove(f0)
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	754 else:
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	755 repo.dirstate.drop(f0)
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	756
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	757 # re-add
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	758 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	759 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	760
27131 d837da26155e merge: add a new action type representing files to add/mark as modified Siddharth Agarwal <sid0@fb.com> parents: 27130 diff changeset	761 # re-add/mark as modified
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	762 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	763 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	764 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	765 else:
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	766 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	767
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	768 # exec change
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	769 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	770 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	771
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	772 # keep
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	773 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	774 pass
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	775
45467 bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45385 diff changeset	776 # keep deleted
bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45385 diff changeset	777 for f, args, msg in actions.get(ACTION_KEEP_ABSENT, []):
bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45385 diff changeset	778 pass
bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45385 diff changeset	779
45524 6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45518 diff changeset	780 # keep new
6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45518 diff changeset	781 for f, args, msg in actions.get(ACTION_KEEP_NEW, []):
6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45518 diff changeset	782 pass
6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45518 diff changeset	783
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	784 # get
42522 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42456 diff changeset	785 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	786 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	787 repo.dirstate.otherparent(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	788 else:
42522 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42456 diff changeset	789 parentfiledata = getfiledata[f] if getfiledata else None
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	790 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	791
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	792 # merge
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	793 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	794 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	795 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	796 # 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	797 # 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	798 repo.dirstate.merge(f)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	799 if f1 != f2: # copy/rename
3308 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3307 diff changeset	800 if move:
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	801 repo.dirstate.remove(f1)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	802 if f1 != f:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	803 repo.dirstate.copy(f1, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	804 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	805 repo.dirstate.copy(f2, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	806 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	807 # 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	808 # 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	809 # 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	810 # 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	811 # modification.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	812 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	813 repo.dirstate.normallookup(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	814 if move:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	815 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	816
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	817 # directory rename, move local
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	818 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	819 f0, flag = args
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	820 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	821 repo.dirstate.add(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	822 repo.dirstate.remove(f0)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	823 repo.dirstate.copy(f0, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	824 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	825 repo.dirstate.normal(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	826 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	827
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	828 # directory rename, get
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	829 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	830 f0, flag = args
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	831 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	832 repo.dirstate.add(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	833 repo.dirstate.copy(f0, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	834 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	835 repo.dirstate.normal(f)

Mercurial > public > mercurial-scm > hg

annotate mercurial/mergestate.py @ 45625:c11099cc1de4