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

annotate mercurial/merge.py @ 44687:1b8fd4af3318

mergestate: store about files resolved in favour of other Committing a merge sometimes wrongly creates a new filenode where it can re-use an existing one. This happens because the commit code does it's own calculation and does not know what happened on merge. This starts storing information in mergestate about files which were automatically merged and the other/remote version of file was used. We need this information at commit to pick the filenode parent for the new commit. This issue was found by Pierre-Yves David and idea to store the relevant parts in mergestate is also suggested by him. Somethings which can be further investigated are: 1) refactoring of commit logic more to depend on this information 2) maybe a more generic solution? Differential Revision: https://phab.mercurial-scm.org/D8392

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Thu, 09 Apr 2020 16:06:03 +0530
parents	9d2b2df2c2ba
children	b7808443ed6a

rev	line source
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # merge.py - directory-level update/merge handling for Mercurial
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	3 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9783 diff changeset	6 # GNU General Public License version 2 or any later version.
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	7
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	8 from __future__ import absolute_import
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	9
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	10 import errno
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	11 import shutil
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	12 import stat
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	13 import struct
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	14
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	15 from .i18n import _
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	16 from .node import (
30361 1070df141718 dirstate: change added/modified placeholder hash length to 20 bytes Durham Goode <durham@fb.com> parents: 30332 diff changeset	17 addednodeid,
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	18 bin,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	19 hex,
30362 3c6893ba2d36 merge: change modified indicator to be 20 bytes Durham Goode <durham@fb.com> parents: 30361 diff changeset	20 modifiednodeid,
27031 8be0af32e513 mergestate: allow storing and retrieving change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27027 diff changeset	21 nullhex,
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	22 nullid,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	23 nullrev,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	24 )
43090 1f339b503a40 py3: manually import pycompat.delattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43077 diff changeset	25 from .pycompat import delattr
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	26 from .thirdparty import attr
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	27 from . import (
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	28 copies,
39818 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39464 diff changeset	29 encoding,
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26570 diff changeset	30 error,
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	31 filemerge,
31257 11831d755b51 merge: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31175 diff changeset	32 match as matchmod,
33146 7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33095 diff changeset	33 obsutil,
43633 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43421 diff changeset	34 pathutil,
30519 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30486 diff changeset	35 pycompat,
27656 57c0d4888ca8 batchget: add support for backing up files Siddharth Agarwal <sid0@fb.com> parents: 27655 diff changeset	36 scmutil,
36009 55e8efa2451a subrepo: split non-core functions to new module Yuya Nishihara <yuya@tcha.org> parents: 35726 diff changeset	37 subrepoutil,
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	38 util,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	39 worker,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	40 )
44060 a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43798 diff changeset	41 from .utils import hashutil
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	42
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	43 _pack = struct.pack
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	44 _unpack = struct.unpack
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	45
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	46
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	47 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	48 # used for compatibility for v1
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	49 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	50 bits = bits[:-2] + bits[-1:]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	51 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	52
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	53
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	54 # Merge state record types. See ``mergestate`` docs for more.
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	55 RECORD_LOCAL = b'L'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	56 RECORD_OTHER = b'O'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	57 RECORD_MERGED = b'F'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	58 RECORD_CHANGEDELETE_CONFLICT = b'C'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	59 RECORD_MERGE_DRIVER_MERGE = b'D'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	60 RECORD_PATH_CONFLICT = b'P'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	61 RECORD_MERGE_DRIVER_STATE = b'm'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	62 RECORD_FILE_VALUES = b'f'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	63 RECORD_LABELS = b'l'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	64 RECORD_OVERRIDE = b't'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	65 RECORD_UNSUPPORTED_MANDATORY = b'X'
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	66 RECORD_UNSUPPORTED_ADVISORY = b'x'
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	67 RECORD_RESOLVED_OTHER = b'R'
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	68
37110 1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37109 diff changeset	69 MERGE_DRIVER_STATE_UNMARKED = b'u'
1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37109 diff changeset	70 MERGE_DRIVER_STATE_MARKED = b'm'
1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37109 diff changeset	71 MERGE_DRIVER_STATE_SUCCESS = b's'
1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37109 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'
aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	77 MERGE_RECORD_DRIVER_RESOLVED = b'd'
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	78 # 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	79 # of other version. This info is used on commit.
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	80 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	81
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	82 ACTION_FORGET = b'f'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	83 ACTION_REMOVE = b'r'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	84 ACTION_ADD = b'a'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	85 ACTION_GET = b'g'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	86 ACTION_PATH_CONFLICT = b'p'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	87 ACTION_PATH_CONFLICT_RESOLVE = b'pr'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	88 ACTION_ADD_MODIFIED = b'am'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	89 ACTION_CREATED = b'c'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	90 ACTION_DELETED_CHANGED = b'dc'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	91 ACTION_CHANGED_DELETED = b'cd'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	92 ACTION_MERGE = b'm'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	93 ACTION_LOCAL_DIR_RENAME_GET = b'dg'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	94 ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	95 ACTION_KEEP = b'k'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	96 ACTION_EXEC = b'e'
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	97 ACTION_CREATED_MERGE = b'cm'
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	98 # GET the other/remote side and store this info in mergestate
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	99 ACTION_GET_OTHER_AND_STORE = b'gs'
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	100
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	101
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	102 class mergestate(object):
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	103 '''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	104
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	105 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	106 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	107 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	108 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	109 `_readrecordsv2`.
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	110
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	111 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	112 `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	113 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	114 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	115
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	116 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	117
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	118 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	119 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	120 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	121 C: a change/delete or delete/change conflict
26650 6ff5534c8afc merge.mergestate: add support for persisting driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26649 diff changeset	122 D: a file that the external merge driver will merge internally
6ff5534c8afc merge.mergestate: add support for persisting driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26649 diff changeset	123 (experimental)
34545 1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	124 P: a path conflict (file vs directory)
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	125 m: the external merge driver defined for this merge plus its run state
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	126 (experimental)
30332 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30200 diff changeset	127 f: a (filename, dictionary) tuple of optional values for a given file
27027 a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	128 X: unsupported mandatory record type (used in tests)
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	129 x: unsupported advisory record type (used in tests)
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	130 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	131
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	132 Merge driver run states (experimental):
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	133 u: driver-resolved files unmarked -- needs to be run next time we're about
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	134 to resolve or commit
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	135 m: driver-resolved files marked -- only needs to be run before commit
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	136 s: success/skipped -- does not need to be run any more
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	137
34545 1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	138 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	139 u: unresolved conflict
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	140 r: resolved conflict
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	141 pu: unresolved path conflict (file conflicts with directory)
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	142 pr: resolved path conflict
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	143 d: driver-resolved conflict
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	144
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	145 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	146 '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	147 '''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	148
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	149 statepathv1 = b'merge/state'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	150 statepathv2 = b'merge/state2'
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	151
26987 416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	152 @staticmethod
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	153 def clean(repo, node=None, other=None, labels=None):
26987 416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	154 """Initialize a brand new merge state, removing any existing state on
416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	155 disk."""
416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	156 ms = mergestate(repo)
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	157 ms.reset(node, other, labels)
26987 416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	158 return ms
416b2b7d3068 mergestate: add a constructor that sets up a clean merge state Siddharth Agarwal <sid0@fb.com> parents: 26986 diff changeset	159
26991 2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	160 @staticmethod
2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	161 def read(repo):
2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	162 """Initialize the merge state, reading it from disk."""
2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	163 ms = mergestate(repo)
27005 3185c01c551c mergestate: move _read() call to read constructor Siddharth Agarwal <sid0@fb.com> parents: 26991 diff changeset	164 ms._read()
26991 2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	165 return ms
2ddc92bae4a7 mergestate: add a constructor that reads state from disk Siddharth Agarwal <sid0@fb.com> parents: 26990 diff changeset	166
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	167 def __init__(self, repo):
27005 3185c01c551c mergestate: move _read() call to read constructor Siddharth Agarwal <sid0@fb.com> parents: 26991 diff changeset	168 """Initialize the merge state.
3185c01c551c mergestate: move _read() call to read constructor Siddharth Agarwal <sid0@fb.com> parents: 26991 diff changeset	169
3185c01c551c mergestate: move _read() call to read constructor Siddharth Agarwal <sid0@fb.com> parents: 26991 diff changeset	170 Do not use this directly! Instead call read() or clean()."""
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	171 self._repo = repo
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	172 self._dirty = False
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	173 self._labels = None
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	174
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	175 def reset(self, node=None, other=None, labels=None):
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	176 self._state = {}
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	177 self._stateextras = {}
21261 6ca05c46aa95 mergestate: consistently set variables to None Gregory Szorc <gregory.szorc@gmail.com> parents: 21203 diff changeset	178 self._local = None
6ca05c46aa95 mergestate: consistently set variables to None Gregory Szorc <gregory.szorc@gmail.com> parents: 21203 diff changeset	179 self._other = None
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	180 self._labels = labels
43421 be384a2052aa py3: don't use bytes with vars() or __dict__ Martin von Zweigbergk <martinvonz@google.com> parents: 43117 diff changeset	181 for var in ('localctx', 'otherctx'):
27130 6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	182 if var in vars(self):
6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	183 delattr(self, var)
7848 89e05c02a4af resolve: move reset to localrepo.commit Matt Mackall <mpm@selenic.com> parents: 7768 diff changeset	184 if node:
89e05c02a4af resolve: move reset to localrepo.commit Matt Mackall <mpm@selenic.com> parents: 7768 diff changeset	185 self._local = node
20591 02c60e380fd0 merge: record the "other" node in merge state Pierre-Yves David <pierre-yves.david@fb.com> parents: 20590 diff changeset	186 self._other = other
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	187 self._readmergedriver = None
26769 5b00ec4c05cb merge.mergestate: set merge driver state to 's' if there's none present Siddharth Agarwal <sid0@fb.com> parents: 26768 diff changeset	188 if self.mergedriver:
37110 1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37109 diff changeset	189 self._mdstate = MERGE_DRIVER_STATE_SUCCESS
26769 5b00ec4c05cb merge.mergestate: set merge driver state to 's' if there's none present Siddharth Agarwal <sid0@fb.com> parents: 26768 diff changeset	190 else:
37110 1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37109 diff changeset	191 self._mdstate = MERGE_DRIVER_STATE_UNMARKED
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	192 shutil.rmtree(self._repo.vfs.join(b'merge'), True)
27074 78b0c88ab0db mergestate._resolve: store return code and action for each file Siddharth Agarwal <sid0@fb.com> parents: 27049 diff changeset	193 self._results = {}
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	194 self._dirty = False
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	195
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	196 def _read(self):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	197 """Analyse each record content to restore a serialized state from disk
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	198
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	199 This function process "record" entry produced by the de-serialization
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	200 of on disk file.
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	201 """
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	202 self._state = {}
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	203 self._stateextras = {}
21261 6ca05c46aa95 mergestate: consistently set variables to None Gregory Szorc <gregory.szorc@gmail.com> parents: 21203 diff changeset	204 self._local = None
6ca05c46aa95 mergestate: consistently set variables to None Gregory Szorc <gregory.szorc@gmail.com> parents: 21203 diff changeset	205 self._other = None
43421 be384a2052aa py3: don't use bytes with vars() or __dict__ Martin von Zweigbergk <martinvonz@google.com> parents: 43117 diff changeset	206 for var in ('localctx', 'otherctx'):
27130 6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	207 if var in vars(self):
6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	208 delattr(self, var)
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	209 self._readmergedriver = None
37110 1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37109 diff changeset	210 self._mdstate = MERGE_DRIVER_STATE_SUCCESS
26986 1ee5e48f09d4 mergestate: raise structured exception for unsupported merge records Siddharth Agarwal <sid0@fb.com> parents: 26975 diff changeset	211 unsupported = set()
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	212 records = self._readrecords()
31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	213 for rtype, record in records:
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	214 if rtype == RECORD_LOCAL:
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	215 self._local = bin(record)
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	216 elif rtype == RECORD_OTHER:
20591 02c60e380fd0 merge: record the "other" node in merge state Pierre-Yves David <pierre-yves.david@fb.com> parents: 20590 diff changeset	217 self._other = bin(record)
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	218 elif rtype == RECORD_MERGE_DRIVER_STATE:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	219 bits = record.split(b'\0', 1)
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	220 mdstate = bits[1]
37110 1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37109 diff changeset	221 if len(mdstate) != 1 or mdstate not in (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	222 MERGE_DRIVER_STATE_UNMARKED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	223 MERGE_DRIVER_STATE_MARKED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	224 MERGE_DRIVER_STATE_SUCCESS,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	225 ):
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	226 # the merge driver should be idempotent, so just rerun it
37110 1b158ca37ea4 merge: use constants for merge driver state Gregory Szorc <gregory.szorc@gmail.com> parents: 37109 diff changeset	227 mdstate = MERGE_DRIVER_STATE_UNMARKED
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	228
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	229 self._readmergedriver = bits[0]
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	230 self._mdstate = mdstate
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	231 elif rtype in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	232 RECORD_MERGED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	233 RECORD_CHANGEDELETE_CONFLICT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	234 RECORD_PATH_CONFLICT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	235 RECORD_MERGE_DRIVER_MERGE,
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	236 RECORD_RESOLVED_OTHER,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	237 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	238 bits = record.split(b'\0')
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	239 self._state[bits[0]] = bits[1:]
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	240 elif rtype == RECORD_FILE_VALUES:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	241 filename, rawextras = record.split(b'\0', 1)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	242 extraparts = rawextras.split(b'\0')
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	243 extras = {}
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	244 i = 0
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	245 while i < len(extraparts):
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	246 extras[extraparts[i]] = extraparts[i + 1]
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	247 i += 2
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	248
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	249 self._stateextras[filename] = extras
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	250 elif rtype == RECORD_LABELS:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	251 labels = record.split(b'\0', 2)
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	252 self._labels = [l for l in labels if len(l) > 0]
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	253 elif not rtype.islower():
26986 1ee5e48f09d4 mergestate: raise structured exception for unsupported merge records Siddharth Agarwal <sid0@fb.com> parents: 26975 diff changeset	254 unsupported.add(rtype)
27074 78b0c88ab0db mergestate._resolve: store return code and action for each file Siddharth Agarwal <sid0@fb.com> parents: 27049 diff changeset	255 self._results = {}
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	256 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	257
26986 1ee5e48f09d4 mergestate: raise structured exception for unsupported merge records Siddharth Agarwal <sid0@fb.com> parents: 26975 diff changeset	258 if unsupported:
1ee5e48f09d4 mergestate: raise structured exception for unsupported merge records Siddharth Agarwal <sid0@fb.com> parents: 26975 diff changeset	259 raise error.UnsupportedMergeRecords(unsupported)
1ee5e48f09d4 mergestate: raise structured exception for unsupported merge records Siddharth Agarwal <sid0@fb.com> parents: 26975 diff changeset	260
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	261 def _readrecords(self):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	262 """Read merge state from disk and return a list of record (TYPE, data)
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	263
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20945 diff changeset	264 We read data from both v1 and v2 files and decide which one to use.
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	265
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20945 diff changeset	266 V1 has been used by version prior to 2.9.1 and contains less data than
7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20945 diff changeset	267 v2. We read both versions and check if no data in v2 contradicts
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	268 v1. If there is not contradiction we can safely assume that both v1
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	269 and v2 were written at the same time and use the extract data in v2. If
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	270 there is contradiction we ignore v2 content as we assume an old version
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 20945 diff changeset	271 of Mercurial has overwritten the mergestate file and left an old v2
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	272 file around.
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	273
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	274 returns list of record [(TYPE, data), ...]"""
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	275 v1records = self._readrecordsv1()
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	276 v2records = self._readrecordsv2()
26500 5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	277 if self._v1v2match(v1records, v2records):
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	278 return v2records
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	279 else:
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	280 # v1 file is newer than v2 file, use it
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	281 # we have to infer the "other" changeset of the merge
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	282 # we cannot do better than that with v1 of the format
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	283 mctx = self._repo[None].parents()[-1]
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	284 v1records.append((RECORD_OTHER, mctx.hex()))
26500 5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	285 # add place holder "other" file node information
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	286 # nobody is using it yet so we do no need to fetch the data
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	287 # if mctx was wrong `mctx[bits[-2]]` may fails.
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	288 for idx, r in enumerate(v1records):
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	289 if r[0] == RECORD_MERGED:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	290 bits = r[1].split(b'\0')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	291 bits.insert(-2, b'')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	292 v1records[idx] = (r[0], b'\0'.join(bits))
26500 5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	293 return v1records
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	294
5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	295 def _v1v2match(self, v1records, v2records):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	296 oldv2 = set() # old format version of v2 record
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	297 for rec in v2records:
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	298 if rec[0] == RECORD_LOCAL:
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	299 oldv2.add(rec)
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	300 elif rec[0] == RECORD_MERGED:
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	301 # drop the onode data (not contained in v1)
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	302 oldv2.add((RECORD_MERGED, _droponode(rec[1])))
20593 3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	303 for rec in v1records:
3678707e4017 merge: add "other" file node in the merge state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20592 diff changeset	304 if rec not in oldv2:
26500 5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	305 return False
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	306 else:
26500 5bd7c4c07f6d merge.mergestate: factor out code to validate v1/v2 records Siddharth Agarwal <sid0@fb.com> parents: 26361 diff changeset	307 return True
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	308
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	309 def _readrecordsv1(self):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	310 """read on disk merge state for version 1 file
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	311
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	312 returns list of record [(TYPE, data), ...]
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	313
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	314 Note: the "F" data from this file are one entry short
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	315 (no "other file node" entry)
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	316 """
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	317 records = []
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	318 try:
23877 7cc77030c557 localrepo: remove all external users of localrepo.opener Angel Ezquerra <angel.ezquerra@gmail.com> parents: 23656 diff changeset	319 f = self._repo.vfs(self.statepathv1)
6530 4b92591c69a7 merge: replace readline() call, missing from posixfile_nt Patrick Mezard <pmezard@gmail.com> parents: 6518 diff changeset	320 for i, l in enumerate(f):
4b92591c69a7 merge: replace readline() call, missing from posixfile_nt Patrick Mezard <pmezard@gmail.com> parents: 6518 diff changeset	321 if i == 0:
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	322 records.append((RECORD_LOCAL, l[:-1]))
6530 4b92591c69a7 merge: replace readline() call, missing from posixfile_nt Patrick Mezard <pmezard@gmail.com> parents: 6518 diff changeset	323 else:
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	324 records.append((RECORD_MERGED, l[:-1]))
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13323 diff changeset	325 f.close()
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25151 diff changeset	326 except IOError as err:
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	327 if err.errno != errno.ENOENT:
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	328 raise
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	329 return records
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	330
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	331 def _readrecordsv2(self):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	332 """read on disk merge state for version 2 file
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	333
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	334 This format is a list of arbitrary records of the form:
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	335
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	336 [type][length][content]
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	337
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	338 `type` is a single character, `length` is a 4 byte integer, and
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	339 `content` is an arbitrary byte sequence of length `length`.
35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	340
27027 a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	341 Mercurial versions prior to 3.7 have a bug where if there are
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	342 unsupported mandatory merge records, attempting to clear out the merge
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	343 state with hg update --clean or similar aborts. The 't' record type
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	344 works around that by writing out what those versions treat as an
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	345 advisory record, but later versions interpret as special: the first
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	346 character is the 'real' record type and everything onwards is the data.
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	347
27022 35102876d648 mergestate: move binary format documentation into _readrecordsv2 Siddharth Agarwal <sid0@fb.com> parents: 27006 diff changeset	348 Returns list of records [(TYPE, data), ...]."""
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	349 records = []
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	350 try:
23877 7cc77030c557 localrepo: remove all external users of localrepo.opener Angel Ezquerra <angel.ezquerra@gmail.com> parents: 23656 diff changeset	351 f = self._repo.vfs(self.statepathv2)
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	352 data = f.read()
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	353 off = 0
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	354 end = len(data)
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	355 while off < end:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	356 rtype = data[off : off + 1]
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	357 off += 1
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	358 length = _unpack(b'>I', data[off : (off + 4)])[0]
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	359 off += 4
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	360 record = data[off : (off + length)]
20607 abd448767465 merge: fix spelling of length Olle Lundberg <geek@nerd.sh> parents: 20594 diff changeset	361 off += length
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	362 if rtype == RECORD_OVERRIDE:
36537 1d99260c3a81 py3: slice over bytes to prevent getting ascii values Pulkit Goyal <7895pulkit@gmail.com> parents: 36477 diff changeset	363 rtype, record = record[0:1], record[1:]
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	364 records.append((rtype, record))
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	365 f.close()
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25151 diff changeset	366 except IOError as err:
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	367 if err.errno != errno.ENOENT:
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	368 raise
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	369 return records
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	370
26649 f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	371 @util.propertycache
f618b6aa8cdd merge.mergestate: add support for persisting a custom merge driver Siddharth Agarwal <sid0@fb.com> parents: 26641 diff changeset	372 def mergedriver(self):
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	373 # protect against the following:
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	374 # - A configures a malicious merge driver in their hgrc, then
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	375 # pauses the merge
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	376 # - A edits their hgrc to remove references to the merge driver
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	377 # - A gives a copy of their entire repo, including .hg, to B
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	378 # - B inspects .hgrc and finds it to be clean
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	379 # - B then continues the merge and the malicious merge driver
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	380 # gets invoked
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	381 configmergedriver = self._repo.ui.config(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	382 b'experimental', b'mergedriver'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	383 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	384 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	385 self._readmergedriver is not None
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	386 and self._readmergedriver != configmergedriver
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	387 ):
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	388 raise error.ConfigError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	389 _(b"merge driver changed since merge started"),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	390 hint=_(b"revert merge driver change or abort merge"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	391 )
26768 ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	392
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	393 return configmergedriver
ac68769a5985 merge.mergestate: only check for merge driver when property is accessed Siddharth Agarwal <sid0@fb.com> parents: 26766 diff changeset	394
26765 45976219eb80 merge.mergestate: add a way to get the other side of the merge Siddharth Agarwal <sid0@fb.com> parents: 26752 diff changeset	395 @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	396 def local(self):
27130 6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	397 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	398 msg = b"local accessed but self._local isn't set"
31646 e960eba3581c merge: use ProgrammingError Jun Wu <quark@fb.com> parents: 31515 diff changeset	399 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	400 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	401
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	402 @util.propertycache
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	403 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	404 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	405
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	406 @util.propertycache
b1069b369d6e mergestate: add accessors for local and other nodeid, not just contexts Martin von Zweigbergk <martinvonz@google.com> parents: 44212 diff changeset	407 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	408 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	409 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	410 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	411 return self._other
27130 6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	412
6f045b563fa5 mergestate: add a cached property accessor for the local context Siddharth Agarwal <sid0@fb.com> parents: 27129 diff changeset	413 @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	414 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	415 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	416
21264 4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	417 def active(self):
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	418 """Whether mergestate is active.
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	419
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	420 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	421 for "is a merge in progress."
4e932dc5c113 resolve: abort when not applicable (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 21261 diff changeset	422 """
44394 5e3402a0b868 mergestate: determine if active without looking for state files on disk Martin von Zweigbergk <martinvonz@google.com> parents: 44383 diff changeset	423 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	424
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	425 def commit(self):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	426 """Write current state on disk (if necessary)"""
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	427 if self._dirty:
27006 9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	428 records = self._makerecords()
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	429 self._writerecords(records)
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	430 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	431
27006 9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	432 def _makerecords(self):
9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	433 records = []
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	434 records.append((RECORD_LOCAL, hex(self._local)))
a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	435 records.append((RECORD_OTHER, hex(self._other)))
27006 9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	436 if self.mergedriver:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	437 records.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	438 (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	439 RECORD_MERGE_DRIVER_STATE,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	440 b'\0'.join([self.mergedriver, self._mdstate]),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	441 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	442 )
34560 1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	443 # Write out state items. In all cases, the value of the state map entry
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	444 # is written as the contents of the record. The record type depends on
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	445 # the type of state that is stored, and capital-letter records are used
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	446 # to prevent older versions of Mercurial that do not support the feature
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	447 # from loading them.
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	448 for filename, v in pycompat.iteritems(self._state):
37111 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	449 if v[0] == MERGE_RECORD_DRIVER_RESOLVED:
34560 1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	450 # Driver-resolved merge. These are stored in 'D' records.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	451 records.append(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	452 (RECORD_MERGE_DRIVER_MERGE, b'\0'.join([filename] + v))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	453 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	454 elif v[0] in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	455 MERGE_RECORD_UNRESOLVED_PATH,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	456 MERGE_RECORD_RESOLVED_PATH,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	457 ):
34560 1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	458 # Path conflicts. These are stored in 'P' records. The current
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	459 # resolution state ('pu' or 'pr') is stored within the record.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	460 records.append(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	461 (RECORD_PATH_CONFLICT, b'\0'.join([filename] + v))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	462 )
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	463 elif v[0] == MERGE_RECORD_MERGED_OTHER:
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	464 records.append(
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	465 (RECORD_RESOLVED_OTHER, b'\0'.join([filename] + v))
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	466 )
27031 8be0af32e513 mergestate: allow storing and retrieving change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27027 diff changeset	467 elif v[1] == nullhex or v[6] == nullhex:
34560 1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	468 # Change/Delete or Delete/Change conflicts. These are stored in
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	469 # 'C' records. v[1] is the local file, and is nullhex when the
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	470 # file is deleted locally ('dc'). v[6] is the remote file, and
1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	471 # is nullhex when the file is deleted remotely ('cd').
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	472 records.append(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	473 (RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	474 )
27006 9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	475 else:
34560 1248aa48cac9 merge: improve comments in mergestate._makerecords Mark Thomas <mbthomas@fb.com> parents: 34555 diff changeset	476 # Normal files. These are stored in 'F' records.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	477 records.append((RECORD_MERGED, b'\0'.join([filename] + v)))
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	478 for filename, extras in sorted(pycompat.iteritems(self._stateextras)):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	479 rawextras = b'\0'.join(
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	480 b'%s\0%s' % (k, v) for k, v in pycompat.iteritems(extras)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	481 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	482 records.append(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	483 (RECORD_FILE_VALUES, b'%s\0%s' % (filename, rawextras))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	484 )
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	485 if self._labels is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	486 labels = b'\0'.join(self._labels)
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	487 records.append((RECORD_LABELS, labels))
27006 9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	488 return records
9d58dc193c46 mergestate.commit: factor out making the list of records Siddharth Agarwal <sid0@fb.com> parents: 27005 diff changeset	489
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	490 def _writerecords(self, records):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	491 """Write current state on disk (both v1 and v2)"""
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	492 self._writerecordsv1(records)
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	493 self._writerecordsv2(records)
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	494
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	495 def _writerecordsv1(self, records):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	496 """Write current state on disk in a version 1 file"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	497 f = self._repo.vfs(self.statepathv1, b'wb')
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	498 irecords = iter(records)
29216 ead25aa27a43 py3: convert to next() function timeless <timeless@mozdev.org> parents: 29148 diff changeset	499 lrecords = next(irecords)
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	500 assert lrecords[0] == RECORD_LOCAL
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	501 f.write(hex(self._local) + b'\n')
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	502 for rtype, data in irecords:
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	503 if rtype == RECORD_MERGED:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	504 f.write(b'%s\n' % _droponode(data))
20589 31993cd23b11 merge: change the merge state serialisation to use a record based logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 20588 diff changeset	505 f.close()
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	506
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	507 def _writerecordsv2(self, records):
27027 a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	508 """Write current state on disk in a version 2 file
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	509
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	510 See the docstring for _readrecordsv2 for why we use 't'."""
a01ecbcfaf84 mergestate: handle additional record types specially Siddharth Agarwal <sid0@fb.com> parents: 27022 diff changeset	511 # these are the records that all version 2 clients can read
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	512 allowlist = (RECORD_LOCAL, RECORD_OTHER, RECORD_MERGED)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	513 f = self._repo.vfs(self.statepathv2, b'wb')
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	514 for key, data in records:
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	515 assert len(key) == 1
37109 a532b2f54f95 merge: use constants for merge state record types Gregory Szorc <gregory.szorc@gmail.com> parents: 37107 diff changeset	516 if key not in allowlist:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	517 key, data = RECORD_OVERRIDE, b'%s%s' % (key, data)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	518 format = b'>sI%is' % len(data)
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	519 f.write(_pack(format, key, len(data), data))
2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	520 f.close()
20651 c1a52dd56eb4 merge: add blank line between mergestate's method Pierre-Yves David <pierre-yves.david@fb.com> parents: 20642 diff changeset	521
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	522 @staticmethod
8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	523 def getlocalkey(path):
8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	524 """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	525 directory."""
8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	526
44060 a61287a95dc3 core: migrate uses of hashlib.sha1 to hashutil.sha1 Augie Fackler <augie@google.com> parents: 43798 diff changeset	527 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	528
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	529 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	530 """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	531 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	532 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	533 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	534 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	535
2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	536 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	537 """
27049 0d61f7ec7f76 mergestate.add: store absentfilectxes as nullhex Siddharth Agarwal <sid0@fb.com> parents: 27048 diff changeset	538 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	539 localkey = nullhex
27049 0d61f7ec7f76 mergestate.add: store absentfilectxes as nullhex Siddharth Agarwal <sid0@fb.com> parents: 27048 diff changeset	540 else:
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	541 localkey = mergestate.getlocalkey(fcl.path())
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	542 self._repo.vfs.write(b'merge/' + localkey, fcl.data())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	543 self._state[fd] = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	544 MERGE_RECORD_UNRESOLVED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	545 localkey,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	546 fcl.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	547 fca.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	548 hex(fca.filenode()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	549 fco.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	550 hex(fco.filenode()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	551 fcl.flags(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	552 ]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	553 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	554 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	555
34545 1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	556 def addpath(self, path, frename, forigin):
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	557 """add a new conflicting path to the merge state
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	558 path: the path that conflicts
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	559 frename: the filename the conflicting file was renamed to
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	560 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	561 """
37111 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	562 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	563 self._dirty = True
1913162854f2 merge: add pathconflict merge state Mark Thomas <mbthomas@fb.com> parents: 34522 diff changeset	564
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	565 def addmergedother(self, path):
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	566 self._state[path] = [MERGE_RECORD_MERGED_OTHER, nullhex, nullhex]
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	567 self._dirty = True
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	568
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	569 def __contains__(self, dfile):
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	570 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	571
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	572 def __getitem__(self, dfile):
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	573 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	574
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	575 def __iter__(self):
21268 a0b8a912ec81 merge: simplify mergestate iter Mads Kiilerich <mads@kiilerich.com> parents: 21266 diff changeset	576 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	577
19285 feaf5749d7a4 merge: add a files method to the mergestate class Bryan O'Sullivan <bryano@fb.com> parents: 19226 diff changeset	578 def files(self):
feaf5749d7a4 merge: add a files method to the mergestate class Bryan O'Sullivan <bryano@fb.com> parents: 19226 diff changeset	579 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	580
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	581 def mark(self, dfile, state):
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	582 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	583 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	584
26766 a83110faece1 merge.mergestate: add a way to get the merge driver state Siddharth Agarwal <sid0@fb.com> parents: 26765 diff changeset	585 def mdstate(self):
a83110faece1 merge.mergestate: add a way to get the merge driver state Siddharth Agarwal <sid0@fb.com> parents: 26765 diff changeset	586 return self._mdstate
a83110faece1 merge.mergestate: add a way to get the merge driver state Siddharth Agarwal <sid0@fb.com> parents: 26765 diff changeset	587
21266 19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	588 def unresolved(self):
19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	589 """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	590
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	591 for f, entry in pycompat.iteritems(self._state):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	592 if entry[0] in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	593 MERGE_RECORD_UNRESOLVED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	594 MERGE_RECORD_UNRESOLVED_PATH,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	595 ):
21266 19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	596 yield f
19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 21264 diff changeset	597
26740 f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	598 def driverresolved(self):
f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	599 """Obtain the paths of driver-resolved files."""
f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	600
f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	601 for f, entry in self._state.items():
37111 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	602 if entry[0] == MERGE_RECORD_DRIVER_RESOLVED:
26740 f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	603 yield f
f4a27c05c43f merge.mergestate: add a generator for driver-resolved files Siddharth Agarwal <sid0@fb.com> parents: 26682 diff changeset	604
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	605 def extras(self, filename):
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	606 return self._stateextras.setdefault(filename, {})
4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	607
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	608 def _resolve(self, preresolve, dfile, wctx):
20652 2a4871c2511d merge: adds documentation to the mergestate class Pierre-Yves David <pierre-yves.david@fb.com> parents: 20651 diff changeset	609 """rerun merge process for file path `dfile`"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	610 if self[dfile] in (MERGE_RECORD_RESOLVED, MERGE_RECORD_DRIVER_RESOLVED):
26616 2f1fce0d4e86 merge.mergestate._resolve: also return completed status Siddharth Agarwal <sid0@fb.com> parents: 26615 diff changeset	611 return True, 0
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	612 if self._state[dfile][0] == MERGE_RECORD_MERGED_OTHER:
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	613 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	614 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	615 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	616 octx = self._repo[self._other]
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	617 extras = self.extras(dfile)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	618 anccommitnode = extras.get(b'ancestorlinknode')
28011 8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	619 if anccommitnode:
8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	620 actx = self._repo[anccommitnode]
8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	621 else:
8abd9f785030 merge: add file ancestor linknode to mergestate Durham Goode <durham@fb.com> parents: 28009 diff changeset	622 actx = None
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	623 fcd = self._filectxorabsent(localkey, wctx, dfile)
27048 86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	624 fco = self._filectxorabsent(onode, octx, ofile)
86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	625 # 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	626 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	627 # "premerge" x flags
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	628 flo = fco.flags()
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	629 fla = fca.flags()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	630 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	631 if fca.node() == nullid and flags != flo:
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	632 if preresolve:
dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	633 self._repo.ui.warn(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	634 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	635 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	636 b'without common ancestor - keeping local flags\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	637 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	638 % afile
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	639 )
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	640 elif flags == fla:
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	641 flags = flo
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	642 if preresolve:
dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	643 # restore local
41155 8c222bec97da merge: make local file storage in the .hg/merge directory extensible Daniel Ploch <dploch@google.com> parents: 41050 diff changeset	644 if localkey != nullhex:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	645 f = self._repo.vfs(b'merge/' + localkey)
33083 05c680ebf512 merge: convert repo.wwrite() calls to wctx[f].write() Phil Cohen <phillco@fb.com> parents: 33082 diff changeset	646 wctx[dfile].write(f.read(), flags)
27048 86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	647 f.close()
86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	648 else:
33082 f9e50ee4c52b merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove() Phil Cohen <phillco@fb.com> parents: 33081 diff changeset	649 wctx[dfile].remove(ignoremissing=True)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	650 complete, r, deleted = filemerge.premerge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	651 self._repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	652 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	653 self._local,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	654 lfile,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	655 fcd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	656 fco,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	657 fca,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	658 labels=self._labels,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	659 )
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	660 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	661 complete, r, deleted = filemerge.filemerge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	662 self._repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	663 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	664 self._local,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	665 lfile,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	666 fcd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	667 fco,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	668 fca,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	669 labels=self._labels,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	670 )
13536 fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	671 if r is None:
fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	672 # no real conflict
fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	673 del self._state[dfile]
28009 4a25e91fa55d merge: add state extras merge state data Durham Goode <durham@fb.com> parents: 27951 diff changeset	674 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	675 self._dirty = True
13536 fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	676 elif not r:
37111 aa5199c7aa42 merge: use constants for merge record state Gregory Szorc <gregory.szorc@gmail.com> parents: 37110 diff changeset	677 self.mark(dfile, MERGE_RECORD_RESOLVED)
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	678
de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	679 if complete:
27075 6373330155b2 mergestate._resolve: don't return the action any more Siddharth Agarwal <sid0@fb.com> parents: 27074 diff changeset	680 action = None
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	681 if deleted:
27122 77d760ba8dcd mergestate: explicitly forget 'dc' conflicts where the deleted side is picked Siddharth Agarwal <sid0@fb.com> parents: 27121 diff changeset	682 if fcd.isabsent():
77d760ba8dcd mergestate: explicitly forget 'dc' conflicts where the deleted side is picked Siddharth Agarwal <sid0@fb.com> parents: 27121 diff changeset	683 # 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	684 # happen on re-resolves.
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	685 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	686 else:
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	687 # cd: remote picked (or otherwise deleted)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	688 action = ACTION_REMOVE
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	689 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	690 if fcd.isabsent(): # dc: remote picked
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	691 action = ACTION_GET
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	692 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	693 if dfile in self.localctx:
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	694 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	695 else:
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	696 action = ACTION_ADD
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	697 # else: regular merges (no action necessary)
27074 78b0c88ab0db mergestate._resolve: store return code and action for each file Siddharth Agarwal <sid0@fb.com> parents: 27049 diff changeset	698 self._results[dfile] = r, action
27035 de7bf242644e merge.mergestate: compute dirstate action Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	699
26616 2f1fce0d4e86 merge.mergestate._resolve: also return completed status Siddharth Agarwal <sid0@fb.com> parents: 26615 diff changeset	700 return complete, r
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	701
27048 86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	702 def _filectxorabsent(self, hexnode, ctx, f):
86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	703 if hexnode == nullhex:
86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	704 return filemerge.absentfilectx(ctx, f)
86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	705 else:
86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	706 return ctx[f]
86290f6f6599 mergestate._resolve: handle change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27035 diff changeset	707
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	708 def preresolve(self, dfile, wctx):
26870 ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	709 """run premerge process for dfile
ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	710
ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	711 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	712 return self._resolve(True, dfile, wctx)
26617 dfd9811c5c9b merge: introduce a preresolve function Siddharth Agarwal <sid0@fb.com> parents: 26616 diff changeset	713
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	714 def resolve(self, dfile, wctx):
26870 ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	715 """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	716
ab798d1a230f merge.mergestate: update docstrings for preresolve and resolve Siddharth Agarwal <sid0@fb.com> parents: 26821 diff changeset	717 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	718 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	719
27076 09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	720 def counts(self):
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	721 """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	722 session"""
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	723 updated, merged, removed = 0, 0, 0
43104 74802979dd9d py3: define and use pycompat.itervalues() Gregory Szorc <gregory.szorc@gmail.com> parents: 43090 diff changeset	724 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	725 if r is None:
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	726 updated += 1
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	727 elif r == 0:
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	728 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	729 removed += 1
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	730 else:
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	731 merged += 1
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	732 return updated, merged, removed
09139ccf3085 mergestate: add a method to return updated/merged/removed counts Siddharth Agarwal <sid0@fb.com> parents: 27075 diff changeset	733
27077 ca3fbf9dad8c mergestate: add a function to return the number of unresolved files Siddharth Agarwal <sid0@fb.com> parents: 27076 diff changeset	734 def unresolvedcount(self):
ca3fbf9dad8c mergestate: add a function to return the number of unresolved files Siddharth Agarwal <sid0@fb.com> parents: 27076 diff changeset	735 """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	736 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	737
27079 a88a10a933b2 mergestate: add a method to compute actions to perform on dirstate Siddharth Agarwal <sid0@fb.com> parents: 27078 diff changeset	738 def actions(self):
a88a10a933b2 mergestate: add a method to compute actions to perform on dirstate Siddharth Agarwal <sid0@fb.com> parents: 27078 diff changeset	739 """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	740 actions = {
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	741 ACTION_REMOVE: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	742 ACTION_FORGET: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	743 ACTION_ADD: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	744 ACTION_ADD_MODIFIED: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	745 ACTION_GET: [],
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	746 }
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	747 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	748 if action is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	749 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	750 return actions
a88a10a933b2 mergestate: add a method to compute actions to perform on dirstate Siddharth Agarwal <sid0@fb.com> parents: 27078 diff changeset	751
27088 e2b79f57903a mergestate: add a way to record pending dirstate actions Siddharth Agarwal <sid0@fb.com> parents: 27087 diff changeset	752 def recordactions(self):
e2b79f57903a mergestate: add a way to record pending dirstate actions Siddharth Agarwal <sid0@fb.com> parents: 27087 diff changeset	753 """record remove/add/get actions in the dirstate"""
e2b79f57903a mergestate: add a way to record pending dirstate actions Siddharth Agarwal <sid0@fb.com> parents: 27087 diff changeset	754 branchmerge = self._repo.dirstate.p2() != nullid
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	755 recordupdates(self._repo, self.actions(), branchmerge, None)
27088 e2b79f57903a mergestate: add a way to record pending dirstate actions Siddharth Agarwal <sid0@fb.com> parents: 27087 diff changeset	756
27090 ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	757 def queueremove(self, f):
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	758 """queues a file to be removed from the dirstate
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	759
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	760 Meant for use by custom merge drivers."""
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	761 self._results[f] = 0, ACTION_REMOVE
27090 ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	762
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	763 def queueadd(self, f):
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	764 """queues a file to be added to the dirstate
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	765
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	766 Meant for use by custom merge drivers."""
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	767 self._results[f] = 0, ACTION_ADD
27090 ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	768
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	769 def queueget(self, f):
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	770 """queues a file to be marked modified in the dirstate
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	771
ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	772 Meant for use by custom merge drivers."""
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	773 self._results[f] = 0, ACTION_GET
27090 ef6f98473a48 mergestate: add methods to queue files to remove, add or get Siddharth Agarwal <sid0@fb.com> parents: 27088 diff changeset	774
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	775
27740 da5634e1b8a3 merge: factor out code to get checkunknown config Siddharth Agarwal <sid0@fb.com> parents: 27657 diff changeset	776 def _getcheckunknownconfig(repo, section, name):
34522 bed1d2eaa108 configitems: register 'merge.checkunknown' and 'merge.checkignored' Boris Feld <boris.feld@octobus.net> parents: 34486 diff changeset	777 config = repo.ui.config(section, name)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	778 valid = [b'abort', b'ignore', b'warn']
27740 da5634e1b8a3 merge: factor out code to get checkunknown config Siddharth Agarwal <sid0@fb.com> parents: 27657 diff changeset	779 if config not in valid:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	780 validstr = b', '.join([b"'" + v + b"'" for v in valid])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	781 raise error.ConfigError(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	782 _(b"%s.%s not valid ('%s' is none of %s)")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	783 % (section, name, config, validstr)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	784 )
27740 da5634e1b8a3 merge: factor out code to get checkunknown config Siddharth Agarwal <sid0@fb.com> parents: 27657 diff changeset	785 return config
da5634e1b8a3 merge: factor out code to get checkunknown config Siddharth Agarwal <sid0@fb.com> parents: 27657 diff changeset	786
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	787
23653 0297d8469350 merge: don't overwrite untracked file at directory rename target Martin von Zweigbergk <martinvonz@google.com> parents: 23652 diff changeset	788 def _checkunknownfile(repo, wctx, mctx, f, f2=None):
35288 5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	789 if wctx.isinmemory():
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	790 # Nothing to do in IMM because nothing in the "working copy" can be an
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	791 # unknown file.
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	792 #
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	793 # Note that we should bail out here, not in ``_checkunknownfiles()``,
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	794 # because that function does other useful work.
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	795 return False
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	796
23653 0297d8469350 merge: don't overwrite untracked file at directory rename target Martin von Zweigbergk <martinvonz@google.com> parents: 23652 diff changeset	797 if f2 is None:
0297d8469350 merge: don't overwrite untracked file at directory rename target Martin von Zweigbergk <martinvonz@google.com> parents: 23652 diff changeset	798 f2 = f
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	799 return (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	800 repo.wvfs.audit.check(f)
28088 19424f960bf5 checkunknown: audit path before checking if it's a file or link Durham Goode <durham@fb.com> parents: 28022 diff changeset	801 and repo.wvfs.isfileorlink(f)
16284 2b0a406d3043 merge: fix unknown file merge detection for case-folding systems Matt Mackall <mpm@selenic.com> parents: 16261 diff changeset	802 and repo.dirstate.normalize(f) not in repo.dirstate
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	803 and mctx[f2].cmp(wctx[f])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	804 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	805
16093 7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	806
35171 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	807 class _unknowndirschecker(object):
34550 53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	808 """
53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	809 Look for any unknown files or directories that may have a path conflict
53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	810 with a file. If any path prefix of the file exists as a file or link,
53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	811 then it conflicts. If the file itself is a directory that contains any
53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	812 file that is not tracked, then it conflicts.
53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	813
53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	814 Returns the shortest path at which a conflict occurs, or None if there is
53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	815 no conflict.
53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	816 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	817
35171 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	818 def __init__(self):
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	819 # A set of paths known to be good. This prevents repeated checking of
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	820 # dirs. It will be updated with any new dirs that are checked and found
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	821 # to be safe.
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	822 self._unknowndircache = set()
34550 53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	823
35171 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	824 # A set of paths that are known to be absent. This prevents repeated
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	825 # checking of subdirectories that are known not to exist. It will be
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	826 # updated with any new dirs that are checked and found to be absent.
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	827 self._missingdircache = set()
34550 53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	828
35288 5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	829 def __call__(self, repo, wctx, f):
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	830 if wctx.isinmemory():
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	831 # Nothing to do in IMM for the same reason as ``_checkunknownfile``.
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	832 return False
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	833
35171 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	834 # Check for path prefixes that exist as unknown files.
43633 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43421 diff changeset	835 for p in reversed(list(pathutil.finddirs(f))):
35171 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	836 if p in self._missingdircache:
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	837 return
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	838 if p in self._unknowndircache:
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	839 continue
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	840 if repo.wvfs.audit.check(p):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	841 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	842 repo.wvfs.isfileorlink(p)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	843 and repo.dirstate.normalize(p) not in repo.dirstate
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	844 ):
35171 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	845 return p
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	846 if not repo.wvfs.lexists(p):
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	847 self._missingdircache.add(p)
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	848 return
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	849 self._unknowndircache.add(p)
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	850
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	851 # Check if the file conflicts with a directory containing unknown files.
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	852 if repo.wvfs.audit.check(f) and repo.wvfs.isdir(f):
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	853 # Does the directory contain any files that are not in the dirstate?
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	854 for p, dirs, files in repo.wvfs.walk(f):
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	855 for fn in files:
37086 658b1d28813c merge: pconvert paths in _unknowndirschecker before dirstate-normalizing Matt Harbison <matt_harbison@yahoo.com> parents: 36537 diff changeset	856 relf = util.pconvert(repo.wvfs.reljoin(p, fn))
37087 e4640ec346ac merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker Matt Harbison <matt_harbison@yahoo.com> parents: 37086 diff changeset	857 relf = repo.dirstate.normalize(relf, isknown=True)
35171 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	858 if relf not in repo.dirstate:
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	859 return f
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	860 return None
34550 53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	861
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	862
28020 cffa46cbdb8f merge: tell _checkunknownfiles about whether this was merge --force Siddharth Agarwal <sid0@fb.com> parents: 28019 diff changeset	863 def _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce):
23655 79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	864 """
79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	865 Considers any actions that care about the presence of conflicting unknown
79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	866 files. For some actions, the result is to abort; for others, it is to
79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	867 choose a different action.
79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	868 """
34551 1609a5afc4f5 merge: rename conflicts to fileconflicts in _checkunknownfiles Mark Thomas <mbthomas@fb.com> parents: 34550 diff changeset	869 fileconflicts = set()
34552 33c8a6837181 merge: check for path conflicts when updating (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34551 diff changeset	870 pathconflicts = set()
28018 3feadb0b6c34 merge: move abort/warn checks up to the top level of _checkunknownfiles Siddharth Agarwal <sid0@fb.com> parents: 28011 diff changeset	871 warnconflicts = set()
3feadb0b6c34 merge: move abort/warn checks up to the top level of _checkunknownfiles Siddharth Agarwal <sid0@fb.com> parents: 28011 diff changeset	872 abortconflicts = set()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	873 unknownconfig = _getcheckunknownconfig(repo, b'merge', b'checkunknown')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	874 ignoredconfig = _getcheckunknownconfig(repo, b'merge', b'checkignored')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	875 pathconfig = repo.ui.configbool(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	876 b'experimental', b'merge.checkpathconflicts'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	877 )
23655 79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	878 if not force:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	879
27741 3951f132958f merge: determine what untracked conflicts cause warns and aborts separately Siddharth Agarwal <sid0@fb.com> parents: 27740 diff changeset	880 def collectconflicts(conflicts, config):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	881 if config == b'abort':
27741 3951f132958f merge: determine what untracked conflicts cause warns and aborts separately Siddharth Agarwal <sid0@fb.com> parents: 27740 diff changeset	882 abortconflicts.update(conflicts)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	883 elif config == b'warn':
27741 3951f132958f merge: determine what untracked conflicts cause warns and aborts separately Siddharth Agarwal <sid0@fb.com> parents: 27740 diff changeset	884 warnconflicts.update(conflicts)
3951f132958f merge: determine what untracked conflicts cause warns and aborts separately Siddharth Agarwal <sid0@fb.com> parents: 27740 diff changeset	885
35171 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	886 checkunknowndirs = _unknowndirschecker()
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	887 for f, (m, args, msg) in pycompat.iteritems(actions):
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	888 if m in (ACTION_CREATED, ACTION_DELETED_CHANGED):
23655 79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	889 if _checkunknownfile(repo, wctx, mctx, f):
34551 1609a5afc4f5 merge: rename conflicts to fileconflicts in _checkunknownfiles Mark Thomas <mbthomas@fb.com> parents: 34550 diff changeset	890 fileconflicts.add(f)
34941 37450a122128 merge: add a config option to disable path conflict checking Siddharth Agarwal <sid0@fb.com> parents: 34919 diff changeset	891 elif pathconfig and f not in wctx:
35288 5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35284 diff changeset	892 path = checkunknowndirs(repo, wctx, f)
34552 33c8a6837181 merge: check for path conflicts when updating (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34551 diff changeset	893 if path is not None:
33c8a6837181 merge: check for path conflicts when updating (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34551 diff changeset	894 pathconflicts.add(path)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	895 elif m == ACTION_LOCAL_DIR_RENAME_GET:
23655 79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	896 if _checkunknownfile(repo, wctx, mctx, f, args[0]):
34551 1609a5afc4f5 merge: rename conflicts to fileconflicts in _checkunknownfiles Mark Thomas <mbthomas@fb.com> parents: 34550 diff changeset	897 fileconflicts.add(f)
23655 79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	898
34552 33c8a6837181 merge: check for path conflicts when updating (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34551 diff changeset	899 allconflicts = fileconflicts \| pathconflicts
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	900 ignoredconflicts = {c for c in allconflicts if repo.dirstate._ignore(c)}
34551 1609a5afc4f5 merge: rename conflicts to fileconflicts in _checkunknownfiles Mark Thomas <mbthomas@fb.com> parents: 34550 diff changeset	901 unknownconflicts = allconflicts - ignoredconflicts
27742 6b639caa1652 merge: split up checks for unknown and ignored files that differ Siddharth Agarwal <sid0@fb.com> parents: 27741 diff changeset	902 collectconflicts(ignoredconflicts, ignoredconfig)
6b639caa1652 merge: split up checks for unknown and ignored files that differ Siddharth Agarwal <sid0@fb.com> parents: 27741 diff changeset	903 collectconflicts(unknownconflicts, unknownconfig)
28022 e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	904 else:
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	905 for f, (m, args, msg) in pycompat.iteritems(actions):
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	906 if m == ACTION_CREATED_MERGE:
28022 e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	907 fl2, anc = args
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	908 different = _checkunknownfile(repo, wctx, mctx, f)
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	909 if repo.dirstate._ignore(f):
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	910 config = ignoredconfig
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	911 else:
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	912 config = unknownconfig
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	913
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	914 # The behavior when force is True is described by this table:
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	915 # config different mergeforce \| action backup
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	916 # * n * \| get n
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	917 # * y y \| merge -
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	918 # abort y n \| merge - (1)
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	919 # warn y n \| warn + get y
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	920 # ignore y n \| get y
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	921 #
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	922 # (1) this is probably the wrong behavior here -- we should
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	923 # probably abort, but some actions like rebases currently
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	924 # don't like an abort happening in the middle of
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	925 # merge.update.
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	926 if not different:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	927 actions[f] = (ACTION_GET, (fl2, False), b'remote created')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	928 elif mergeforce or config == b'abort':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	929 actions[f] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	930 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	931 (f, f, None, False, anc),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	932 b'remote differs from untracked local',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	933 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	934 elif config == b'abort':
28022 e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	935 abortconflicts.add(f)
e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	936 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	937 if config == b'warn':
28022 e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	938 warnconflicts.add(f)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	939 actions[f] = (ACTION_GET, (fl2, True), b'remote created')
27741 3951f132958f merge: determine what untracked conflicts cause warns and aborts separately Siddharth Agarwal <sid0@fb.com> parents: 27740 diff changeset	940
28018 3feadb0b6c34 merge: move abort/warn checks up to the top level of _checkunknownfiles Siddharth Agarwal <sid0@fb.com> parents: 28011 diff changeset	941 for f in sorted(abortconflicts):
34553 0217d66846f7 merge: improve error messages for path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34552 diff changeset	942 warn = repo.ui.warn
0217d66846f7 merge: improve error messages for path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34552 diff changeset	943 if f in pathconflicts:
0217d66846f7 merge: improve error messages for path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34552 diff changeset	944 if repo.wvfs.isfileorlink(f):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	945 warn(_(b"%s: untracked file conflicts with directory\n") % f)
34553 0217d66846f7 merge: improve error messages for path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34552 diff changeset	946 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	947 warn(_(b"%s: untracked directory conflicts with file\n") % f)
34553 0217d66846f7 merge: improve error messages for path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34552 diff changeset	948 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	949 warn(_(b"%s: untracked file differs\n") % f)
28018 3feadb0b6c34 merge: move abort/warn checks up to the top level of _checkunknownfiles Siddharth Agarwal <sid0@fb.com> parents: 28011 diff changeset	950 if abortconflicts:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	951 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	952 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	953 b"untracked files in working directory "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	954 b"differ from files in requested revision"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	955 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	956 )
28018 3feadb0b6c34 merge: move abort/warn checks up to the top level of _checkunknownfiles Siddharth Agarwal <sid0@fb.com> parents: 28011 diff changeset	957
3feadb0b6c34 merge: move abort/warn checks up to the top level of _checkunknownfiles Siddharth Agarwal <sid0@fb.com> parents: 28011 diff changeset	958 for f in sorted(warnconflicts):
34553 0217d66846f7 merge: improve error messages for path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34552 diff changeset	959 if repo.wvfs.isfileorlink(f):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	960 repo.ui.warn(_(b"%s: replacing untracked file\n") % f)
34553 0217d66846f7 merge: improve error messages for path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34552 diff changeset	961 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	962 repo.ui.warn(_(b"%s: replacing untracked files in directory\n") % f)
23655 79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	963
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	964 for f, (m, args, msg) in pycompat.iteritems(actions):
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	965 if m == ACTION_CREATED:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	966 backup = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	967 f in fileconflicts
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	968 or f in pathconflicts
43633 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43421 diff changeset	969 or any(p in pathconflicts for p in pathutil.finddirs(f))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	970 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	971 (flags,) = args
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	972 actions[f] = (ACTION_GET, (flags, backup), msg)
23655 79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	973
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	974
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	975 def _forgetremoved(wctx, mctx, branchmerge):
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	976 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	977 Forget removed files
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	978
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	979 If we're jumping between revisions (as opposed to merging), and if
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	980 neither the working directory nor the target rev has the file,
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	981 then we need to remove it from the dirstate, to prevent the
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	982 dirstate from listing the file when it is no longer in the
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	983 manifest.
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	984
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	985 If we're merging, and the other revision has removed a file
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	986 that is not present in the working directory, we need to mark it
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	987 as removed.
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	988 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	989
23640 b46b9865dd08 merge: let _forgetremoved() work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23639 diff changeset	990 actions = {}
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	991 m = ACTION_FORGET
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	992 if branchmerge:
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	993 m = ACTION_REMOVE
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	994 for f in wctx.deleted():
6272 dd9bd227ae9a merge: simplify some helpers Matt Mackall <mpm@selenic.com> parents: 6271 diff changeset	995 if f not in mctx:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	996 actions[f] = m, None, b"forget deleted"
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	997
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	998 if not branchmerge:
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	999 for f in wctx.removed():
6272 dd9bd227ae9a merge: simplify some helpers Matt Mackall <mpm@selenic.com> parents: 6271 diff changeset	1000 if f not in mctx:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1001 actions[f] = ACTION_FORGET, None, b"forget removed"
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	1002
23640 b46b9865dd08 merge: let _forgetremoved() work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23639 diff changeset	1003 return actions
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	1004
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1005
20640 52929dcdd512 merge: handle create+delete prompts in calculateupdates Mads Kiilerich <madski@unity3d.com> parents: 20639 diff changeset	1006 def _checkcollision(repo, wmf, actions):
38045 18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1007 """
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1008 Check for case-folding collisions.
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1009 """
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1010 # If the repo is narrowed, filter out files outside the narrowspec.
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1011 narrowmatch = repo.narrowmatch()
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1012 if not narrowmatch.always():
44287 e76d98546bd2 merge: use manifestdict.walk() instead of manifestdict.matches() Augie Fackler <augie@google.com> parents: 44271 diff changeset	1013 pmmf = set(wmf.walk(narrowmatch))
38045 18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1014 if actions:
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1015 narrowactions = {}
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	1016 for m, actionsfortype in pycompat.iteritems(actions):
38045 18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1017 narrowactions[m] = []
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1018 for (f, args, msg) in actionsfortype:
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1019 if narrowmatch(f):
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1020 narrowactions[m].append((f, args, msg))
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38044 diff changeset	1021 actions = narrowactions
44287 e76d98546bd2 merge: use manifestdict.walk() instead of manifestdict.matches() Augie Fackler <augie@google.com> parents: 44271 diff changeset	1022 else:
e76d98546bd2 merge: use manifestdict.walk() instead of manifestdict.matches() Augie Fackler <augie@google.com> parents: 44271 diff changeset	1023 # build provisional merged manifest up
e76d98546bd2 merge: use manifestdict.walk() instead of manifestdict.matches() Augie Fackler <augie@google.com> parents: 44271 diff changeset	1024 pmmf = set(wmf)
19105 c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	1025
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1026 if actions:
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1027 # KEEP and EXEC are no-op
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1028 for m in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1029 ACTION_ADD,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1030 ACTION_ADD_MODIFIED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1031 ACTION_FORGET,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1032 ACTION_GET,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1033 ACTION_CHANGED_DELETED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1034 ACTION_DELETED_CHANGED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1035 ):
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1036 for f, args, msg in actions[m]:
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1037 pmmf.add(f)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1038 for f, args, msg in actions[ACTION_REMOVE]:
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1039 pmmf.discard(f)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1040 for f, args, msg in actions[ACTION_DIR_RENAME_MOVE_LOCAL]:
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1041 f2, flags = args
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1042 pmmf.discard(f2)
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1043 pmmf.add(f)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1044 for f, args, msg in actions[ACTION_LOCAL_DIR_RENAME_GET]:
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1045 pmmf.add(f)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1046 for f, args, msg in actions[ACTION_MERGE]:
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1047 f1, f2, fa, move, anc = args
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1048 if move:
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1049 pmmf.discard(f1)
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1050 pmmf.add(f)
19105 c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	1051
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	1052 # check case-folding collision in provisional merged manifest
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	1053 foldmap = {}
33808 055fee3547df merge: removed sorting in casefolding detection, for a slight performance win Alex Gaynor <agaynor@mozilla.com> parents: 33499 diff changeset	1054 for f in pmmf:
19105 c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	1055 fold = util.normcase(f)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	1056 if fold in foldmap:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1057 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1058 _(b"case-folding collision between %s and %s")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1059 % (f, foldmap[fold])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1060 )
19105 c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	1061 foldmap[fold] = f
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	1062
26661 2b955fec91e0 merge: abort on file/directory case folding collisions (issue4892) Mads Kiilerich <madski@unity3d.com> parents: 26651 diff changeset	1063 # check case-folding of directories
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1064 foldprefix = unfoldprefix = lastfull = b''
26661 2b955fec91e0 merge: abort on file/directory case folding collisions (issue4892) Mads Kiilerich <madski@unity3d.com> parents: 26651 diff changeset	1065 for fold, f in sorted(foldmap.items()):
2b955fec91e0 merge: abort on file/directory case folding collisions (issue4892) Mads Kiilerich <madski@unity3d.com> parents: 26651 diff changeset	1066 if fold.startswith(foldprefix) and not f.startswith(unfoldprefix):
2b955fec91e0 merge: abort on file/directory case folding collisions (issue4892) Mads Kiilerich <madski@unity3d.com> parents: 26651 diff changeset	1067 # the folded prefix matches but actual casing is different
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1068 raise error.Abort(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	1069 _(b"case-folding collision between %s and directory of %s")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1070 % (lastfull, f)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1071 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1072 foldprefix = fold + b'/'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1073 unfoldprefix = f + b'/'
26661 2b955fec91e0 merge: abort on file/directory case folding collisions (issue4892) Mads Kiilerich <madski@unity3d.com> parents: 26651 diff changeset	1074 lastfull = f
2b955fec91e0 merge: abort on file/directory case folding collisions (issue4892) Mads Kiilerich <madski@unity3d.com> parents: 26651 diff changeset	1075
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1076
26785 e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1077 def driverpreprocess(repo, ms, wctx, labels=None):
e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1078 """run the preprocess step of the merge driver, if any
e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1079
e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1080 This is currently not implemented -- it's an extension point."""
e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1081 return True
e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1082
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1083
26785 e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1084 def driverconclude(repo, ms, wctx, labels=None):
e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1085 """run the conclude step of the merge driver, if any
e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1086
e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1087 This is currently not implemented -- it's an extension point."""
e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1088 return True
e9a0d5f5c225 merge: add stubs for preprocess and conclude steps of merge driver Siddharth Agarwal <sid0@fb.com> parents: 26769 diff changeset	1089
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1090
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1091 def _filesindirs(repo, manifest, dirs):
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1092 """
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1093 Generator that yields pairs of all the files in the manifest that are found
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1094 inside the directories listed in dirs, and which directory they are found
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1095 in.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1096 """
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1097 for f in manifest:
43633 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43421 diff changeset	1098 for p in pathutil.finddirs(f):
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1099 if p in dirs:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1100 yield f, p
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1101 break
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1102
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1103
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1104 def checkpathconflicts(repo, wctx, mctx, actions):
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1105 """
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1106 Check if any actions introduce path conflicts in the repository, updating
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1107 actions to record or handle the path conflict accordingly.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1108 """
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1109 mf = wctx.manifest()
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1110
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1111 # The set of local files that conflict with a remote directory.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1112 localconflicts = set()
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1113
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1114 # The set of directories that conflict with a remote file, and so may cause
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1115 # conflicts if they still contain any files after the merge.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1116 remoteconflicts = set()
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1117
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1118 # The set of directories that appear as both a file and a directory in the
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1119 # remote manifest. These indicate an invalid remote manifest, which
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1120 # can't be updated to cleanly.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1121 invalidconflicts = set()
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1122
35172 a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1123 # The set of directories that contain files that are being created.
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1124 createdfiledirs = set()
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1125
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1126 # The set of files deleted by all the actions.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1127 deletedfiles = set()
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1128
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1129 for f, (m, args, msg) in actions.items():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1130 if m in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1131 ACTION_CREATED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1132 ACTION_DELETED_CHANGED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1133 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1134 ACTION_CREATED_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1135 ):
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1136 # This action may create a new local file.
43633 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43421 diff changeset	1137 createdfiledirs.update(pathutil.finddirs(f))
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1138 if mf.hasdir(f):
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1139 # The file aliases a local directory. This might be ok if all
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1140 # the files in the local directory are being deleted. This
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1141 # will be checked once we know what all the deleted files are.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1142 remoteconflicts.add(f)
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1143 # Track the names of all deleted files.
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1144 if m == ACTION_REMOVE:
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1145 deletedfiles.add(f)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1146 if m == ACTION_MERGE:
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1147 f1, f2, fa, move, anc = args
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1148 if move:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1149 deletedfiles.add(f1)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1150 if m == ACTION_DIR_RENAME_MOVE_LOCAL:
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1151 f2, flags = args
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1152 deletedfiles.add(f2)
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1153
35172 a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1154 # Check all directories that contain created files for path conflicts.
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1155 for p in createdfiledirs:
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1156 if p in mf:
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1157 if p in mctx:
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1158 # A file is in a directory which aliases both a local
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1159 # and a remote file. This is an internal inconsistency
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1160 # within the remote manifest.
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1161 invalidconflicts.add(p)
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1162 else:
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1163 # A file is in a directory which aliases a local file.
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1164 # We will need to rename the local file.
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1165 localconflicts.add(p)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1166 if p in actions and actions[p][0] in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1167 ACTION_CREATED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1168 ACTION_DELETED_CHANGED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1169 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1170 ACTION_CREATED_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1171 ):
35172 a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1172 # The file is in a directory which aliases a remote file.
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1173 # This is an internal inconsistency within the remote
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1174 # manifest.
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1175 invalidconflicts.add(p)
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 35171 diff changeset	1176
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1177 # Rename all local conflicting files that have not been deleted.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1178 for p in localconflicts:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1179 if p not in deletedfiles:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1180 ctxname = bytes(wctx).rstrip(b'+')
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1181 pnew = util.safename(p, ctxname, wctx, set(actions.keys()))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1182 actions[pnew] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1183 ACTION_PATH_CONFLICT_RESOLVE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1184 (p,),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1185 b'local path conflict',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1186 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1187 actions[p] = (ACTION_PATH_CONFLICT, (pnew, b'l'), b'path conflict')
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1188
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1189 if remoteconflicts:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1190 # Check if all files in the conflicting directories have been removed.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1191 ctxname = bytes(mctx).rstrip(b'+')
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1192 for f, p in _filesindirs(repo, mf, remoteconflicts):
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1193 if f not in deletedfiles:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1194 m, args, msg = actions[p]
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1195 pnew = util.safename(p, ctxname, wctx, set(actions.keys()))
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1196 if m in (ACTION_DELETED_CHANGED, ACTION_MERGE):
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1197 # Action was merge, just update target.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1198 actions[pnew] = (m, args, msg)
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1199 else:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1200 # Action was create, change to renamed get action.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1201 fl = args[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1202 actions[pnew] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1203 ACTION_LOCAL_DIR_RENAME_GET,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1204 (p, fl),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1205 b'remote path conflict',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1206 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1207 actions[p] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1208 ACTION_PATH_CONFLICT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1209 (pnew, ACTION_REMOVE),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1210 b'path conflict',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1211 )
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1212 remoteconflicts.remove(p)
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1213 break
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1214
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1215 if invalidconflicts:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1216 for p in invalidconflicts:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1217 repo.ui.warn(_(b"%s: is both a file and a directory\n") % p)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1218 raise error.Abort(_(b"destination manifest contains path conflicts"))
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1219
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1220
38044 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1221 def _filternarrowactions(narrowmatch, branchmerge, actions):
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1222 """
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1223 Filters out actions that can ignored because the repo is narrowed.
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1224
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1225 Raise an exception if the merge cannot be completed because the repo is
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1226 narrowed.
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1227 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1228 nooptypes = {b'k'} # TODO: handle with nonconflicttypes
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1229 nonconflicttypes = set(b'a am c cm f g gs r e'.split())
38044 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1230 # We mutate the items in the dict during iteration, so iterate
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1231 # over a copy.
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1232 for f, action in list(actions.items()):
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1233 if narrowmatch(f):
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1234 pass
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1235 elif not branchmerge:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1236 del actions[f] # just updating, ignore changes outside clone
38044 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1237 elif action[0] in nooptypes:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1238 del actions[f] # merge does not affect file
38044 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1239 elif action[0] in nonconflicttypes:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1240 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1241 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1242 b'merge affects file \'%s\' outside narrow, '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1243 b'which is not yet supported'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1244 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1245 % f,
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	1246 hint=_(b'merging in the other direction may work'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1247 )
38044 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1248 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1249 raise error.Abort(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	1250 _(b'conflict in file \'%s\' is outside narrow clone') % f
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1251 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1252
38044 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1253
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1254 def manifestmerge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1255 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1256 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1257 p2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1258 pa,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1259 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1260 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1261 matcher,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1262 acceptremote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1263 followcopies,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1264 forcefulldiff=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1265 ):
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	1266 """
30096 98d3d8108db0 merge: update doc of manifestmerge() per 18c2184c27dc Yuya Nishihara <yuya@tcha.org> parents: 30060 diff changeset	1267 Merge wctx and p2 with ancestor pa and generate merge action list
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	1268
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18544 diff changeset	1269 branchmerge and force are as passed in to update
27346 ba0da4b7397d merge: rework manifestmerge to use a matcher Augie Fackler <augie@google.com> parents: 27345 diff changeset	1270 matcher = matcher to filter file lists
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	1271 acceptremote = accept the incoming changes without prompting
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	1272 """
27346 ba0da4b7397d merge: rework manifestmerge to use a matcher Augie Fackler <augie@google.com> parents: 27345 diff changeset	1273 if matcher is not None and matcher.always():
ba0da4b7397d merge: rework manifestmerge to use a matcher Augie Fackler <augie@google.com> parents: 27345 diff changeset	1274 matcher = None
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	1275
18651 e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	1276 # manifests fetched in order are going to be faster, so prime the caches
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1277 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1278 x.manifest()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1279 for x in sorted(wctx.parents() + [p2, pa], key=scmutil.intrev)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1280 ]
18651 e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	1281
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1282 branch_copies1 = copies.branch_copies()
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1283 branch_copies2 = copies.branch_copies()
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1284 diverge = {}
18651 e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	1285 if followcopies:
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1286 branch_copies1, branch_copies2, diverge = copies.mergecopies(
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1287 repo, wctx, p2, pa
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1288 )
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	1289
32641 49e1e5acb8ff py3: convert bool variables to bytes before passing into ui.debug() Pulkit Goyal <7895pulkit@gmail.com> parents: 32612 diff changeset	1290 boolbm = pycompat.bytestr(bool(branchmerge))
49e1e5acb8ff py3: convert bool variables to bytes before passing into ui.debug() Pulkit Goyal <7895pulkit@gmail.com> parents: 32612 diff changeset	1291 boolf = pycompat.bytestr(bool(force))
49e1e5acb8ff py3: convert bool variables to bytes before passing into ui.debug() Pulkit Goyal <7895pulkit@gmail.com> parents: 32612 diff changeset	1292 boolm = pycompat.bytestr(bool(matcher))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1293 repo.ui.note(_(b"resolving manifests\n"))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1294 repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1295 b" branchmerge: %s, force: %s, partial: %s\n" % (boolbm, boolf, boolm)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1296 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1297 repo.ui.debug(b" ancestor: %s, local: %s, remote: %s\n" % (pa, wctx, p2))
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	1298
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	1299 m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest()
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1300 copied1 = set(branch_copies1.copy.values())
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1301 copied1.update(branch_copies1.movewithdir.values())
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1302 copied2 = set(branch_copies2.copy.values())
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1303 copied2.update(branch_copies2.movewithdir.values())
3295 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	1304
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1305 if b'.hgsubstate' in m1 and wctx.rev() is None:
38425 1322ae04d3d7 merge: do not fill manifest of committed revision with pseudo node (issue5526) Yuya Nishihara <yuya@tcha.org> parents: 37762 diff changeset	1306 # Check whether sub state is modified, and overwrite the manifest
1322ae04d3d7 merge: do not fill manifest of committed revision with pseudo node (issue5526) Yuya Nishihara <yuya@tcha.org> parents: 37762 diff changeset	1307 # to flag the change. If wctx is a committed revision, we shouldn't
1322ae04d3d7 merge: do not fill manifest of committed revision with pseudo node (issue5526) Yuya Nishihara <yuya@tcha.org> parents: 37762 diff changeset	1308 # care for the dirty state of the working directory.
28226 377f0d8ff874 merge: use any() instead of for loop when checking for dirty subrepos Martin von Zweigbergk <martinvonz@google.com> parents: 28200 diff changeset	1309 if any(wctx.sub(s).dirty() for s in wctx.substate):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1310 m1[b'.hgsubstate'] = modifiednodeid
9783 ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9780 diff changeset	1311
32151 4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1312 # Don't use m2-vs-ma optimization if:
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1313 # - ma is the same as m1 or m2, which we're just going to diff again later
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1314 # - The caller specifically asks for a full diff, which is useful during bid
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1315 # merge.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1316 if pa not in ([wctx, p2] + wctx.parents()) and not forcefulldiff:
32151 4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1317 # Identify which files are relevant to the merge, so we can limit the
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1318 # total m1-vs-m2 diff to just those files. This has significant
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1319 # performance benefits in large repositories.
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1320 relevantfiles = set(ma.diff(m2).keys())
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1321
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1322 # For copied and moved files, we need to add the source file too.
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1323 for copykey, copyvalue in pycompat.iteritems(branch_copies1.copy):
32151 4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1324 if copyvalue in relevantfiles:
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1325 relevantfiles.add(copykey)
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1326 for movedirkey in branch_copies1.movewithdir:
32151 4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1327 relevantfiles.add(movedirkey)
32498 bd56bea5ecf8 merge: use intersectmatchers() in "m2-vs-ma optimization" Martin von Zweigbergk <martinvonz@google.com> parents: 32351 diff changeset	1328 filesmatcher = scmutil.matchfiles(repo, relevantfiles)
bd56bea5ecf8 merge: use intersectmatchers() in "m2-vs-ma optimization" Martin von Zweigbergk <martinvonz@google.com> parents: 32351 diff changeset	1329 matcher = matchmod.intersectmatchers(matcher, filesmatcher)
32151 4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31646 diff changeset	1330
31257 11831d755b51 merge: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31175 diff changeset	1331 diff = m1.diff(m2, match=matcher)
11831d755b51 merge: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31175 diff changeset	1332
23637 13f53a2aa342 merge: write manifestmerge() using dictionary with entry per file Martin von Zweigbergk <martinvonz@google.com> parents: 23544 diff changeset	1333 actions = {}
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	1334 for f, ((n1, fl1), (n2, fl2)) in pycompat.iteritems(diff):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1335 if n1 and n2: # file exists on both local and remote side
23396 6a254a2dd37c merge: separate out "both created" cases Martin von Zweigbergk <martinvonz@google.com> parents: 23395 diff changeset	1336 if f not in ma:
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1337 # TODO: what if they're renamed from different sources?
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1338 fa = branch_copies1.copy.get(
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1339 f, None
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1340 ) or branch_copies2.copy.get(f, None)
23397 c7c95838be9a merge: break out "both renamed a -> b" case Martin von Zweigbergk <martinvonz@google.com> parents: 23396 diff changeset	1341 if fa is not None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1342 actions[f] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1343 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1344 (f, f, fa, False, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1345 b'both renamed from %s' % fa,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1346 )
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	1347 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1348 actions[f] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1349 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1350 (f, f, None, False, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1351 b'both created',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1352 )
16094 0776a6cababe merge: don't use unknown() Matt Mackall <mpm@selenic.com> parents: 16093 diff changeset	1353 else:
23396 6a254a2dd37c merge: separate out "both created" cases Martin von Zweigbergk <martinvonz@google.com> parents: 23395 diff changeset	1354 a = ma[f]
6a254a2dd37c merge: separate out "both created" cases Martin von Zweigbergk <martinvonz@google.com> parents: 23395 diff changeset	1355 fla = ma.flags(f)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1356 nol = b'l' not in fl1 + fl2 + fla
23395 d9ebb475eede merge: indent to prepare for next patch Martin von Zweigbergk <martinvonz@google.com> parents: 23387 diff changeset	1357 if n2 == a and fl2 == fla:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1358 actions[f] = (ACTION_KEEP, (), b'remote unchanged')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1359 elif n1 == a and fl1 == fla: # local unchanged - use remote
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1360 if n1 == n2: # optimization: keep local content
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1361 actions[f] = (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1362 ACTION_EXEC,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1363 (fl2,),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1364 b'update permissions',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1365 )
23395 d9ebb475eede merge: indent to prepare for next patch Martin von Zweigbergk <martinvonz@google.com> parents: 23387 diff changeset	1366 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1367 actions[f] = (
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1368 ACTION_GET_OTHER_AND_STORE
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1369 if branchmerge
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1370 else ACTION_GET,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1371 (fl2, False),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1372 b'remote is newer',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1373 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1374 elif nol and n2 == a: # remote only changed 'x'
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1375 actions[f] = (ACTION_EXEC, (fl2,), b'update permissions')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1376 elif nol and n1 == a: # local only changed 'x'
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1377 actions[f] = (
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1378 ACTION_GET_OTHER_AND_STORE
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1379 if branchmerge
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1380 else ACTION_GET,
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1381 (fl1, False),
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1382 b'remote is newer',
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1383 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1384 else: # both changed something
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1385 actions[f] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1386 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1387 (f, f, f, False, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1388 b'versions differ',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1389 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1390 elif n1: # file exists only on local side
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1391 if f in copied2:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1392 pass # we'll deal with it on m2 side
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1393 elif (
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1394 f in branch_copies1.movewithdir
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1395 ): # directory rename, move local
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1396 f2 = branch_copies1.movewithdir[f]
31515 527a247f114f merge: remove unnecessary matcher checks Durham Goode <durham@fb.com> parents: 31475 diff changeset	1397 if f2 in m2:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1398 actions[f2] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1399 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1400 (f, f2, None, True, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1401 b'remote directory rename, both created',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1402 )
23475 67f1d68861fb merge: don't ignore conflicting file in remote renamed directory Martin von Zweigbergk <martinvonz@google.com> parents: 23474 diff changeset	1403 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1404 actions[f2] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1405 ACTION_DIR_RENAME_MOVE_LOCAL,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1406 (f, fl1),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1407 b'remote directory rename - move from %s' % f,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1408 )
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1409 elif f in branch_copies1.copy:
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1410 f2 = branch_copies1.copy[f]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1411 actions[f] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1412 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1413 (f, f2, f2, False, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1414 b'local copied/moved from %s' % f2,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1415 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1416 elif f in ma: # clean, a different, no remote
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1417 if n1 != ma[f]:
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1418 if acceptremote:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1419 actions[f] = (ACTION_REMOVE, None, b'remote delete')
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1420 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1421 actions[f] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1422 ACTION_CHANGED_DELETED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1423 (f, None, f, False, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1424 b'prompt changed/deleted',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1425 )
30361 1070df141718 dirstate: change added/modified placeholder hash length to 20 bytes Durham Goode <durham@fb.com> parents: 30332 diff changeset	1426 elif n1 == addednodeid:
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1427 # This extra 'a' is added by working copy manifest to mark
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1428 # the file as locally added. We should forget it instead of
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1429 # deleting it.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1430 actions[f] = (ACTION_FORGET, None, b'remote deleted')
20639 1df033640a8e merge: handle acceptremove of create+delete early in manifest merge Mads Kiilerich <madski@unity3d.com> parents: 20620 diff changeset	1431 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1432 actions[f] = (ACTION_REMOVE, None, b'other deleted')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1433 elif n2: # file exists only on remote side
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1434 if f in copied1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1435 pass # we'll deal with it on m1 side
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1436 elif f in branch_copies2.movewithdir:
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1437 f2 = branch_copies2.movewithdir[f]
31515 527a247f114f merge: remove unnecessary matcher checks Durham Goode <durham@fb.com> parents: 31475 diff changeset	1438 if f2 in m1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1439 actions[f2] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1440 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1441 (f2, f, None, False, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1442 b'local directory rename, both created',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1443 )
23476 39a12719ec65 merge: don't overwrite conflicting file in locally renamed directory Martin von Zweigbergk <martinvonz@google.com> parents: 23475 diff changeset	1444 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1445 actions[f2] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1446 ACTION_LOCAL_DIR_RENAME_GET,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1447 (f, fl2),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1448 b'local directory rename - get from %s' % f,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1449 )
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1450 elif f in branch_copies2.copy:
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1451 f2 = branch_copies2.copy[f]
31515 527a247f114f merge: remove unnecessary matcher checks Durham Goode <durham@fb.com> parents: 31475 diff changeset	1452 if f2 in m2:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1453 actions[f] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1454 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1455 (f2, f, f2, False, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1456 b'remote copied from %s' % f2,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1457 )
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1458 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1459 actions[f] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1460 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1461 (f2, f, f2, True, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1462 b'remote moved from %s' % f2,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1463 )
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1464 elif f not in ma:
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1465 # local unknown, remote created: the logic is described by the
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1466 # following table:
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1467 #
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1468 # force branchmerge different \| action
23651 72da02d7f126 merge: collect checking for unknown files at end of manifestmerge() Martin von Zweigbergk <martinvonz@google.com> parents: 23650 diff changeset	1469 # n * * \| create
23650 b85c548ab14d merge: introduce 'c' action like 'g', but with additional safety Martin von Zweigbergk <martinvonz@google.com> parents: 23649 diff changeset	1470 # y n * \| create
b85c548ab14d merge: introduce 'c' action like 'g', but with additional safety Martin von Zweigbergk <martinvonz@google.com> parents: 23649 diff changeset	1471 # y y n \| create
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1472 # y y y \| merge
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1473 #
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1474 # Checking whether the files are different is expensive, so we
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1475 # don't do that when we can avoid it.
23649 18ab5e5955df merge: structure 'remote created' code to match table Martin von Zweigbergk <martinvonz@google.com> parents: 23641 diff changeset	1476 if not force:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1477 actions[f] = (ACTION_CREATED, (fl2,), b'remote created')
23649 18ab5e5955df merge: structure 'remote created' code to match table Martin von Zweigbergk <martinvonz@google.com> parents: 23641 diff changeset	1478 elif not branchmerge:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1479 actions[f] = (ACTION_CREATED, (fl2,), b'remote created')
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1480 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1481 actions[f] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1482 ACTION_CREATED_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1483 (fl2, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1484 b'remote created, get or merge',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1485 )
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1486 elif n2 != ma[f]:
30581 43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436) G?bor Stefanik <gabor.stefanik@nng.com> parents: 30519 diff changeset	1487 df = None
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1488 for d in branch_copies1.dirmove:
30581 43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436) G?bor Stefanik <gabor.stefanik@nng.com> parents: 30519 diff changeset	1489 if f.startswith(d):
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436) G?bor Stefanik <gabor.stefanik@nng.com> parents: 30519 diff changeset	1490 # new file added in a directory that was moved
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1491 df = branch_copies1.dirmove[d] + f[len(d) :]
30581 43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436) G?bor Stefanik <gabor.stefanik@nng.com> parents: 30519 diff changeset	1492 break
31515 527a247f114f merge: remove unnecessary matcher checks Durham Goode <durham@fb.com> parents: 31475 diff changeset	1493 if df is not None and df in m1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1494 actions[df] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1495 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1496 (df, f, f, False, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1497 b'local directory rename - respect move '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1498 b'from %s' % f,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1499 )
30581 43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436) G?bor Stefanik <gabor.stefanik@nng.com> parents: 30519 diff changeset	1500 elif acceptremote:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1501 actions[f] = (ACTION_CREATED, (fl2,), b'remote recreating')
18606 95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	1502 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1503 actions[f] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1504 ACTION_DELETED_CHANGED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1505 (None, f, f, False, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1506 b'prompt deleted/changed',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1507 )
23651 72da02d7f126 merge: collect checking for unknown files at end of manifestmerge() Martin von Zweigbergk <martinvonz@google.com> parents: 23650 diff changeset	1508
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1509 if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'):
34941 37450a122128 merge: add a config option to disable path conflict checking Siddharth Agarwal <sid0@fb.com> parents: 34919 diff changeset	1510 # If we are merging, look for path conflicts.
37450a122128 merge: add a config option to disable path conflict checking Siddharth Agarwal <sid0@fb.com> parents: 34919 diff changeset	1511 checkpathconflicts(repo, wctx, p2, actions)
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1512
38044 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1513 narrowmatch = repo.narrowmatch()
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1514 if not narrowmatch.always():
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1515 # Updates "actions" in place
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1516 _filternarrowactions(narrowmatch, branchmerge, actions)
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 37959 diff changeset	1517
44200 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1518 renamedelete = branch_copies1.renamedelete
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1519 renamedelete.update(branch_copies2.renamedelete)
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44199 diff changeset	1520
23526 a5887f2da5e6 merge: don't treat 'diverge' and 'renamedelete' like actions Martin von Zweigbergk <martinvonz@google.com> parents: 23525 diff changeset	1521 return actions, diverge, renamedelete
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	1522
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1523
23531 416c133145ee merge: extract _resolvetrivial() function Martin von Zweigbergk <martinvonz@google.com> parents: 23526 diff changeset	1524 def _resolvetrivial(repo, wctx, mctx, ancestor, actions):
416c133145ee merge: extract _resolvetrivial() function Martin von Zweigbergk <martinvonz@google.com> parents: 23526 diff changeset	1525 """Resolves false conflicts where the nodeid changed but the content
416c133145ee merge: extract _resolvetrivial() function Martin von Zweigbergk <martinvonz@google.com> parents: 23526 diff changeset	1526 remained the same."""
36316 759579bac31d merge: make a copy of dict.items() before mutating the dict during iteration Augie Fackler <augie@google.com> parents: 36177 diff changeset	1527 # We force a copy of actions.items() because we're going to mutate
759579bac31d merge: make a copy of dict.items() before mutating the dict during iteration Augie Fackler <augie@google.com> parents: 36177 diff changeset	1528 # actions as we resolve trivial conflicts.
759579bac31d merge: make a copy of dict.items() before mutating the dict during iteration Augie Fackler <augie@google.com> parents: 36177 diff changeset	1529 for f, (m, args, msg) in list(actions.items()):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1530 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1531 m == ACTION_CHANGED_DELETED
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1532 and f in ancestor
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1533 and not wctx[f].cmp(ancestor[f])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1534 ):
23531 416c133145ee merge: extract _resolvetrivial() function Martin von Zweigbergk <martinvonz@google.com> parents: 23526 diff changeset	1535 # local did change but ended up with same content
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1536 actions[f] = ACTION_REMOVE, None, b'prompt same'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1537 elif (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1538 m == ACTION_DELETED_CHANGED
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1539 and f in ancestor
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1540 and not mctx[f].cmp(ancestor[f])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1541 ):
23531 416c133145ee merge: extract _resolvetrivial() function Martin von Zweigbergk <martinvonz@google.com> parents: 23526 diff changeset	1542 # remote did change but ended up with same content
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1543 del actions[f] # don't get = keep local deleted
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1544
23531 416c133145ee merge: extract _resolvetrivial() function Martin von Zweigbergk <martinvonz@google.com> parents: 23526 diff changeset	1545
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1546 def calculateupdates(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1547 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1548 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1549 mctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1550 ancestors,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1551 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1552 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1553 acceptremote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1554 followcopies,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1555 matcher=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1556 mergeforce=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1557 ):
33323 252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	1558 """Calculate the actions needed to merge mctx into wctx using ancestors"""
252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	1559 # Avoid cycle.
252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	1560 from . import sparse
252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	1561
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1562 if len(ancestors) == 1: # default
23526 a5887f2da5e6 merge: don't treat 'diverge' and 'renamedelete' like actions Martin von Zweigbergk <martinvonz@google.com> parents: 23525 diff changeset	1563 actions, diverge, renamedelete = manifestmerge(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1564 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1565 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1566 mctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1567 ancestors[0],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1568 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1569 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1570 matcher,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1571 acceptremote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1572 followcopies,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1573 )
28020 cffa46cbdb8f merge: tell _checkunknownfiles about whether this was merge --force Siddharth Agarwal <sid0@fb.com> parents: 28019 diff changeset	1574 _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce)
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1575
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1576 else: # only when merge.preferancestor=* - the default
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1577 repo.ui.note(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1578 _(b"note: merging %s and %s using bids from ancestors %s\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1579 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1580 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1581 mctx,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1582 _(b' and ').join(pycompat.bytestr(anc) for anc in ancestors),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1583 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1584 )
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1585
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1586 # Call for bids
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1587 fbids = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1588 {}
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1589 ) # mapping filename to bids (action method to list af actions)
23526 a5887f2da5e6 merge: don't treat 'diverge' and 'renamedelete' like actions Martin von Zweigbergk <martinvonz@google.com> parents: 23525 diff changeset	1590 diverge, renamedelete = None, None
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1591 for ancestor in ancestors:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1592 repo.ui.note(_(b'\ncalculating bids for ancestor %s\n') % ancestor)
23526 a5887f2da5e6 merge: don't treat 'diverge' and 'renamedelete' like actions Martin von Zweigbergk <martinvonz@google.com> parents: 23525 diff changeset	1593 actions, diverge1, renamedelete1 = manifestmerge(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1594 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1595 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1596 mctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1597 ancestor,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1598 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1599 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1600 matcher,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1601 acceptremote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1602 followcopies,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1603 forcefulldiff=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1604 )
28020 cffa46cbdb8f merge: tell _checkunknownfiles about whether this was merge --force Siddharth Agarwal <sid0@fb.com> parents: 28019 diff changeset	1605 _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce)
26318 d3bd6cefd742 bidmerge: choose shortest list of diverge and rename/delete warnings Matt Mackall <mpm@selenic.com> parents: 26304 diff changeset	1606
d3bd6cefd742 bidmerge: choose shortest list of diverge and rename/delete warnings Matt Mackall <mpm@selenic.com> parents: 26304 diff changeset	1607 # Track the shortest set of warning on the theory that bid
d3bd6cefd742 bidmerge: choose shortest list of diverge and rename/delete warnings Matt Mackall <mpm@selenic.com> parents: 26304 diff changeset	1608 # merge will correctly incorporate more information
d3bd6cefd742 bidmerge: choose shortest list of diverge and rename/delete warnings Matt Mackall <mpm@selenic.com> parents: 26304 diff changeset	1609 if diverge is None or len(diverge1) < len(diverge):
23526 a5887f2da5e6 merge: don't treat 'diverge' and 'renamedelete' like actions Martin von Zweigbergk <martinvonz@google.com> parents: 23525 diff changeset	1610 diverge = diverge1
26318 d3bd6cefd742 bidmerge: choose shortest list of diverge and rename/delete warnings Matt Mackall <mpm@selenic.com> parents: 26304 diff changeset	1611 if renamedelete is None or len(renamedelete) < len(renamedelete1):
23526 a5887f2da5e6 merge: don't treat 'diverge' and 'renamedelete' like actions Martin von Zweigbergk <martinvonz@google.com> parents: 23525 diff changeset	1612 renamedelete = renamedelete1
26318 d3bd6cefd742 bidmerge: choose shortest list of diverge and rename/delete warnings Matt Mackall <mpm@selenic.com> parents: 26304 diff changeset	1613
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	1614 for f, a in sorted(pycompat.iteritems(actions)):
23638 09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1615 m, args, msg = a
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1616 if m == ACTION_GET_OTHER_AND_STORE:
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1617 m = ACTION_GET
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1618 repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m))
23638 09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1619 if f in fbids:
09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1620 d = fbids[f]
09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1621 if m in d:
09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1622 d[m].append(a)
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1623 else:
23638 09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1624 d[m] = [a]
09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1625 else:
09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1626 fbids[f] = {m: [a]}
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1627
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1628 # Pick the best bid for each file
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1629 repo.ui.note(_(b'\nauction for merging merge bids\n'))
23638 09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1630 actions = {}
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1631 for f, bids in sorted(fbids.items()):
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1632 # bids is a mapping from action method to list af actions
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1633 # Consensus?
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1634 if len(bids) == 1: # all bids are the same kind of method
34348 1a5abc45e2fa py3: explicitly convert dict.keys() and dict.items() into a list Pulkit Goyal <7895pulkit@gmail.com> parents: 34302 diff changeset	1635 m, l = list(bids.items())[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1636 if all(a == l[0] for a in l[1:]): # len(bids) is > 1
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1637 repo.ui.note(_(b" %s: consensus for %s\n") % (f, m))
23638 09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1638 actions[f] = l[0]
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1639 continue
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1640 # If keep is an option, just do it.
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1641 if ACTION_KEEP in bids:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1642 repo.ui.note(_(b" %s: picking 'keep' action\n") % f)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1643 actions[f] = bids[ACTION_KEEP][0]
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1644 continue
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1645 # If there are gets and they all agree [how could they not?], do it.
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1646 if ACTION_GET in bids:
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1647 ga0 = bids[ACTION_GET][0]
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1648 if all(a == ga0 for a in bids[ACTION_GET][1:]):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1649 repo.ui.note(_(b" %s: picking 'get' action\n") % f)
23638 09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1650 actions[f] = ga0
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1651 continue
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1652 # TODO: Consider other simple actions such as mode changes
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1653 # Handle inefficient democrazy.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1654 repo.ui.note(_(b' %s: multiple bids for merge action:\n') % f)
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1655 for m, l in sorted(bids.items()):
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1656 for _f, args, msg in l:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1657 repo.ui.note(b' %s -> %s\n' % (msg, m))
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1658 # Pick random action. TODO: Instead, prompt user when resolving
34348 1a5abc45e2fa py3: explicitly convert dict.keys() and dict.items() into a list Pulkit Goyal <7895pulkit@gmail.com> parents: 34302 diff changeset	1659 m, l = list(bids.items())[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1660 repo.ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1661 _(b' %s: ambiguous merge - picked %s action\n') % (f, m)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1662 )
23638 09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1663 actions[f] = l[0]
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1664 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1665 repo.ui.note(_(b'end of auction\n\n'))
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1666
23640 b46b9865dd08 merge: let _forgetremoved() work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23639 diff changeset	1667 if wctx.rev() is None:
b46b9865dd08 merge: let _forgetremoved() work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23639 diff changeset	1668 fractions = _forgetremoved(wctx, mctx, branchmerge)
b46b9865dd08 merge: let _forgetremoved() work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23639 diff changeset	1669 actions.update(fractions)
b46b9865dd08 merge: let _forgetremoved() work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23639 diff changeset	1670
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1671 prunedactions = sparse.filterupdatesactions(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1672 repo, wctx, mctx, branchmerge, actions
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1673 )
38757 d49e490a9e85 merge: do the trivial resolution after updating sparse checkout Pulkit Goyal <pulkit@yandex-team.ru> parents: 38732 diff changeset	1674 _resolvetrivial(repo, wctx, mctx, ancestors[0], actions)
33323 252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	1675
252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	1676 return prunedactions, diverge, renamedelete
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1677
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1678
34142 24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1679 def _getcwd():
24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1680 try:
39818 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39464 diff changeset	1681 return encoding.getcwd()
34142 24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1682 except OSError as err:
24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1683 if err.errno == errno.ENOENT:
24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1684 return None
24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1685 raise
24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1686
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1687
33081 6582dc01aca3 merge: pass wctx to batchremove and batchget Phil Cohen <phillco@fb.com> parents: 32863 diff changeset	1688 def batchremove(repo, wctx, actions):
21392 b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1689 """apply removes to the working directory
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	1690
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	1691 yields tuples for progress updates
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	1692 """
18640 a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	1693 verbose = repo.ui.verbose
34142 24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1694 cwd = _getcwd()
18633 6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	1695 i = 0
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1696 for f, args, msg in actions:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1697 repo.ui.debug(b" %s: %s -> r\n" % (f, msg))
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1698 if verbose:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1699 repo.ui.note(_(b"removing %s\n") % f)
33086 eb4c49f55f1f workingfilectx: add audit() as a wrapper for wvfs.audit() Phil Cohen <phillco@fb.com> parents: 33085 diff changeset	1700 wctx[f].audit()
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1701 try:
33082 f9e50ee4c52b merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove() Phil Cohen <phillco@fb.com> parents: 33081 diff changeset	1702 wctx[f].remove(ignoremissing=True)
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25151 diff changeset	1703 except OSError as inst:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1704 repo.ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1705 _(b"update failed to remove %s: %s!\n") % (f, inst.strerror)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1706 )
21392 b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1707 if i == 100:
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1708 yield i, f
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1709 i = 0
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1710 i += 1
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1711 if i > 0:
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1712 yield i, f
34142 24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1713
24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1714 if cwd and not _getcwd():
24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1715 # cwd was removed in the course of removing files; print a helpful
24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34125 diff changeset	1716 # warning.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1717 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1718 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1719 b"current directory was removed\n"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1720 b"(consider changing to repo root: %s)\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1721 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1722 % repo.root
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1723 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1724
21392 b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1725
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1726 def batchget(repo, mctx, wctx, wantfiledata, actions):
21392 b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1727 """apply gets to the working directory
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1728
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1729 mctx is the context to get from
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1730
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1731 Yields arbitrarily many (False, tuple) for progress updates, followed by
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1732 exactly one (True, filedata). When wantfiledata is false, filedata is an
42522 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42456 diff changeset	1733 empty dict. When wantfiledata is true, filedata[f] is a triple (mode, size,
d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42456 diff changeset	1734 mtime) of the file f written for each action.
21392 b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1735 """
42522 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42456 diff changeset	1736 filedata = {}
21392 b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1737 verbose = repo.ui.verbose
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1738 fctx = mctx.filectx
27656 57c0d4888ca8 batchget: add support for backing up files Siddharth Agarwal <sid0@fb.com> parents: 27655 diff changeset	1739 ui = repo.ui
21392 b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1740 i = 0
28200 588695ccbb22 merge: perform background file closing in batchget Gregory Szorc <gregory.szorc@gmail.com> parents: 28199 diff changeset	1741 with repo.wvfs.backgroundclosing(ui, expectedcount=len(actions)):
28199 d49793aac1ac merge: indent code in batchget() Gregory Szorc <gregory.szorc@gmail.com> parents: 28088 diff changeset	1742 for f, (flags, backup), msg in actions:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1743 repo.ui.debug(b" %s: %s -> g\n" % (f, msg))
28199 d49793aac1ac merge: indent code in batchget() Gregory Szorc <gregory.szorc@gmail.com> parents: 28088 diff changeset	1744 if verbose:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1745 repo.ui.note(_(b"getting %s\n") % f)
27656 57c0d4888ca8 batchget: add support for backing up files Siddharth Agarwal <sid0@fb.com> parents: 27655 diff changeset	1746
28199 d49793aac1ac merge: indent code in batchget() Gregory Szorc <gregory.szorc@gmail.com> parents: 28088 diff changeset	1747 if backup:
34549 a991e1d6bc82 merge: backup conflicting directories when getting files Mark Thomas <mbthomas@fb.com> parents: 34548 diff changeset	1748 # If a file or directory exists with the same name, back that
a991e1d6bc82 merge: backup conflicting directories when getting files Mark Thomas <mbthomas@fb.com> parents: 34548 diff changeset	1749 # up. Otherwise, look to see if there is a file that conflicts
a991e1d6bc82 merge: backup conflicting directories when getting files Mark Thomas <mbthomas@fb.com> parents: 34548 diff changeset	1750 # with a directory this file is in, and if so, back that up.
41570 1f2714052d7e merge: don't unnecessarily calculate absolute path Martin von Zweigbergk <martinvonz@google.com> parents: 41569 diff changeset	1751 conflicting = f
34549 a991e1d6bc82 merge: backup conflicting directories when getting files Mark Thomas <mbthomas@fb.com> parents: 34548 diff changeset	1752 if not repo.wvfs.lexists(f):
43633 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43421 diff changeset	1753 for p in pathutil.finddirs(f):
34549 a991e1d6bc82 merge: backup conflicting directories when getting files Mark Thomas <mbthomas@fb.com> parents: 34548 diff changeset	1754 if repo.wvfs.isfileorlink(p):
41570 1f2714052d7e merge: don't unnecessarily calculate absolute path Martin von Zweigbergk <martinvonz@google.com> parents: 41569 diff changeset	1755 conflicting = p
34549 a991e1d6bc82 merge: backup conflicting directories when getting files Mark Thomas <mbthomas@fb.com> parents: 34548 diff changeset	1756 break
41570 1f2714052d7e merge: don't unnecessarily calculate absolute path Martin von Zweigbergk <martinvonz@google.com> parents: 41569 diff changeset	1757 if repo.wvfs.lexists(conflicting):
41601 ac8cf125d8d5 merge: migrate to scmutil.backuppath() Martin von Zweigbergk <martinvonz@google.com> parents: 41570 diff changeset	1758 orig = scmutil.backuppath(ui, repo, conflicting)
ac8cf125d8d5 merge: migrate to scmutil.backuppath() Martin von Zweigbergk <martinvonz@google.com> parents: 41570 diff changeset	1759 util.rename(repo.wjoin(conflicting), orig)
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1760 wfctx = wctx[f]
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1761 wfctx.clearunknown()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1762 atomictemp = ui.configbool(b"experimental", b"update.atomic-file")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1763 size = wfctx.write(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1764 fctx(f).data(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1765 flags,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1766 backgroundclose=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1767 atomictemp=atomictemp,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1768 )
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1769 if wantfiledata:
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1770 s = wfctx.lstat()
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1771 mode = s.st_mode
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1772 mtime = s[stat.ST_MTIME]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1773 filedata[f] = (mode, size, mtime) # for dirstate.normal
28199 d49793aac1ac merge: indent code in batchget() Gregory Szorc <gregory.szorc@gmail.com> parents: 28088 diff changeset	1774 if i == 100:
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1775 yield False, (i, f)
28199 d49793aac1ac merge: indent code in batchget() Gregory Szorc <gregory.szorc@gmail.com> parents: 28088 diff changeset	1776 i = 0
d49793aac1ac merge: indent code in batchget() Gregory Szorc <gregory.szorc@gmail.com> parents: 28088 diff changeset	1777 i += 1
18633 6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	1778 if i > 0:
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1779 yield False, (i, f)
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1780 yield True, filedata
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	1781
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1782
36142 60dd840a7fdb merge: invoke scmutil.fileprefetchhooks() prior to applying updates Matt Harbison <matt_harbison@yahoo.com> parents: 36042 diff changeset	1783 def _prefetchfiles(repo, ctx, actions):
37762 7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37172 diff changeset	1784 """Invoke ``scmutil.prefetchfiles()`` for the files relevant to the dict
36142 60dd840a7fdb merge: invoke scmutil.fileprefetchhooks() prior to applying updates Matt Harbison <matt_harbison@yahoo.com> parents: 36042 diff changeset	1785 of merge actions. ``ctx`` is the context being merged in."""
60dd840a7fdb merge: invoke scmutil.fileprefetchhooks() prior to applying updates Matt Harbison <matt_harbison@yahoo.com> parents: 36042 diff changeset	1786
60dd840a7fdb merge: invoke scmutil.fileprefetchhooks() prior to applying updates Matt Harbison <matt_harbison@yahoo.com> parents: 36042 diff changeset	1787 # Skipping 'a', 'am', 'f', 'r', 'dm', 'e', 'k', 'p' and 'pr', because they
60dd840a7fdb merge: invoke scmutil.fileprefetchhooks() prior to applying updates Matt Harbison <matt_harbison@yahoo.com> parents: 36042 diff changeset	1788 # don't touch the context to be merged in. 'cd' is skipped, because
60dd840a7fdb merge: invoke scmutil.fileprefetchhooks() prior to applying updates Matt Harbison <matt_harbison@yahoo.com> parents: 36042 diff changeset	1789 # changed/deleted never resolves to something from the remote side.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1790 oplist = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1791 actions[a]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1792 for a in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1793 ACTION_GET,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1794 ACTION_DELETED_CHANGED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1795 ACTION_LOCAL_DIR_RENAME_GET,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1796 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1797 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1798 ]
37762 7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37172 diff changeset	1799 prefetch = scmutil.prefetchfiles
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37172 diff changeset	1800 matchfiles = scmutil.matchfiles
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1801 prefetch(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1802 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1803 [ctx.rev()],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1804 matchfiles(repo, [f for sublist in oplist for f, args, msg in sublist]),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1805 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1806
34124 b90e5b2a9c82 merge: flush any deferred writes before, and after, running any workers Phil Cohen <phillco@fb.com> parents: 34122 diff changeset	1807
37107 71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37087 diff changeset	1808 @attr.s(frozen=True)
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37087 diff changeset	1809 class updateresult(object):
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37087 diff changeset	1810 updatedcount = attr.ib()
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37087 diff changeset	1811 mergedcount = attr.ib()
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37087 diff changeset	1812 removedcount = attr.ib()
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37087 diff changeset	1813 unresolvedcount = attr.ib()
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37087 diff changeset	1814
37125 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37112 diff changeset	1815 def isempty(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1816 return not (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1817 self.updatedcount
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1818 or self.mergedcount
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1819 or self.removedcount
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1820 or self.unresolvedcount
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1821 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1822
37125 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37112 diff changeset	1823
41039 54c3b4bd01f2 merge: extract helper for creating empty "actions" dict Martin von Zweigbergk <martinvonz@google.com> parents: 39818 diff changeset	1824 def emptyactions():
54c3b4bd01f2 merge: extract helper for creating empty "actions" dict Martin von Zweigbergk <martinvonz@google.com> parents: 39818 diff changeset	1825 """create an actions dict, to be populated and passed to applyupdates()"""
44452 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44399 diff changeset	1826 return {
9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44399 diff changeset	1827 m: []
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1828 for m in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1829 ACTION_ADD,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1830 ACTION_ADD_MODIFIED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1831 ACTION_FORGET,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1832 ACTION_GET,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1833 ACTION_CHANGED_DELETED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1834 ACTION_DELETED_CHANGED,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1835 ACTION_REMOVE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1836 ACTION_DIR_RENAME_MOVE_LOCAL,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1837 ACTION_LOCAL_DIR_RENAME_GET,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1838 ACTION_MERGE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1839 ACTION_EXEC,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1840 ACTION_KEEP,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1841 ACTION_PATH_CONFLICT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1842 ACTION_PATH_CONFLICT_RESOLVE,
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1843 ACTION_GET_OTHER_AND_STORE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1844 )
44452 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44399 diff changeset	1845 }
41039 54c3b4bd01f2 merge: extract helper for creating empty "actions" dict Martin von Zweigbergk <martinvonz@google.com> parents: 39818 diff changeset	1846
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1847
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1848 def applyupdates(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1849 repo, actions, wctx, mctx, overwrite, wantfiledata, labels=None
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1850 ):
11454 9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	1851 """apply the merge action list to the working directory
9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	1852
9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	1853 wctx is the working copy context
9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	1854 mctx is the context to be merged into the working copy
13162 115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	1855
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1856 Return a tuple of (counts, filedata), where counts is a tuple
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1857 (updated, merged, removed, unresolved) that describes how many
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1858 files were affected by the update, and filedata is as described in
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1859 batchget.
11454 9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	1860 """
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	1861
36142 60dd840a7fdb merge: invoke scmutil.fileprefetchhooks() prior to applying updates Matt Harbison <matt_harbison@yahoo.com> parents: 36042 diff changeset	1862 _prefetchfiles(repo, mctx, actions)
60dd840a7fdb merge: invoke scmutil.fileprefetchhooks() prior to applying updates Matt Harbison <matt_harbison@yahoo.com> parents: 36042 diff changeset	1863
27078 a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	1864 updated, merged, removed = 0, 0, 0
28634 3ceac01bc29f merge: save merge part labels for later reuse Simon Farnsworth <simonfar@fb.com> parents: 28267 diff changeset	1865 ms = mergestate.clean(repo, wctx.p1().node(), mctx.node(), labels)
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1866
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1867 # add ACTION_GET_OTHER_AND_STORE to mergestate
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1868 for e in actions[ACTION_GET_OTHER_AND_STORE]:
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1869 ms.addmergedother(e[0])
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	1870
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	1871 moves = []
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1872 for m, l in actions.items():
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1873 l.sort()
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	1874
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27132 diff changeset	1875 # 'cd' and 'dc' actions are treated like other merge conflicts
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1876 mergeactions = sorted(actions[ACTION_CHANGED_DELETED])
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1877 mergeactions.extend(sorted(actions[ACTION_DELETED_CHANGED]))
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1878 mergeactions.extend(actions[ACTION_MERGE])
27137 25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API) Siddharth Agarwal <sid0@fb.com> parents: 27132 diff changeset	1879 for f, args, msg in mergeactions:
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1880 f1, f2, fa, move, anc = args
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1881 if f == b'.hgsubstate': # merged internally
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1882 continue
27091 2ce00de5cc0e merge.applyupdates: create absentfilectxes for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27090 diff changeset	1883 if f1 is None:
2ce00de5cc0e merge.applyupdates: create absentfilectxes for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27090 diff changeset	1884 fcl = filemerge.absentfilectx(wctx, fa)
2ce00de5cc0e merge.applyupdates: create absentfilectxes for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27090 diff changeset	1885 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1886 repo.ui.debug(b" preserving %s for resolve of %s\n" % (f1, f))
27091 2ce00de5cc0e merge.applyupdates: create absentfilectxes for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27090 diff changeset	1887 fcl = wctx[f1]
2ce00de5cc0e merge.applyupdates: create absentfilectxes for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27090 diff changeset	1888 if f2 is None:
2ce00de5cc0e merge.applyupdates: create absentfilectxes for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27090 diff changeset	1889 fco = filemerge.absentfilectx(mctx, fa)
2ce00de5cc0e merge.applyupdates: create absentfilectxes for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27090 diff changeset	1890 else:
2ce00de5cc0e merge.applyupdates: create absentfilectxes for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27090 diff changeset	1891 fco = mctx[f2]
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1892 actx = repo[anc]
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1893 if fa in actx:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1894 fca = actx[fa]
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1895 else:
27091 2ce00de5cc0e merge.applyupdates: create absentfilectxes for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27090 diff changeset	1896 # TODO: move to absentfilectx
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1897 fca = repo.filectx(f1, fileid=nullrev)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1898 ms.add(fcl, fco, fca, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1899 if f1 != f and move:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1900 moves.append(f1)
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	1901
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	1902 # remove renamed files after safely stored
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	1903 for f in moves:
33283 634b259079c5 workingfilectx: add exists, lexists Phil Cohen <phillco@fb.com> parents: 33146 diff changeset	1904 if wctx[f].lexists():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1905 repo.ui.debug(b"removing %s\n" % f)
33086 eb4c49f55f1f workingfilectx: add audit() as a wrapper for wvfs.audit() Phil Cohen <phillco@fb.com> parents: 33085 diff changeset	1906 wctx[f].audit()
33082 f9e50ee4c52b merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove() Phil Cohen <phillco@fb.com> parents: 33081 diff changeset	1907 wctx[f].remove()
5042 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	1908
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1909 numupdates = sum(len(l) for m, l in actions.items() if m != ACTION_KEEP)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1910 progress = repo.ui.makeprogress(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1911 _(b'updating'), unit=_(b'files'), total=numupdates
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1912 )
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	1913
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1914 if [a for a in actions[ACTION_REMOVE] if a[0] == b'.hgsubstate']:
36009 55e8efa2451a subrepo: split non-core functions to new module Yuya Nishihara <yuya@tcha.org> parents: 35726 diff changeset	1915 subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels)
18632 3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	1916
34547 81aebcc73beb merge: add merge action 'p' to record path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34545 diff changeset	1917 # record path conflicts
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1918 for f, args, msg in actions[ACTION_PATH_CONFLICT]:
34547 81aebcc73beb merge: add merge action 'p' to record path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34545 diff changeset	1919 f1, fo = args
81aebcc73beb merge: add merge action 'p' to record path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34545 diff changeset	1920 s = repo.ui.status
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1921 s(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1922 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1923 b"%s: path conflict - a file or link has the same name as a "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1924 b"directory\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1925 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1926 % f
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1927 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1928 if fo == b'l':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1929 s(_(b"the local file has been renamed to %s\n") % f1)
34547 81aebcc73beb merge: add merge action 'p' to record path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34545 diff changeset	1930 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1931 s(_(b"the remote file has been renamed to %s\n") % f1)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1932 s(_(b"resolve manually then use 'hg resolve --mark %s'\n") % f)
34547 81aebcc73beb merge: add merge action 'p' to record path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34545 diff changeset	1933 ms.addpath(f, f1, fo)
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38045 diff changeset	1934 progress.increment(item=f)
34547 81aebcc73beb merge: add merge action 'p' to record path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34545 diff changeset	1935
34786 9c899660700a merge: don't use workers in in-memory mode Phil Cohen <phillco@fb.com> parents: 34680 diff changeset	1936 # When merging in-memory, we can't support worker processes, so set the
9c899660700a merge: don't use workers in in-memory mode Phil Cohen <phillco@fb.com> parents: 34680 diff changeset	1937 # per-item cost at 0 in that case.
9c899660700a merge: don't use workers in in-memory mode Phil Cohen <phillco@fb.com> parents: 34680 diff changeset	1938 cost = 0 if wctx.isinmemory() else 0.001
9c899660700a merge: don't use workers in in-memory mode Phil Cohen <phillco@fb.com> parents: 34680 diff changeset	1939
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	1940 # remove in parallel (must come before resolving path conflicts and getting)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1941 prog = worker.worker(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1942 repo.ui, cost, batchremove, (repo, wctx), actions[ACTION_REMOVE]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1943 )
19095 5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	1944 for i, item in prog:
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38045 diff changeset	1945 progress.increment(step=i, item=item)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1946 removed = len(actions[ACTION_REMOVE])
21390 26b84128c54d merge: move constant assignments a bit and use them more Mads Kiilerich <madski@unity3d.com> parents: 21389 diff changeset	1947
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	1948 # resolve path conflicts (must come before getting)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1949 for f, args, msg in actions[ACTION_PATH_CONFLICT_RESOLVE]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1950 repo.ui.debug(b" %s: %s -> pr\n" % (f, msg))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1951 (f0,) = args
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	1952 if wctx[f0].lexists():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1953 repo.ui.note(_(b"moving %s to %s\n") % (f0, f))
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	1954 wctx[f].audit()
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	1955 wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags())
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	1956 wctx[f0].remove()
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38045 diff changeset	1957 progress.increment(item=f)
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	1958
38732 be4984261611 merge: mark file gets as not thread safe (issue5933) Gregory Szorc <gregory.szorc@gmail.com> parents: 38494 diff changeset	1959 # get in parallel.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1960 threadsafe = repo.ui.configbool(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1961 b'experimental', b'worker.wdir-get-thread-safe'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1962 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1963 prog = worker.worker(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1964 repo.ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1965 cost,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1966 batchget,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1967 (repo, mctx, wctx, wantfiledata),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1968 actions[ACTION_GET],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1969 threadsafe=threadsafe,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1970 hasretval=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	1971 )
42522 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42456 diff changeset	1972 getfiledata = {}
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1973 for final, res in prog:
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1974 if final:
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1975 getfiledata = res
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1976 else:
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1977 i, item = res
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	1978 progress.increment(step=i, item=item)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1979 updated = len(actions[ACTION_GET])
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	1980
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1981 if [a for a in actions[ACTION_GET] if a[0] == b'.hgsubstate']:
36009 55e8efa2451a subrepo: split non-core functions to new module Yuya Nishihara <yuya@tcha.org> parents: 35726 diff changeset	1982 subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels)
18632 3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	1983
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1984 # forget (manifest only, just log it) (must come first)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1985 for f, args, msg in actions[ACTION_FORGET]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1986 repo.ui.debug(b" %s: %s -> f\n" % (f, msg))
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38045 diff changeset	1987 progress.increment(item=f)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	1988
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1989 # re-add (manifest only, just log it)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1990 for f, args, msg in actions[ACTION_ADD]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1991 repo.ui.debug(b" %s: %s -> a\n" % (f, msg))
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38045 diff changeset	1992 progress.increment(item=f)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	1993
27131 d837da26155e merge: add a new action type representing files to add/mark as modified Siddharth Agarwal <sid0@fb.com> parents: 27130 diff changeset	1994 # re-add/mark as modified (manifest only, just log it)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	1995 for f, args, msg in actions[ACTION_ADD_MODIFIED]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1996 repo.ui.debug(b" %s: %s -> am\n" % (f, msg))
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38045 diff changeset	1997 progress.increment(item=f)
27131 d837da26155e merge: add a new action type representing files to add/mark as modified Siddharth Agarwal <sid0@fb.com> parents: 27130 diff changeset	1998
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1999 # keep (noop, just log it)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2000 for f, args, msg in actions[ACTION_KEEP]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2001 repo.ui.debug(b" %s: %s -> k\n" % (f, msg))
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2002 # no progress
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	2003
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2004 # directory rename, move local
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2005 for f, args, msg in actions[ACTION_DIR_RENAME_MOVE_LOCAL]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2006 repo.ui.debug(b" %s: %s -> dm\n" % (f, msg))
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38045 diff changeset	2007 progress.increment(item=f)
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2008 f0, flags = args
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2009 repo.ui.note(_(b"moving %s to %s\n") % (f0, f))
33086 eb4c49f55f1f workingfilectx: add audit() as a wrapper for wvfs.audit() Phil Cohen <phillco@fb.com> parents: 33085 diff changeset	2010 wctx[f].audit()
33083 05c680ebf512 merge: convert repo.wwrite() calls to wctx[f].write() Phil Cohen <phillco@fb.com> parents: 33082 diff changeset	2011 wctx[f].write(wctx.filectx(f0).data(), flags)
33082 f9e50ee4c52b merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove() Phil Cohen <phillco@fb.com> parents: 33081 diff changeset	2012 wctx[f0].remove()
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2013 updated += 1
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	2014
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2015 # local directory rename, get
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2016 for f, args, msg in actions[ACTION_LOCAL_DIR_RENAME_GET]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2017 repo.ui.debug(b" %s: %s -> dg\n" % (f, msg))
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38045 diff changeset	2018 progress.increment(item=f)
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2019 f0, flags = args
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2020 repo.ui.note(_(b"getting %s to %s\n") % (f0, f))
33083 05c680ebf512 merge: convert repo.wwrite() calls to wctx[f].write() Phil Cohen <phillco@fb.com> parents: 33082 diff changeset	2021 wctx[f].write(mctx.filectx(f0).data(), flags)
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2022 updated += 1
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	2023
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2024 # exec
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2025 for f, args, msg in actions[ACTION_EXEC]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2026 repo.ui.debug(b" %s: %s -> e\n" % (f, msg))
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38045 diff changeset	2027 progress.increment(item=f)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2028 (flags,) = args
33086 eb4c49f55f1f workingfilectx: add audit() as a wrapper for wvfs.audit() Phil Cohen <phillco@fb.com> parents: 33085 diff changeset	2029 wctx[f].audit()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2030 wctx[f].setflags(b'l' in flags, b'x' in flags)
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2031 updated += 1
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	2032
26786 121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2033 # the ordering is important here -- ms.mergedriver will raise if the merge
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2034 # driver has changed, and we want to be able to bypass it when overwrite is
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2035 # True
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2036 usemergedriver = not overwrite and mergeactions and ms.mergedriver
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2037
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2038 if usemergedriver:
35500 87918218da70 merge: raise before running mergedriver if using IMM Phil Cohen <phillco@fb.com> parents: 35288 diff changeset	2039 if wctx.isinmemory():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2040 raise error.InMemoryMergeConflictsError(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	2041 b"in-memory merge does not support mergedriver"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2042 )
26786 121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2043 ms.commit()
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2044 proceed = driverpreprocess(repo, ms, wctx, labels=labels)
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2045 # the driver might leave some files unresolved
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2046 unresolvedf = set(ms.unresolved())
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2047 if not proceed:
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2048 # XXX setting unresolved to at least 1 is a hack to make sure we
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2049 # error out
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2050 return updateresult(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2051 updated, merged, removed, max(len(unresolvedf), 1)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2052 )
26786 121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2053 newactions = []
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2054 for f, args, msg in mergeactions:
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2055 if f in unresolvedf:
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2056 newactions.append((f, args, msg))
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2057 mergeactions = newactions
121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	2058
34680 c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2059 try:
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2060 # premerge
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2061 tocomplete = []
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2062 for f, args, msg in mergeactions:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2063 repo.ui.debug(b" %s: %s -> m (premerge)\n" % (f, msg))
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38045 diff changeset	2064 progress.increment(item=f)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2065 if f == b'.hgsubstate': # subrepo states need updating
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2066 subrepoutil.submerge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2067 repo, wctx, mctx, wctx.ancestor(mctx), overwrite, labels
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2068 )
34680 c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2069 continue
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2070 wctx[f].audit()
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2071 complete, r = ms.preresolve(f, wctx)
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2072 if not complete:
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2073 numupdates += 1
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2074 tocomplete.append((f, args, msg))
26618 8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC) Siddharth Agarwal <sid0@fb.com> parents: 26617 diff changeset	2075
34680 c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2076 # merge
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2077 for f, args, msg in tocomplete:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2078 repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg))
38345 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38045 diff changeset	2079 progress.increment(item=f, total=numupdates)
34680 c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2080 ms.resolve(f, wctx)
26292 007ac1acfcac merge: move merge step to the end Siddharth Agarwal <sid0@fb.com> parents: 25959 diff changeset	2081
34680 c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2082 finally:
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	2083 ms.commit()
26787 64848559413a merge.applyupdates: call driverconclude after performing merge actions Siddharth Agarwal <sid0@fb.com> parents: 26786 diff changeset	2084
27078 a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	2085 unresolved = ms.unresolvedcount()
a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	2086
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2087 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2088 usemergedriver
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2089 and not unresolved
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2090 and ms.mdstate() != MERGE_DRIVER_STATE_SUCCESS
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2091 ):
26787 64848559413a merge.applyupdates: call driverconclude after performing merge actions Siddharth Agarwal <sid0@fb.com> parents: 26786 diff changeset	2092 if not driverconclude(repo, ms, wctx, labels=labels):
64848559413a merge.applyupdates: call driverconclude after performing merge actions Siddharth Agarwal <sid0@fb.com> parents: 26786 diff changeset	2093 # XXX setting unresolved to at least 1 is a hack to make sure we
64848559413a merge.applyupdates: call driverconclude after performing merge actions Siddharth Agarwal <sid0@fb.com> parents: 26786 diff changeset	2094 # error out
26975 6618dfd3ea1c merge.applyupdates: don't return early if merge driver's conclude failed Siddharth Agarwal <sid0@fb.com> parents: 26962 diff changeset	2095 unresolved = max(unresolved, 1)
26787 64848559413a merge.applyupdates: call driverconclude after performing merge actions Siddharth Agarwal <sid0@fb.com> parents: 26786 diff changeset	2096
64848559413a merge.applyupdates: call driverconclude after performing merge actions Siddharth Agarwal <sid0@fb.com> parents: 26786 diff changeset	2097 ms.commit()
64848559413a merge.applyupdates: call driverconclude after performing merge actions Siddharth Agarwal <sid0@fb.com> parents: 26786 diff changeset	2098
27078 a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	2099 msupdated, msmerged, msremoved = ms.counts()
a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	2100 updated += msupdated
a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	2101 merged += msmerged
a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	2102 removed += msremoved
27080 ae2d3782d818 merge.applyupdates: extend action queues with ones returned from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27079 diff changeset	2103
ae2d3782d818 merge.applyupdates: extend action queues with ones returned from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27079 diff changeset	2104 extraactions = ms.actions()
29831 1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2105 if extraactions:
44452 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 44399 diff changeset	2106 mfiles = {a[0] for a in actions[ACTION_MERGE]}
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	2107 for k, acts in pycompat.iteritems(extraactions):
29831 1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2108 actions[k].extend(acts)
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	2109 if k == ACTION_GET and wantfiledata:
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	2110 # no filedata until mergestate is updated to provide it
42522 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42456 diff changeset	2111 for a in acts:
d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42456 diff changeset	2112 getfiledata[a[0]] = None
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2113 # Remove these files from actions[ACTION_MERGE] as well. This is
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2114 # important because in recordupdates, files in actions[ACTION_MERGE]
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2115 # are processed after files in other actions, and the merge driver
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2116 # might add files to those actions via extraactions above. This can
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2117 # lead to a file being recorded twice, with poor results. This is
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2118 # especially problematic for actions[ACTION_REMOVE] (currently only
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2119 # possible with the merge driver in the initial merge process;
43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2120 # interrupted merges don't go through this flow).
29831 1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2121 #
1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2122 # The real fix here is to have indexes by both file and action so
1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2123 # that when the action for a file is changed it is automatically
1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2124 # reflected in the other action lists. But that involves a more
1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2125 # complex data structure, so this will do for now.
1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2126 #
1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2127 # We don't need to do the same operation for 'dc' and 'cd' because
1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2128 # those lists aren't consulted again.
1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2129 mfiles.difference_update(a[0] for a in acts)
1316c7cccc76 merge: remove files with extra actions from merge action list Siddharth Agarwal <sid0@fb.com> parents: 29775 diff changeset	2130
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2131 actions[ACTION_MERGE] = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2132 a for a in actions[ACTION_MERGE] if a[0] in mfiles
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2133 ]
27080 ae2d3782d818 merge.applyupdates: extend action queues with ones returned from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27079 diff changeset	2134
38373 ef692614e601 progress: hide update(None) in a new complete() method Martin von Zweigbergk <martinvonz@google.com> parents: 38345 diff changeset	2135 progress.complete()
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	2136 assert len(getfiledata) == (len(actions[ACTION_GET]) if wantfiledata else 0)
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	2137 return updateresult(updated, merged, removed, unresolved), getfiledata
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	2138
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2139
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	2140 def recordupdates(repo, actions, branchmerge, getfiledata):
43787 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43713 diff changeset	2141 """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	2142 # remove (must come first)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2143 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	2144 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2145 repo.dirstate.remove(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2146 else:
21389 e741972017d9 merge: change priority / ordering of merge actions Mads Kiilerich <madski@unity3d.com> parents: 21269 diff changeset	2147 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	2148
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2149 # forget (must come first)
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2150 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	2151 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	2152
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	2153 # resolve path conflicts
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2154 for f, args, msg in actions.get(ACTION_PATH_CONFLICT_RESOLVE, []):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2155 (f0,) = args
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	2156 origf0 = repo.dirstate.copied(f0) or f0
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	2157 repo.dirstate.add(f)
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	2158 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	2159 if f0 == origf0:
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	2160 repo.dirstate.remove(f0)
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	2161 else:
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	2162 repo.dirstate.drop(f0)
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	2163
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2164 # re-add
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2165 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	2166 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	2167
27131 d837da26155e merge: add a new action type representing files to add/mark as modified Siddharth Agarwal <sid0@fb.com> parents: 27130 diff changeset	2168 # re-add/mark as modified
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2169 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	2170 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	2171 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	2172 else:
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2173 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	2174
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2175 # exec change
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2176 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	2177 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	2178
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2179 # keep
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2180 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	2181 pass
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2182
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2183 # get
42522 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42456 diff changeset	2184 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	2185 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2186 repo.dirstate.otherparent(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2187 else:
42522 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42456 diff changeset	2188 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	2189 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	2190
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2191 # merge
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2192 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	2193 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	2194 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2195 # 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	2196 # 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	2197 repo.dirstate.merge(f)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2198 if f1 != f2: # copy/rename
3308 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3307 diff changeset	2199 if move:
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2200 repo.dirstate.remove(f1)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2201 if f1 != f:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2202 repo.dirstate.copy(f1, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2203 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2204 repo.dirstate.copy(f2, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2205 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2206 # 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	2207 # 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	2208 # 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	2209 # 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	2210 # modification.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2211 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	2212 repo.dirstate.normallookup(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2213 if move:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2214 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	2215
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2216 # directory rename, move local
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2217 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	2218 f0, flag = args
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2219 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2220 repo.dirstate.add(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2221 repo.dirstate.remove(f0)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2222 repo.dirstate.copy(f0, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2223 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2224 repo.dirstate.normal(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2225 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	2226
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2227 # directory rename, get
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2228 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	2229 f0, flag = args
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2230 if branchmerge:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2231 repo.dirstate.add(f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2232 repo.dirstate.copy(f0, f)
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2233 else:
bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	2234 repo.dirstate.normal(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	2235
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2236
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2237 UPDATECHECK_ABORT = b'abort' # handled at higher layers
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2238 UPDATECHECK_NONE = b'none'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2239 UPDATECHECK_LINEAR = b'linear'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2240 UPDATECHECK_NO_CONFLICT = b'noconflict'
42970 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42959 diff changeset	2241
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2242
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2243 def update(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2244 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2245 node,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2246 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2247 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2248 ancestor=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2249 mergeancestor=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2250 labels=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2251 matcher=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2252 mergeforce=False,
44271 c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2253 updatedirstate=True,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2254 updatecheck=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2255 wc=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2256 ):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	2257 """
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	2258 Perform a merge between the working directory and the given node
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	2259
30902 e6932e9a262a merge: remove unused handling of default destination in merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30901 diff changeset	2260 node = the node to update to
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	2261 branchmerge = whether to merge between branches
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	2262 force = whether to force branch merging or file overwriting
27344 43c00ca887d1 merge: have merge.update use a matcher instead of partial fn Augie Fackler <augie@google.com> parents: 27316 diff changeset	2263 matcher = a matcher to filter file lists (dirstate not updated)
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	2264 mergeancestor = whether it is merging with an ancestor. If true,
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	2265 we should accept the incoming changes for any prompts that occur.
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	2266 If false, merging with an ancestor (fast-forward) is only allowed
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	2267 between different named branches. This flag is used by rebase extension
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	2268 as a temporary fix and should be avoided in general.
28019 e81d11794036 merge: add missing doc for 'labels' parameter Siddharth Agarwal <sid0@fb.com> parents: 28018 diff changeset	2269 labels = labels to use for base, local and other
28020 cffa46cbdb8f merge: tell _checkunknownfiles about whether this was merge --force Siddharth Agarwal <sid0@fb.com> parents: 28019 diff changeset	2270 mergeforce = whether the merge was run with 'merge --force' (deprecated): if
cffa46cbdb8f merge: tell _checkunknownfiles about whether this was merge --force Siddharth Agarwal <sid0@fb.com> parents: 28019 diff changeset	2271 this is True, then 'force' should be True as well.
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	2272
34919 1856de4d1297 update: mention long options explicitly in description of merge.update() muxator <a.mux@inwind.it> parents: 34885 diff changeset	2273 The table below shows all the behaviors of the update command given the
1856de4d1297 update: mention long options explicitly in description of merge.update() muxator <a.mux@inwind.it> parents: 34885 diff changeset	2274 -c/--check and -C/--clean or no options, whether the working directory is
1856de4d1297 update: mention long options explicitly in description of merge.update() muxator <a.mux@inwind.it> parents: 34885 diff changeset	2275 dirty, whether a revision is specified, and the relationship of the parent
1856de4d1297 update: mention long options explicitly in description of merge.update() muxator <a.mux@inwind.it> parents: 34885 diff changeset	2276 rev to the target rev (linear or not). Match from top first. The -n
1856de4d1297 update: mention long options explicitly in description of merge.update() muxator <a.mux@inwind.it> parents: 34885 diff changeset	2277 option doesn't exist on the command line, but represents the
31168 41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2278 experimental.updatecheck=noconflict option.
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	2279
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12032 diff changeset	2280 This logic is tested by test-update-branches.t.
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	2281
31168 41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2282 -c -C -n -m dirty rev linear \| result
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2283 y y * * * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2284 y * y * * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2285 y * * y * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2286 * y y * * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2287 * y * y * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2288 * * y y * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2289 * * * * * n n \| x
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2290 * * * * n * * \| ok
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2291 n n n n y * y \| merge
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2292 n n n n y y n \| (2)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2293 n n n y y * * \| merge
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2294 n n y n y * * \| merge if no conflict
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2295 n y n n y * * \| discard
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2296 y n n n y * * \| (3)
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	2297
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	2298 x = can't happen
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	2299 * = don't-care
31161 351207bfdde9 merge: move "incompatible options" case first in docstring table Martin von Zweigbergk <martinvonz@google.com> parents: 31160 diff changeset	2300 1 = incompatible options (checked in commands.py)
351207bfdde9 merge: move "incompatible options" case first in docstring table Martin von Zweigbergk <martinvonz@google.com> parents: 31160 diff changeset	2301 2 = abort: uncommitted changes (commit or update --clean to discard changes)
351207bfdde9 merge: move "incompatible options" case first in docstring table Martin von Zweigbergk <martinvonz@google.com> parents: 31160 diff changeset	2302 3 = abort: uncommitted changes (checked in commands.py)
13162 115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	2303
34302 440ece43024c merge: allow a custom working context to be passed to update Phil Cohen <phillco@fb.com> parents: 34142 diff changeset	2304 The merge is performed inside ``wc``, a workingctx-like objects. It defaults
440ece43024c merge: allow a custom working context to be passed to update Phil Cohen <phillco@fb.com> parents: 34142 diff changeset	2305 to repo[None] if None is passed.
440ece43024c merge: allow a custom working context to be passed to update Phil Cohen <phillco@fb.com> parents: 34142 diff changeset	2306
13162 115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	2307 Return the same tuple as applyupdates().
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	2308 """
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33311 diff changeset	2309 # Avoid cycle.
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33311 diff changeset	2310 from . import sparse
2815 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2814 diff changeset	2311
31166 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31165 diff changeset	2312 # This function used to find the default destination if node was None, but
30902 e6932e9a262a merge: remove unused handling of default destination in merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30901 diff changeset	2313 # that's now in destutil.py.
e6932e9a262a merge: remove unused handling of default destination in merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30901 diff changeset	2314 assert node is not None
31166 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31165 diff changeset	2315 if not branchmerge and not force:
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31165 diff changeset	2316 # TODO: remove the default once all callers that pass branchmerge=False
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31165 diff changeset	2317 # and force=False pass a value for updatecheck. We may want to allow
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31165 diff changeset	2318 # updatecheck='abort' to better suppport some of these callers.
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31165 diff changeset	2319 if updatecheck is None:
42970 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42959 diff changeset	2320 updatecheck = UPDATECHECK_LINEAR
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2321 if updatecheck not in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2322 UPDATECHECK_NONE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2323 UPDATECHECK_LINEAR,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2324 UPDATECHECK_NO_CONFLICT,
42972 71bb9363818c merge: check argument value with if/raise instead of an assert Augie Fackler <augie@google.com> parents: 42970 diff changeset	2325 ):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2326 raise ValueError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2327 r'Invalid updatecheck %r (can accept %r)'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2328 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2329 updatecheck,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2330 (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2331 UPDATECHECK_NONE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2332 UPDATECHECK_LINEAR,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2333 UPDATECHECK_NO_CONFLICT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2334 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2335 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2336 )
27852 a33c1c9e769c with: use context manager in merge update Bryan O'Sullivan <bryano@fb.com> parents: 27742 diff changeset	2337 with repo.wlock():
34302 440ece43024c merge: allow a custom working context to be passed to update Phil Cohen <phillco@fb.com> parents: 34142 diff changeset	2338 if wc is None:
440ece43024c merge: allow a custom working context to be passed to update Phil Cohen <phillco@fb.com> parents: 34142 diff changeset	2339 wc = repo[None]
20279 5b4f963d21cc merge: refactor initialization of variables in update Sean Farley <sean.michael.farley@gmail.com> parents: 20278 diff changeset	2340 pl = wc.parents()
5b4f963d21cc merge: refactor initialization of variables in update Sean Farley <sean.michael.farley@gmail.com> parents: 20278 diff changeset	2341 p1 = pl[0]
42409 72522fe7fb95 merge: reorder some initialization to make more sense Martin von Zweigbergk <martinvonz@google.com> parents: 42163 diff changeset	2342 p2 = repo[node]
23405 2a038deeac9a merge: 0 is a valid ancestor different from None Mads Kiilerich <madski@unity3d.com> parents: 23398 diff changeset	2343 if ancestor is not None:
21081 ffd7b6ce46ff merge: pass merge ancestor to calculateupdates as a list Mads Kiilerich <madski@unity3d.com> parents: 21080 diff changeset	2344 pas = [repo[ancestor]]
42410 a5b5ecff5f37 merge: simplify initialization of "pas" Martin von Zweigbergk <martinvonz@google.com> parents: 42409 diff changeset	2345 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2346 if repo.ui.configlist(b'merge', b'preferancestor') == [b'*']:
21128 f4014f646f71 merge: with merge.preferancestor=, run an auction with bids from ancestors Mads Kiilerich <madski@unity3d.com>* parents: 21082 diff changeset	2347 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
f4014f646f71 merge: with merge.preferancestor=, run an auction with bids from ancestors Mads Kiilerich <madski@unity3d.com>* parents: 21082 diff changeset	2348 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
f4014f646f71 merge: with merge.preferancestor=, run an auction with bids from ancestors Mads Kiilerich <madski@unity3d.com>* parents: 21082 diff changeset	2349 else:
22179 46308fadaa15 merge: show the scary multiple ancestor hint for merges only, not for updates Mads Kiilerich <madski@unity3d.com> parents: 21551 diff changeset	2350 pas = [p1.ancestor(p2, warn=branchmerge)]
13874 9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	2351
36177 187f2474bc11 merge: coerce nodes to bytes, not str Augie Fackler <augie@google.com> parents: 36142 diff changeset	2352 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2)
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	2353
42409 72522fe7fb95 merge: reorder some initialization to make more sense Martin von Zweigbergk <martinvonz@google.com> parents: 42163 diff changeset	2354 overwrite = force and not branchmerge
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	2355 ### check phase
27316 777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 27267 diff changeset	2356 if not overwrite:
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 27267 diff changeset	2357 if len(pl) > 1:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2358 raise error.Abort(_(b"outstanding uncommitted merge"))
27316 777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 27267 diff changeset	2359 ms = mergestate.read(repo)
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 27267 diff changeset	2360 if list(ms.unresolved()):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2361 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2362 _(b"outstanding merge conflicts"),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2363 hint=_(b"use 'hg resolve' to resolve"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2364 )
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	2365 if branchmerge:
21081 ffd7b6ce46ff merge: pass merge ancestor to calculateupdates as a list Mads Kiilerich <madski@unity3d.com> parents: 21080 diff changeset	2366 if pas == [p2]:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2367 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2368 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2369 b"merging with a working directory ancestor"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2370 b" has no effect"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2371 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2372 )
21081 ffd7b6ce46ff merge: pass merge ancestor to calculateupdates as a list Mads Kiilerich <madski@unity3d.com> parents: 21080 diff changeset	2373 elif pas == [p1]:
31379 b6a6df38a802 merge: check current wc branch for 'nothing to merge', not its p1 Mads Kiilerich <mads@kiilerich.com> parents: 31323 diff changeset	2374 if not mergeancestor and wc.branch() == p2.branch():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2375 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2376 _(b"nothing to merge"),
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43106 diff changeset	2377 hint=_(b"use 'hg update' or check 'hg heads'"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2378 )
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	2379 if not force and (wc.files() or wc.deleted()):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2380 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2381 _(b"uncommitted changes"),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2382 hint=_(b"use 'hg status' to list changes"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2383 )
35284 1b03407e808d merge: skip subrepo state, update hooks, and updating the dirstate in IMM Phil Cohen <phillco@fb.com> parents: 35283 diff changeset	2384 if not wc.isinmemory():
1b03407e808d merge: skip subrepo state, update hooks, and updating the dirstate in IMM Phil Cohen <phillco@fb.com> parents: 35283 diff changeset	2385 for s in sorted(wc.substate):
1b03407e808d merge: skip subrepo state, update hooks, and updating the dirstate in IMM Phil Cohen <phillco@fb.com> parents: 35283 diff changeset	2386 wc.sub(s).bailifchanged()
13437 6169493ac3f9 Do not allow merging with uncommitted changes in a subrepo Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 13400 diff changeset	2387
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	2388 elif not overwrite:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2389 if p1 == p2: # no-op update
19929 ab2362e1672e merge: exit early during a no-op update (BC) Siddharth Agarwal <sid0@fb.com> parents: 19803 diff changeset	2390 # call the hooks and exit early
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2391 repo.hook(b'preupdate', throw=True, parent1=xp2, parent2=b'')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2392 repo.hook(b'update', parent1=xp2, parent2=b'', error=0)
37107 71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37087 diff changeset	2393 return updateresult(0, 0, 0, 0)
19929 ab2362e1672e merge: exit early during a no-op update (BC) Siddharth Agarwal <sid0@fb.com> parents: 19803 diff changeset	2394
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2395 if updatecheck == UPDATECHECK_LINEAR and pas not in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2396 [p1],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2397 [p2],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2398 ): # nonlinear
18985 a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	2399 dirty = wc.dirty(missing=True)
30902 e6932e9a262a merge: remove unused handling of default destination in merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30901 diff changeset	2400 if dirty:
18985 a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	2401 # Branching is a bit strange to ensure we do the minimal
33146 7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33095 diff changeset	2402 # amount of call to obsutil.foreground.
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33095 diff changeset	2403 foreground = obsutil.foreground(repo, [p1.node()])
18985 a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	2404 # note: the <node> variable contains a random identifier
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	2405 if repo[node].node() in foreground:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2406 pass # allow updating to successors
30902 e6932e9a262a merge: remove unused handling of default destination in merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30901 diff changeset	2407 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2408 msg = _(b"uncommitted changes")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2409 hint = _(b"commit or update --clean to discard changes")
30961 330fbd515512 destutil: remove duplicate check and leave it to merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30903 diff changeset	2410 raise error.UpdateAbort(msg, hint=hint)
18985 a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	2411 else:
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	2412 # Allow jumping branches if clean and specific rev given
30901 47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	2413 pass
47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	2414
47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	2415 if overwrite:
47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	2416 pas = [wc]
47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	2417 elif not branchmerge:
47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	2418 pas = [p1]
2814 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2813 diff changeset	2419
25843 bf9ea348b487 merge: mark ancient debugging option Matt Mackall <mpm@selenic.com> parents: 25754 diff changeset	2420 # deprecated config: merge.followcopies
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2421 followcopies = repo.ui.configbool(b'merge', b'followcopies')
21080 04540a8499a3 merge: move ancestor selection tweaking from manifestmerge to update function Mads Kiilerich <madski@unity3d.com> parents: 21024 diff changeset	2422 if overwrite:
30200 a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates G?bor Stefanik <gabor.stefanik@nng.com> parents: 30172 diff changeset	2423 followcopies = False
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates G?bor Stefanik <gabor.stefanik@nng.com> parents: 30172 diff changeset	2424 elif not pas[0]:
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates G?bor Stefanik <gabor.stefanik@nng.com> parents: 30172 diff changeset	2425 followcopies = False
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates G?bor Stefanik <gabor.stefanik@nng.com> parents: 30172 diff changeset	2426 if not branchmerge and not wc.dirty(missing=True):
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates G?bor Stefanik <gabor.stefanik@nng.com> parents: 30172 diff changeset	2427 followcopies = False
21080 04540a8499a3 merge: move ancestor selection tweaking from manifestmerge to update function Mads Kiilerich <madski@unity3d.com> parents: 21024 diff changeset	2428
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	2429 ### calculate phase
23641 a7a0f32a383f merge: make calculateupdates() return file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23640 diff changeset	2430 actionbyfile, diverge, renamedelete = calculateupdates(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2431 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2432 wc,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2433 p2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2434 pas,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2435 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2436 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2437 mergeancestor,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2438 followcopies,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2439 matcher=matcher,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2440 mergeforce=mergeforce,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2441 )
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2442
42970 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42959 diff changeset	2443 if updatecheck == UPDATECHECK_NO_CONFLICT:
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	2444 for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2445 if m not in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2446 ACTION_GET,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2447 ACTION_KEEP,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2448 ACTION_EXEC,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2449 ACTION_REMOVE,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2450 ACTION_PATH_CONFLICT_RESOLVE,
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	2451 ACTION_GET_OTHER_AND_STORE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2452 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2453 msg = _(b"conflicting changes")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2454 hint = _(b"commit or update --clean to discard changes")
31168 41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2455 raise error.Abort(msg, hint=hint)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31166 diff changeset	2456
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2457 # Prompt and create actions. Most of this is in the resolve phase
6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2458 # already, but we can't handle .hgsubstate in filemerge or
36009 55e8efa2451a subrepo: split non-core functions to new module Yuya Nishihara <yuya@tcha.org> parents: 35726 diff changeset	2459 # subrepoutil.submerge yet so we have to keep prompting for it.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2460 if b'.hgsubstate' in actionbyfile:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2461 f = b'.hgsubstate'
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2462 m, args, msg = actionbyfile[f]
29774 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29629 diff changeset	2463 prompts = filemerge.partextras(labels)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2464 prompts[b'f'] = f
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2465 if m == ACTION_CHANGED_DELETED:
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2466 if repo.ui.promptchoice(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2467 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2468 b"local%(l)s changed %(f)s which other%(o)s deleted\n"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2469 b"use (c)hanged version or (d)elete?"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2470 b"$$ &Changed $$ &Delete"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2471 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2472 % prompts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2473 0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2474 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2475 actionbyfile[f] = (ACTION_REMOVE, None, b'prompt delete')
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2476 elif f in p1:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2477 actionbyfile[f] = (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2478 ACTION_ADD_MODIFIED,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2479 None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2480 b'prompt keep',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2481 )
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2482 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2483 actionbyfile[f] = (ACTION_ADD, None, b'prompt keep')
37112 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	2484 elif m == ACTION_DELETED_CHANGED:
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2485 f1, f2, fa, move, anc = args
6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2486 flags = p2[f2].flags()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2487 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2488 repo.ui.promptchoice(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2489 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2490 b"other%(o)s changed %(f)s which local%(l)s deleted\n"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2491 b"use (c)hanged version or leave (d)eleted?"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2492 b"$$ &Changed $$ &Deleted"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2493 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2494 % prompts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2495 0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2496 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2497 == 0
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2498 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2499 actionbyfile[f] = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2500 ACTION_GET,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2501 (flags, False),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2502 b'prompt recreating',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2503 )
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2504 else:
6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2505 del actionbyfile[f]
6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2506
23641 a7a0f32a383f merge: make calculateupdates() return file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23640 diff changeset	2507 # Convert to dictionary-of-lists format
41039 54c3b4bd01f2 merge: extract helper for creating empty "actions" dict Martin von Zweigbergk <martinvonz@google.com> parents: 39818 diff changeset	2508 actions = emptyactions()
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	2509 for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
23641 a7a0f32a383f merge: make calculateupdates() return file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23640 diff changeset	2510 if m not in actions:
a7a0f32a383f merge: make calculateupdates() return file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23640 diff changeset	2511 actions[m] = []
a7a0f32a383f merge: make calculateupdates() return file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23640 diff changeset	2512 actions[m].append((f, args, msg))
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	2513
44687 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	2514 # ACTION_GET_OTHER_AND_STORE is a ACTION_GET + store in mergestate
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	2515 for e in actions[ACTION_GET_OTHER_AND_STORE]:
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	2516 actions[ACTION_GET].append(e)
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44452 diff changeset	2517
29889 6f447b9ec263 util: rename checkcase() to fscasesensitive() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 29831 diff changeset	2518 if not util.fscasesensitive(repo.path):
23544 7cc0fb0080b6 merge: perform case-collision checking on final set of actions Martin von Zweigbergk <martinvonz@google.com> parents: 23541 diff changeset	2519 # check collision between files only in p2 for clean update
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2520 if not branchmerge and (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2521 force or not wc.dirty(missing=True, branch=False)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2522 ):
23544 7cc0fb0080b6 merge: perform case-collision checking on final set of actions Martin von Zweigbergk <martinvonz@google.com> parents: 23541 diff changeset	2523 _checkcollision(repo, p2.manifest(), None)
7cc0fb0080b6 merge: perform case-collision checking on final set of actions Martin von Zweigbergk <martinvonz@google.com> parents: 23541 diff changeset	2524 else:
7cc0fb0080b6 merge: perform case-collision checking on final set of actions Martin von Zweigbergk <martinvonz@google.com> parents: 23541 diff changeset	2525 _checkcollision(repo, wc.manifest(), actions)
7cc0fb0080b6 merge: perform case-collision checking on final set of actions Martin von Zweigbergk <martinvonz@google.com> parents: 23541 diff changeset	2526
23525 5126d7718d7c merge: move dr/rd warning messages out of applyupdates() Martin von Zweigbergk <martinvonz@google.com> parents: 23524 diff changeset	2527 # divergent renames
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	2528 for f, fl in sorted(pycompat.iteritems(diverge)):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2529 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2530 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2531 b"note: possible conflict - %s was renamed "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2532 b"multiple times to:\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2533 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2534 % f
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2535 )
42110 3a7efcbdf288 copies: print list of divergent renames in sorted order Martin von Zweigbergk <martinvonz@google.com> parents: 42057 diff changeset	2536 for nf in sorted(fl):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2537 repo.ui.warn(b" %s\n" % nf)
23525 5126d7718d7c merge: move dr/rd warning messages out of applyupdates() Martin von Zweigbergk <martinvonz@google.com> parents: 23524 diff changeset	2538
5126d7718d7c merge: move dr/rd warning messages out of applyupdates() Martin von Zweigbergk <martinvonz@google.com> parents: 23524 diff changeset	2539 # rename and delete
43106 d783f945a701 py3: finish porting iteritems() to pycompat and remove source transformer Gregory Szorc <gregory.szorc@gmail.com> parents: 43104 diff changeset	2540 for f, fl in sorted(pycompat.iteritems(renamedelete)):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2541 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2542 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2543 b"note: possible conflict - %s was deleted "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2544 b"and renamed to:\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2545 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2546 % f
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2547 )
42110 3a7efcbdf288 copies: print list of divergent renames in sorted order Martin von Zweigbergk <martinvonz@google.com> parents: 42057 diff changeset	2548 for nf in sorted(fl):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2549 repo.ui.warn(b" %s\n" % nf)
23525 5126d7718d7c merge: move dr/rd warning messages out of applyupdates() Martin von Zweigbergk <martinvonz@google.com> parents: 23524 diff changeset	2550
26957 d16d73173fdd merge: move messages about possible conflicts a litte earlier Martin von Zweigbergk <martinvonz@google.com> parents: 26949 diff changeset	2551 ### apply phase
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2552 if not branchmerge: # just jump to the new rev
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2553 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b''
44165 ae9310709c13 merge: move definition of `partial` closer to where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 44151 diff changeset	2554 # If we're doing a partial update, we need to skip updating
44166 faec51c76b7b merge: avoid a negation in the definition of updatedirstate Martin von Zweigbergk <martinvonz@google.com> parents: 44165 diff changeset	2555 # the dirstate.
faec51c76b7b merge: avoid a negation in the definition of updatedirstate Martin von Zweigbergk <martinvonz@google.com> parents: 44165 diff changeset	2556 always = matcher is None or matcher.always()
44271 c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2557 updatedirstate = updatedirstate and always and not wc.isinmemory()
44151 d1c0f239193f merge: define updatedirstate a little earlier and reuse it Martin von Zweigbergk <martinvonz@google.com> parents: 44150 diff changeset	2558 if updatedirstate:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2559 repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
26957 d16d73173fdd merge: move messages about possible conflicts a litte earlier Martin von Zweigbergk <martinvonz@google.com> parents: 26949 diff changeset	2560 # note that we're in the middle of an update
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2561 repo.vfs.write(b'updatestate', p2.hex())
26957 d16d73173fdd merge: move messages about possible conflicts a litte earlier Martin von Zweigbergk <martinvonz@google.com> parents: 26949 diff changeset	2562
34885 df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2563 # Advertise fsmonitor when its presence could be useful.
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2564 #
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2565 # We only advertise when performing an update from an empty working
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2566 # directory. This typically only occurs during initial clone.
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2567 #
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2568 # We give users a mechanism to disable the warning in case it is
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2569 # annoying.
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2570 #
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2571 # We only allow on Linux and MacOS because that's where fsmonitor is
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2572 # considered stable.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2573 fsmonitorwarning = repo.ui.configbool(b'fsmonitor', b'warn_when_unused')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2574 fsmonitorthreshold = repo.ui.configint(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2575 b'fsmonitor', b'warn_update_file_count'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2576 )
34885 df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2577 try:
36010 46a54de96a54 merge: cut import cycle at merge -> extensions Yuya Nishihara <yuya@tcha.org> parents: 36009 diff changeset	2578 # avoid cycle: extensions -> cmdutil -> merge
46a54de96a54 merge: cut import cycle at merge -> extensions Yuya Nishihara <yuya@tcha.org> parents: 36009 diff changeset	2579 from . import extensions
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2580
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2581 extensions.find(b'fsmonitor')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2582 fsmonitorenabled = repo.ui.config(b'fsmonitor', b'mode') != b'off'
34885 df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2583 # We intentionally don't look at whether fsmonitor has disabled
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2584 # itself because a) fsmonitor may have already printed a warning
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2585 # b) we only care about the config state here.
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2586 except KeyError:
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2587 fsmonitorenabled = False
df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2588
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2589 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2590 fsmonitorwarning
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2591 and not fsmonitorenabled
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2592 and p1.node() == nullid
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2593 and len(actions[ACTION_GET]) >= fsmonitorthreshold
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2594 and pycompat.sysplatform.startswith((b'linux', b'darwin'))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2595 ):
34885 df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2596 repo.ui.warn(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2597 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2598 b'(warning: large working directory being used without '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2599 b'fsmonitor enabled; enable fsmonitor to improve performance; '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2600 b'see "hg help -e fsmonitor")\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2601 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2602 )
34885 df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2603
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	2604 wantfiledata = updatedirstate and not branchmerge
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2605 stats, getfiledata = applyupdates(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2606 repo, actions, wc, p2, overwrite, wantfiledata, labels=labels
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2607 )
26957 d16d73173fdd merge: move messages about possible conflicts a litte earlier Martin von Zweigbergk <martinvonz@google.com> parents: 26949 diff changeset	2608
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	2609 if updatedirstate:
32351 c568c187102f merge: migrate to context manager for changing dirstate parents Augie Fackler <augie@google.com> parents: 32246 diff changeset	2610 with repo.dirstate.parentchange():
c568c187102f merge: migrate to context manager for changing dirstate parents Augie Fackler <augie@google.com> parents: 32246 diff changeset	2611 repo.setparents(fp1, fp2)
42456 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42412 diff changeset	2612 recordupdates(repo, actions, branchmerge, getfiledata)
32351 c568c187102f merge: migrate to context manager for changing dirstate parents Augie Fackler <augie@google.com> parents: 32246 diff changeset	2613 # update completed, clear state
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2614 util.unlink(repo.vfs.join(b'updatestate'))
19482 499fc471296b update: add tracking of interrupted updates (issue3113) Matt Mackall <mpm@selenic.com> parents: 19285 diff changeset	2615
32351 c568c187102f merge: migrate to context manager for changing dirstate parents Augie Fackler <augie@google.com> parents: 32246 diff changeset	2616 if not branchmerge:
c568c187102f merge: migrate to context manager for changing dirstate parents Augie Fackler <augie@google.com> parents: 32246 diff changeset	2617 repo.dirstate.setbranch(p2.branch())
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10431 diff changeset	2618
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33311 diff changeset	2619 # If we're updating to a location, clean up any stale temporary includes
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33311 diff changeset	2620 # (ex: this happens during hg rebase --abort).
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33311 diff changeset	2621 if not branchmerge:
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33311 diff changeset	2622 sparse.prunetemporaryincludes(repo)
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33311 diff changeset	2623
44150 ff22c76825b9 merge: don't call update hook when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 44092 diff changeset	2624 if updatedirstate:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2625 repo.hook(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2626 b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2627 )
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10431 diff changeset	2628 return stats
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2629
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2630
44399 a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2631 def merge(ctx, labels=None, force=False, wc=None):
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2632 """Merge another topological branch into the working copy.
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2633
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2634 force = whether the merge was run with 'merge --force' (deprecated)
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2635 """
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2636
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2637 return update(
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2638 ctx.repo(),
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2639 ctx.rev(),
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2640 labels=labels,
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2641 branchmerge=True,
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2642 force=force,
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2643 mergeforce=force,
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2644 wc=wc,
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2645 )
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2646
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44394 diff changeset	2647
44270 f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44215 diff changeset	2648 def clean_update(ctx, wc=None):
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44215 diff changeset	2649 """Do a clean update to the given commit.
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44215 diff changeset	2650
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44215 diff changeset	2651 This involves updating to the commit and discarding any changes in the
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44215 diff changeset	2652 working copy.
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44215 diff changeset	2653 """
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44215 diff changeset	2654 return update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc)
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44215 diff changeset	2655
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44215 diff changeset	2656
44271 c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2657 def revert_to(ctx, matcher=None, wc=None):
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2658 """Revert the working copy to the given commit.
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2659
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2660 The working copy will keep its current parent(s) but its content will
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2661 be the same as in the given commit.
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2662 """
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2663
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2664 return update(
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2665 ctx.repo(),
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2666 ctx.rev(),
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2667 branchmerge=False,
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2668 force=True,
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2669 updatedirstate=False,
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2670 matcher=matcher,
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2671 wc=wc,
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2672 )
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2673
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44270 diff changeset	2674
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2675 def graft(
44211 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2676 repo,
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2677 ctx,
44212 cb8b67016110 graft: default `base` argument to common case of `ctx.p1()` Martin von Zweigbergk <martinvonz@google.com> parents: 44211 diff changeset	2678 base=None,
44211 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2679 labels=None,
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2680 keepparent=False,
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2681 keepconflictparent=False,
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2682 wctx=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2683 ):
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2684 """Do a graft-like merge.
ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2685
ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2686 This is a merge where the merge ancestor is chosen such that one
ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2687 or more changesets are grafted onto the current changeset. In
ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2688 addition to the merge, this fixes up the dirstate to include only
27267 d6859d86a5d5 merge.graft: add option to keep second parent Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 27137 diff changeset	2689 a single parent (if keepparent is False) and tries to duplicate any
d6859d86a5d5 merge.graft: add option to keep second parent Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 27137 diff changeset	2690 renames/copies appropriately.
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2691
ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2692 ctx - changeset to rebase
44212 cb8b67016110 graft: default `base` argument to common case of `ctx.p1()` Martin von Zweigbergk <martinvonz@google.com> parents: 44211 diff changeset	2693 base - merge base, or ctx.p1() if not specified
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2694 labels - merge labels eg ['local', 'graft']
27267 d6859d86a5d5 merge.graft: add option to keep second parent Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 27137 diff changeset	2695 keepparent - keep second parent if any
42412 127937874395 merge: correct argument name in docstring Anton Shestakov <av6@dwimlabs.net> parents: 42410 diff changeset	2696 keepconflictparent - if unresolved, keep parent used for the merge
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2697
ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2698 """
24643 a8e6897dffbe graft: allow creating sibling grafts Durham Goode <durham@fb.com> parents: 24471 diff changeset	2699 # If we're grafting a descendant onto an ancestor, be sure to pass
a8e6897dffbe graft: allow creating sibling grafts Durham Goode <durham@fb.com> parents: 24471 diff changeset	2700 # mergeancestor=True to update. This does two things: 1) allows the merge if
a8e6897dffbe graft: allow creating sibling grafts Durham Goode <durham@fb.com> parents: 24471 diff changeset	2701 # the destination is the same as the parent of the ctx (so we can use graft
a8e6897dffbe graft: allow creating sibling grafts Durham Goode <durham@fb.com> parents: 24471 diff changeset	2702 # to copy commits), and 2) informs update that the incoming changes are
a8e6897dffbe graft: allow creating sibling grafts Durham Goode <durham@fb.com> parents: 24471 diff changeset	2703 # newer than the destination so it doesn't prompt about "remote changed foo
a8e6897dffbe graft: allow creating sibling grafts Durham Goode <durham@fb.com> parents: 24471 diff changeset	2704 # which local deleted".
44383 218feb1a7e00 graft: always allow hg graft --base . (issue6248) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44289 diff changeset	2705 # We also pass mergeancestor=True when base is the same revision as p1. 2)
218feb1a7e00 graft: always allow hg graft --base . (issue6248) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44289 diff changeset	2706 # doesn't matter as there can't possibly be conflicts, but 1) is necessary.
44211 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2707 wctx = wctx or repo[None]
44089 bd22e90c54b3 graft: extract repo[None] to a variable Martin von Zweigbergk <martinvonz@google.com> parents: 44060 diff changeset	2708 pctx = wctx.p1()
44212 cb8b67016110 graft: default `base` argument to common case of `ctx.p1()` Martin von Zweigbergk <martinvonz@google.com> parents: 44211 diff changeset	2709 base = base or ctx.p1()
44383 218feb1a7e00 graft: always allow hg graft --base . (issue6248) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44289 diff changeset	2710 mergeancestor = (
218feb1a7e00 graft: always allow hg graft --base . (issue6248) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44289 diff changeset	2711 repo.changelog.isancestor(pctx.node(), ctx.node())
218feb1a7e00 graft: always allow hg graft --base . (issue6248) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44289 diff changeset	2712 or pctx.rev() == base.rev()
218feb1a7e00 graft: always allow hg graft --base . (issue6248) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44289 diff changeset	2713 )
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2714
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2715 stats = update(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2716 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2717 ctx.node(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2718 True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2719 True,
43796 ebfd349eac46 graft: rename `pctx` argument to `base` since that's what it is Martin von Zweigbergk <martinvonz@google.com> parents: 43787 diff changeset	2720 base.node(),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2721 mergeancestor=mergeancestor,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2722 labels=labels,
44211 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2723 wc=wctx,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2724 )
38494 d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38426 diff changeset	2725
d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38426 diff changeset	2726 if keepconflictparent and stats.unresolvedcount:
d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38426 diff changeset	2727 pother = ctx.node()
d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38426 diff changeset	2728 else:
d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38426 diff changeset	2729 pother = nullid
d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38426 diff changeset	2730 parents = ctx.parents()
43796 ebfd349eac46 graft: rename `pctx` argument to `base` since that's what it is Martin von Zweigbergk <martinvonz@google.com> parents: 43787 diff changeset	2731 if keepparent and len(parents) == 2 and base in parents:
ebfd349eac46 graft: rename `pctx` argument to `base` since that's what it is Martin von Zweigbergk <martinvonz@google.com> parents: 43787 diff changeset	2732 parents.remove(base)
38494 d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38426 diff changeset	2733 pother = parents[0].node()
43798 32d11a23c9cf graft: never set both parents equal in the dirstate (issue6098) Martin von Zweigbergk <martinvonz@google.com> parents: 43797 diff changeset	2734 # Never set both parents equal to each other
32d11a23c9cf graft: never set both parents equal in the dirstate (issue6098) Martin von Zweigbergk <martinvonz@google.com> parents: 43797 diff changeset	2735 if pother == pctx.node():
32d11a23c9cf graft: never set both parents equal in the dirstate (issue6098) Martin von Zweigbergk <martinvonz@google.com> parents: 43797 diff changeset	2736 pother = nullid
27267 d6859d86a5d5 merge.graft: add option to keep second parent Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 27137 diff changeset	2737
44211 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2738 if wctx.isinmemory():
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2739 wctx.setparents(pctx.node(), pother)
32351 c568c187102f merge: migrate to context manager for changing dirstate parents Augie Fackler <augie@google.com> parents: 32246 diff changeset	2740 # fix up dirstate for copies and renames
44092 833210fbd900 graftcopies: remove `skip` and `repo` arguments Martin von Zweigbergk <martinvonz@google.com> parents: 44090 diff changeset	2741 copies.graftcopies(wctx, ctx, base)
44211 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2742 else:
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2743 with repo.dirstate.parentchange():
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2744 repo.setparents(pctx.node(), pother)
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2745 repo.dirstate.write(repo.currenttransaction())
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2746 # fix up dirstate for copies and renames
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44200 diff changeset	2747 copies.graftcopies(wctx, ctx, base)
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2748 return stats
39463 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2749
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2750
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2751 def purge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2752 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2753 matcher,
44289 9f8eddd2723f purge: add -i flag to delete ignored files instead of untracked files Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44287 diff changeset	2754 unknown=True,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2755 ignored=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2756 removeemptydirs=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2757 removefiles=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2758 abortonerror=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2759 noop=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42972 diff changeset	2760 ):
39463 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2761 """Purge the working directory of untracked files.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2762
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2763 ``matcher`` is a matcher configured to scan the working directory -
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2764 potentially a subset.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2765
44289 9f8eddd2723f purge: add -i flag to delete ignored files instead of untracked files Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44287 diff changeset	2766 ``unknown`` controls whether unknown files should be purged.
9f8eddd2723f purge: add -i flag to delete ignored files instead of untracked files Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44287 diff changeset	2767
9f8eddd2723f purge: add -i flag to delete ignored files instead of untracked files Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44287 diff changeset	2768 ``ignored`` controls whether ignored files should be purged.
39463 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2769
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2770 ``removeemptydirs`` controls whether empty directories should be removed.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2771
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2772 ``removefiles`` controls whether files are removed.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2773
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2774 ``abortonerror`` causes an exception to be raised if an error occurs
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2775 deleting a file or directory.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2776
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2777 ``noop`` controls whether to actually remove files. If not defined, actions
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2778 will be taken.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2779
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2780 Returns an iterable of relative paths in the working directory that were
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2781 or would be removed.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2782 """
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2783
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2784 def remove(removefn, path):
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2785 try:
39464 3dd34b401bc2 merge: use vfs methods for I/O Gregory Szorc <gregory.szorc@gmail.com> parents: 39463 diff changeset	2786 removefn(path)
39463 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2787 except OSError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2788 m = _(b'%s cannot be removed') % path
39463 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2789 if abortonerror:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2790 raise error.Abort(m)
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2791 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2792 repo.ui.warn(_(b'warning: %s\n') % m)
39463 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2793
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2794 # There's no API to copy a matcher. So mutate the passed matcher and
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2795 # restore it when we're done.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2796 oldtraversedir = matcher.traversedir
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2797
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2798 res = []
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2799
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2800 try:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2801 if removeemptydirs:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2802 directories = []
43713 95d2eab0a7b9 dirstate: include explicit matches in match.traversedir calls Martin von Zweigbergk <martinvonz@google.com> parents: 43633 diff changeset	2803 matcher.traversedir = directories.append
39463 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2804
44289 9f8eddd2723f purge: add -i flag to delete ignored files instead of untracked files Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44287 diff changeset	2805 status = repo.status(match=matcher, ignored=ignored, unknown=unknown)
39463 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2806
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2807 if removefiles:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2808 for f in sorted(status.unknown + status.ignored):
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2809 if not noop:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2810 repo.ui.note(_(b'removing file %s\n') % f)
39464 3dd34b401bc2 merge: use vfs methods for I/O Gregory Szorc <gregory.szorc@gmail.com> parents: 39463 diff changeset	2811 remove(repo.wvfs.unlink, f)
39463 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2812 res.append(f)
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2813
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2814 if removeemptydirs:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2815 for f in sorted(directories, reverse=True):
39464 3dd34b401bc2 merge: use vfs methods for I/O Gregory Szorc <gregory.szorc@gmail.com> parents: 39463 diff changeset	2816 if matcher(f) and not repo.wvfs.listdir(f):
39463 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2817 if not noop:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2818 repo.ui.note(_(b'removing directory %s\n') % f)
39464 3dd34b401bc2 merge: use vfs methods for I/O Gregory Szorc <gregory.szorc@gmail.com> parents: 39463 diff changeset	2819 remove(repo.wvfs.rmdir, f)
39463 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2820 res.append(f)
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2821
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2822 return res
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2823
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2824 finally:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2825 matcher.traversedir = oldtraversedir

Mercurial > public > mercurial-scm > hg

annotate mercurial/merge.py @ 44687:1b8fd4af3318