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

annotate mercurial/merge.py @ 52083:b332ae615714

merge: improve working-copy mtime race handling Explanations inline. This also makes use of `make_mtime_reliable`, which unifies our mtime raciness logic from the status. On top of this, this fixes the handling of the pure dirstate status to better catch racy status, as we've been doing in Rust for a long time now.

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Wed, 16 Oct 2024 19:14:30 +0200
parents	f5742367a279
children	8b7123c8947b

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 #
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 46811 diff changeset	3 # Copyright 2006, 2007 Olivia Mackall <olivia@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
51901 f4733654f144 typing: add `from __future__ import annotations` to most files Matt Harbison <matt_harbison@yahoo.com> parents: 51875 diff changeset	8 from __future__ import annotations
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	9
45313 69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	10 import collections
20590 2b7d54e929b4 merge: introduce new format for the state file Pierre-Yves David <pierre-yves.david@fb.com> parents: 20589 diff changeset	11 import struct
51788 278af66e6595 typing: induce pytype to use the standard `attr` instead of the vendored copy Matt Harbison <matt_harbison@yahoo.com> parents: 51762 diff changeset	12 import typing
52082 f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	13 from typing import Dict, Optional, Tuple
20590 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 _
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	16 from .node import nullrev
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	17 from .thirdparty import attr
51788 278af66e6595 typing: induce pytype to use the standard `attr` instead of the vendored copy Matt Harbison <matt_harbison@yahoo.com> parents: 51762 diff changeset	18
278af66e6595 typing: induce pytype to use the standard `attr` instead of the vendored copy Matt Harbison <matt_harbison@yahoo.com> parents: 51762 diff changeset	19 # Force pytype to use the non-vendored package
278af66e6595 typing: induce pytype to use the standard `attr` instead of the vendored copy Matt Harbison <matt_harbison@yahoo.com> parents: 51762 diff changeset	20 if typing.TYPE_CHECKING:
278af66e6595 typing: induce pytype to use the standard `attr` instead of the vendored copy Matt Harbison <matt_harbison@yahoo.com> parents: 51762 diff changeset	21 # noinspection PyPackageRequirements
278af66e6595 typing: induce pytype to use the standard `attr` instead of the vendored copy Matt Harbison <matt_harbison@yahoo.com> parents: 51762 diff changeset	22 import attr
278af66e6595 typing: induce pytype to use the standard `attr` instead of the vendored copy Matt Harbison <matt_harbison@yahoo.com> parents: 51762 diff changeset	23
46399 39f23d20ea47 merge: force an exception message to bytes before printing as a warning Matt Harbison <matt_harbison@yahoo.com> parents: 45957 diff changeset	24 from .utils import stringutil
48271 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 47609 diff changeset	25 from .dirstateutils import timestamp
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	26 from . import (
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	27 copies,
39823 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39481 diff changeset	28 encoding,
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26570 diff changeset	29 error,
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	30 filemerge,
31267 11831d755b51 merge: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31185 diff changeset	31 match as matchmod,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	32 mergestate as mergestatemod,
33152 7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33107 diff changeset	33 obsutil,
43677 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43421 diff changeset	34 pathutil,
48804 d4486810a179 merge: remove direct rustmod reference Rapha?l Gom?s <rgomes@octobus.net> parents: 48760 diff changeset	35 policy,
30528 20a42325fdef py3: use pycompat.getcwd() instead of os.getcwd() Pulkit Goyal <7895pulkit@gmail.com> parents: 30495 diff changeset	36 pycompat,
27656 57c0d4888ca8 batchget: add support for backing up files Siddharth Agarwal <sid0@fb.com> parents: 27655 diff changeset	37 scmutil,
36047 55e8efa2451a subrepo: split non-core functions to new module Yuya Nishihara <yuya@tcha.org> parents: 35726 diff changeset	38 subrepoutil,
25959 892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	39 util,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	40 worker,
892d601f0d44 merge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25844 diff changeset	41 )
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: 42974 diff changeset	46
27740 da5634e1b8a3 merge: factor out code to get checkunknown config Siddharth Agarwal <sid0@fb.com> parents: 27657 diff changeset	47 def _getcheckunknownconfig(repo, section, name):
34522 bed1d2eaa108 configitems: register 'merge.checkunknown' and 'merge.checkignored' Boris Feld <boris.feld@octobus.net> parents: 34486 diff changeset	48 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	49 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	50 if config not in valid:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	51 validstr = b', '.join([b"'" + v + b"'" for v in valid])
48712 937998e43e93 merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48612 diff changeset	52 msg = _(b"%s.%s not valid ('%s' is none of %s)")
937998e43e93 merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48612 diff changeset	53 msg %= (section, name, config, validstr)
937998e43e93 merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48612 diff changeset	54 raise error.ConfigError(msg)
27740 da5634e1b8a3 merge: factor out code to get checkunknown config Siddharth Agarwal <sid0@fb.com> parents: 27657 diff changeset	55 return config
da5634e1b8a3 merge: factor out code to get checkunknown config Siddharth Agarwal <sid0@fb.com> parents: 27657 diff changeset	56
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	57
49983 7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	58 def _checkunknownfile(dirstate, wvfs, dircache, wctx, mctx, f, f2=None):
35297 5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35293 diff changeset	59 if wctx.isinmemory():
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35293 diff changeset	60 # 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: 35293 diff changeset	61 # unknown file.
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35293 diff changeset	62 #
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35293 diff changeset	63 # 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: 35293 diff changeset	64 # because that function does other useful work.
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35293 diff changeset	65 return False
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35293 diff changeset	66
23653 0297d8469350 merge: don't overwrite untracked file at directory rename target Martin von Zweigbergk <martinvonz@google.com> parents: 23652 diff changeset	67 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	68 f2 = f
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	69 return (
49983 7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	70 wvfs.isfileorlink_checkdir(dircache, f)
7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	71 and dirstate.normalize(f) not in dirstate
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	72 and mctx[f2].cmp(wctx[f])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	73 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	74
16093 7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	75
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 49018 diff changeset	76 class _unknowndirschecker:
34550 53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	77 """
53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	78 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	79 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	80 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	81 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	82
53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	83 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	84 no conflict.
53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	85 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	86
34997 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	87 def __init__(self):
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	88 # 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	89 # 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	90 # to be safe.
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	91 self._unknowndircache = set()
34550 53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	92
34997 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	93 # 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	94 # 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	95 # 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	96 self._missingdircache = set()
34550 53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	97
35297 5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35293 diff changeset	98 def __call__(self, repo, wctx, f):
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35293 diff changeset	99 if wctx.isinmemory():
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35293 diff changeset	100 # 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: 35293 diff changeset	101 return False
5db3c748ce8f merge: don't check for unknown files in IMM Phil Cohen <phillco@fb.com> parents: 35293 diff changeset	102
34997 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	103 # Check for path prefixes that exist as unknown files.
43677 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43421 diff changeset	104 for p in reversed(list(pathutil.finddirs(f))):
34997 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	105 if p in self._missingdircache:
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	106 return
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	107 if p in self._unknowndircache:
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	108 continue
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	109 if repo.wvfs.audit.check(p):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	110 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	111 repo.wvfs.isfileorlink(p)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	112 and repo.dirstate.normalize(p) not in repo.dirstate
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	113 ):
34997 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	114 return p
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	115 if not repo.wvfs.lexists(p):
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	116 self._missingdircache.add(p)
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	117 return
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	118 self._unknowndircache.add(p)
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	119
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	120 # 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	121 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	122 # 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	123 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	124 for fn in files:
37089 658b1d28813c merge: pconvert paths in _unknowndirschecker before dirstate-normalizing Matt Harbison <matt_harbison@yahoo.com> parents: 36566 diff changeset	125 relf = util.pconvert(repo.wvfs.reljoin(p, fn))
37090 e4640ec346ac merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker Matt Harbison <matt_harbison@yahoo.com> parents: 37089 diff changeset	126 relf = repo.dirstate.normalize(relf, isknown=True)
34997 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	127 if relf not in repo.dirstate:
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	128 return f
b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	129 return None
34550 53e4bcab346b merge: add _checkunknowndirs function for detecting path conflicts Mark Thomas <mbthomas@fb.com> parents: 34549 diff changeset	130
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	131
45308 4ad6c4e9e35f merge: pass mergeresult instead of actions in _checkunknownfiles() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45307 diff changeset	132 def _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce):
23655 79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	133 """
79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	134 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	135 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	136 choose a different action.
79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	137 """
34551 1609a5afc4f5 merge: rename conflicts to fileconflicts in _checkunknownfiles Mark Thomas <mbthomas@fb.com> parents: 34550 diff changeset	138 fileconflicts = set()
34552 33c8a6837181 merge: check for path conflicts when updating (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34551 diff changeset	139 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	140 warnconflicts = set()
3feadb0b6c34 merge: move abort/warn checks up to the top level of _checkunknownfiles Siddharth Agarwal <sid0@fb.com> parents: 28011 diff changeset	141 abortconflicts = set()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	142 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	143 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	144 pathconfig = repo.ui.configbool(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	145 b'experimental', b'merge.checkpathconflicts'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	146 )
49982 b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	147 dircache = dict()
49983 7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	148 dirstate = repo.dirstate
7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	149 wvfs = repo.wvfs
23655 79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	150 if not force:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	151
27741 3951f132958f merge: determine what untracked conflicts cause warns and aborts separately Siddharth Agarwal <sid0@fb.com> parents: 27740 diff changeset	152 def collectconflicts(conflicts, config):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	153 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	154 abortconflicts.update(conflicts)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	155 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	156 warnconflicts.update(conflicts)
3951f132958f merge: determine what untracked conflicts cause warns and aborts separately Siddharth Agarwal <sid0@fb.com> parents: 27740 diff changeset	157
34997 b85962350bb3 merge: cache unknown dir checks (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34941 diff changeset	158 checkunknowndirs = _unknowndirschecker()
49982 b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	159 for f in mresult.files(
b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	160 (
b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	161 mergestatemod.ACTION_CREATED,
b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	162 mergestatemod.ACTION_DELETED_CHANGED,
b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	163 )
b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	164 ):
49983 7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	165 if _checkunknownfile(dirstate, wvfs, dircache, wctx, mctx, f):
49982 b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	166 fileconflicts.add(f)
b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	167 elif pathconfig and f not in wctx:
b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	168 path = checkunknowndirs(repo, wctx, f)
b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	169 if path is not None:
b7cf91ef03ba merge: skip syntactic path checks in [_checkunknownfile] Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49968 diff changeset	170 pathconflicts.add(path)
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	171 for f, args, msg in mresult.getactions(
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	172 [mergestatemod.ACTION_LOCAL_DIR_RENAME_GET]
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	173 ):
49983 7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	174 if _checkunknownfile(
7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	175 dirstate, wvfs, dircache, wctx, mctx, f, args[0]
7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	176 ):
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	177 fileconflicts.add(f)
23655 79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	178
34552 33c8a6837181 merge: check for path conflicts when updating (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34551 diff changeset	179 allconflicts = fileconflicts \| pathconflicts
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	180 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	181 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	182 collectconflicts(ignoredconflicts, ignoredconfig)
6b639caa1652 merge: split up checks for unknown and ignored files that differ Siddharth Agarwal <sid0@fb.com> parents: 27741 diff changeset	183 collectconflicts(unknownconflicts, unknownconfig)
28022 e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	184 else:
45361 cdc50e1929b0 mergeresult: yield from getactions() instead of buidling a list and returning Pulkit Goyal <7895pulkit@gmail.com> parents: 45359 diff changeset	185 for f, args, msg in list(
cdc50e1929b0 mergeresult: yield from getactions() instead of buidling a list and returning Pulkit Goyal <7895pulkit@gmail.com> parents: 45359 diff changeset	186 mresult.getactions([mergestatemod.ACTION_CREATED_MERGE])
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	187 ):
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	188 fl2, anc = args
49983 7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	189 different = _checkunknownfile(
7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	190 dirstate, wvfs, dircache, wctx, mctx, f
7b474609f199 merge: avoid dereferencing repo fields repeatedly Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49982 diff changeset	191 )
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	192 if repo.dirstate._ignore(f):
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	193 config = ignoredconfig
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	194 else:
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	195 config = unknownconfig
28022 e397b58c0563 rebase: respect checkunknown and checkignored in more cases Siddharth Agarwal <sid0@fb.com> parents: 28020 diff changeset	196
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	197 # The behavior when force is True is described by this table:
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	198 # config different mergeforce \| action backup
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	199 # * n * \| get n
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	200 # * y y \| merge -
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	201 # abort y n \| merge - (1)
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	202 # warn y n \| warn + get y
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	203 # ignore y n \| get y
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	204 #
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	205 # (1) this is probably the wrong behavior here -- we should
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	206 # probably abort, but some actions like rebases currently
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	207 # don't like an abort happening in the middle of
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	208 # merge.update.
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	209 if not different:
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	210 mresult.addfile(
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	211 f,
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	212 mergestatemod.ACTION_GET,
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	213 (fl2, False),
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	214 b'remote created',
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	215 )
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	216 elif mergeforce or config == b'abort':
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	217 mresult.addfile(
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	218 f,
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	219 mergestatemod.ACTION_MERGE,
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	220 (f, f, None, False, anc),
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	221 b'remote differs from untracked local',
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	222 )
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	223 elif config == b'abort':
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	224 abortconflicts.add(f)
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	225 else:
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	226 if config == b'warn':
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	227 warnconflicts.add(f)
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	228 mresult.addfile(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	229 f,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	230 mergestatemod.ACTION_GET,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	231 (fl2, True),
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	232 b'remote created',
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	233 )
27741 3951f132958f merge: determine what untracked conflicts cause warns and aborts separately Siddharth Agarwal <sid0@fb.com> parents: 27740 diff changeset	234
28018 3feadb0b6c34 merge: move abort/warn checks up to the top level of _checkunknownfiles Siddharth Agarwal <sid0@fb.com> parents: 28011 diff changeset	235 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	236 warn = repo.ui.warn
0217d66846f7 merge: improve error messages for path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34552 diff changeset	237 if f in pathconflicts:
0217d66846f7 merge: improve error messages for path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34552 diff changeset	238 if repo.wvfs.isfileorlink(f):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	239 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	240 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	241 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	242 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	243 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	244 if abortconflicts:
46486 dc00324e80f4 errors: use StateError more in merge module Martin von Zweigbergk <martinvonz@google.com> parents: 46439 diff changeset	245 raise error.StateError(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	246 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	247 b"untracked files in working directory "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	248 b"differ from files in requested revision"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	249 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	250 )
28018 3feadb0b6c34 merge: move abort/warn checks up to the top level of _checkunknownfiles Siddharth Agarwal <sid0@fb.com> parents: 28011 diff changeset	251
3feadb0b6c34 merge: move abort/warn checks up to the top level of _checkunknownfiles Siddharth Agarwal <sid0@fb.com> parents: 28011 diff changeset	252 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	253 if repo.wvfs.isfileorlink(f):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	254 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	255 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	256 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	257
49984 c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	258 def transformargs(f, args):
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	259 backup = (
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	260 f in fileconflicts
49965 3aa8e569478a merge: don't pay for pathconflicts if there are none Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49962 diff changeset	261 or pathconflicts
3aa8e569478a merge: don't pay for pathconflicts if there are none Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49962 diff changeset	262 and (
3aa8e569478a merge: don't pay for pathconflicts if there are none Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49962 diff changeset	263 f in pathconflicts
3aa8e569478a merge: don't pay for pathconflicts if there are none Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49962 diff changeset	264 or any(p in pathconflicts for p in pathutil.finddirs(f))
3aa8e569478a merge: don't pay for pathconflicts if there are none Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49962 diff changeset	265 )
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	266 )
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	267 (flags,) = args
49984 c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	268 return (flags, backup)
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	269
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	270 mresult.mapaction(
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	271 mergestatemod.ACTION_CREATED, mergestatemod.ACTION_GET, transformargs
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	272 )
23655 79235b46062c merge: extract method for checking for conflicting untracked file Martin von Zweigbergk <martinvonz@google.com> parents: 23654 diff changeset	273
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	274
45368 1aef38d973e8 merge: pass mergeresult obj in _forgetremoved() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45367 diff changeset	275 def _forgetremoved(wctx, mctx, branchmerge, mresult):
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	276 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	277 Forget removed files
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	278
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	279 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	280 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	281 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	282 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	283 manifest.
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	284
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	285 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	286 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	287 as removed.
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	288 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	289
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	290 m = mergestatemod.ACTION_FORGET
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	291 if branchmerge:
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	292 m = mergestatemod.ACTION_REMOVE
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	293 for f in wctx.deleted():
6272 dd9bd227ae9a merge: simplify some helpers Matt Mackall <mpm@selenic.com> parents: 6271 diff changeset	294 if f not in mctx:
45368 1aef38d973e8 merge: pass mergeresult obj in _forgetremoved() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45367 diff changeset	295 mresult.addfile(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	296
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	297 if not branchmerge:
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	298 for f in wctx.removed():
6272 dd9bd227ae9a merge: simplify some helpers Matt Mackall <mpm@selenic.com> parents: 6271 diff changeset	299 if f not in mctx:
45368 1aef38d973e8 merge: pass mergeresult obj in _forgetremoved() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45367 diff changeset	300 mresult.addfile(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	301 f,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	302 mergestatemod.ACTION_FORGET,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	303 None,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	304 b"forget removed",
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	305 )
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	306
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	307
45354 f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	308 def _checkcollision(repo, wmf, mresult):
38078 18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38077 diff changeset	309 """
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38077 diff changeset	310 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: 38077 diff changeset	311 """
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38077 diff changeset	312 # 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: 38077 diff changeset	313 narrowmatch = repo.narrowmatch()
18e6ea9ba81d narrow: filter set of files to check for case-folding to core Martin von Zweigbergk <martinvonz@google.com> parents: 38077 diff changeset	314 if not narrowmatch.always():
44333 e76d98546bd2 merge: use manifestdict.walk() instead of manifestdict.matches() Augie Fackler <augie@google.com> parents: 44318 diff changeset	315 pmmf = set(wmf.walk(narrowmatch))
45354 f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	316 if mresult:
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	317 for f in list(mresult.files()):
45354 f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	318 if not narrowmatch(f):
f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	319 mresult.removefile(f)
44333 e76d98546bd2 merge: use manifestdict.walk() instead of manifestdict.matches() Augie Fackler <augie@google.com> parents: 44318 diff changeset	320 else:
e76d98546bd2 merge: use manifestdict.walk() instead of manifestdict.matches() Augie Fackler <augie@google.com> parents: 44318 diff changeset	321 # build provisional merged manifest up
e76d98546bd2 merge: use manifestdict.walk() instead of manifestdict.matches() Augie Fackler <augie@google.com> parents: 44318 diff changeset	322 pmmf = set(wmf)
19105 c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	323
45354 f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	324 if mresult:
37115 43ffd9070da1 merge: use constants for actions Gregory Szorc <gregory.szorc@gmail.com> parents: 37114 diff changeset	325 # KEEP and EXEC are no-op
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	326 for f in mresult.files(
45354 f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	327 (
f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	328 mergestatemod.ACTION_ADD,
f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	329 mergestatemod.ACTION_ADD_MODIFIED,
f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	330 mergestatemod.ACTION_FORGET,
f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	331 mergestatemod.ACTION_GET,
f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	332 mergestatemod.ACTION_CHANGED_DELETED,
f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	333 mergestatemod.ACTION_DELETED_CHANGED,
f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	334 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	335 ):
45354 f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	336 pmmf.add(f)
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	337 for f in mresult.files((mergestatemod.ACTION_REMOVE,)):
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	338 pmmf.discard(f)
45354 f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	339 for f, args, msg in mresult.getactions(
f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	340 [mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL]
f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	341 ):
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	342 f2, flags = args
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	343 pmmf.discard(f2)
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	344 pmmf.add(f)
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	345 for f in mresult.files((mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,)):
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	346 pmmf.add(f)
45354 f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	347 for f, args, msg in mresult.getactions([mergestatemod.ACTION_MERGE]):
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	348 f1, f2, fa, move, anc = args
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	349 if move:
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	350 pmmf.discard(f1)
43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	351 pmmf.add(f)
19105 c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	352
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	353 # 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	354 foldmap = {}
33829 055fee3547df merge: removed sorting in casefolding detection, for a slight performance win Alex Gaynor <agaynor@mozilla.com> parents: 33499 diff changeset	355 for f in pmmf:
19105 c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	356 fold = util.normcase(f)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	357 if fold in foldmap:
48713 10407e8e3807 merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48712 diff changeset	358 msg = _(b"case-folding collision between %s and %s")
10407e8e3807 merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48712 diff changeset	359 msg %= (f, foldmap[fold])
10407e8e3807 merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48712 diff changeset	360 raise error.StateError(msg)
19105 c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	361 foldmap[fold] = f
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	362
26661 2b955fec91e0 merge: abort on file/directory case folding collisions (issue4892) Mads Kiilerich <madski@unity3d.com> parents: 26651 diff changeset	363 # check case-folding of directories
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	364 foldprefix = unfoldprefix = lastfull = b''
26661 2b955fec91e0 merge: abort on file/directory case folding collisions (issue4892) Mads Kiilerich <madski@unity3d.com> parents: 26651 diff changeset	365 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	366 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	367 # the folded prefix matches but actual casing is different
48714 d8577d00c023 merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48713 diff changeset	368 msg = _(b"case-folding collision between %s and directory of %s")
d8577d00c023 merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48713 diff changeset	369 msg %= (lastfull, f)
d8577d00c023 merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48713 diff changeset	370 raise error.StateError(msg)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	371 foldprefix = fold + b'/'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	372 unfoldprefix = f + b'/'
26661 2b955fec91e0 merge: abort on file/directory case folding collisions (issue4892) Mads Kiilerich <madski@unity3d.com> parents: 26651 diff changeset	373 lastfull = f
2b955fec91e0 merge: abort on file/directory case folding collisions (issue4892) Mads Kiilerich <madski@unity3d.com> parents: 26651 diff changeset	374
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	375
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	376 def _filesindirs(repo, manifest, dirs):
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	377 """
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	378 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	379 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	380 in.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	381 """
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	382 for f in manifest:
43677 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43421 diff changeset	383 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	384 if p in dirs:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	385 yield f, p
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	386 break
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	387
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	388
45305 31c454a5f1a8 merge: pass mergeresult in checkpassconflicts() instead of actions (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45304 diff changeset	389 def checkpathconflicts(repo, wctx, mctx, mresult):
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	390 """
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	391 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	392 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	393 """
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	394 mf = wctx.manifest()
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	395
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	396 # 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	397 localconflicts = set()
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	398
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	399 # 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	400 # 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	401 remoteconflicts = set()
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	402
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	403 # 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	404 # 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	405 # can't be updated to cleanly.
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	406 invalidconflicts = set()
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	407
34998 a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	408 # 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: 34997 diff changeset	409 createdfiledirs = set()
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	410
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	411 # 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	412 deletedfiles = set()
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	413
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	414 for f in mresult.files(
45363 150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	415 (
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	416 mergestatemod.ACTION_CREATED,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	417 mergestatemod.ACTION_DELETED_CHANGED,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	418 mergestatemod.ACTION_MERGE,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	419 mergestatemod.ACTION_CREATED_MERGE,
45363 150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	420 )
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	421 ):
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	422 # This action may create a new local file.
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	423 createdfiledirs.update(pathutil.finddirs(f))
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	424 if mf.hasdir(f):
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	425 # The file aliases a local directory. This might be ok if all
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	426 # the files in the local directory are being deleted. This
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	427 # will be checked once we know what all the deleted files are.
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	428 remoteconflicts.add(f)
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	429 # Track the names of all deleted files.
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	430 for f in mresult.files((mergestatemod.ACTION_REMOVE,)):
45363 150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	431 deletedfiles.add(f)
51762 ca7bde5dbafb black: format the codebase with 23.3.0 Rapha?l Gom?s <rgomes@octobus.net> parents: 51759 diff changeset	432 for f, args, msg in mresult.getactions((mergestatemod.ACTION_MERGE,)):
45363 150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	433 f1, f2, fa, move, anc = args
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	434 if move:
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	435 deletedfiles.add(f1)
51762 ca7bde5dbafb black: format the codebase with 23.3.0 Rapha?l Gom?s <rgomes@octobus.net> parents: 51759 diff changeset	436 for f, args, msg in mresult.getactions(
45363 150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	437 (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,)
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	438 ):
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	439 f2, flags = args
150900a17ec2 merge: rework iteration over mergeresult object in checkpathconflicts() Pulkit Goyal <7895pulkit@gmail.com> parents: 45362 diff changeset	440 deletedfiles.add(f2)
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	441
34998 a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	442 # 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: 34997 diff changeset	443 for p in createdfiledirs:
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	444 if p in mf:
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	445 if p in mctx:
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	446 # 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: 34997 diff changeset	447 # 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: 34997 diff changeset	448 # within the remote manifest.
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	449 invalidconflicts.add(p)
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	450 else:
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	451 # 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: 34997 diff changeset	452 # 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: 34997 diff changeset	453 localconflicts.add(p)
45365 4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	454 pd = mresult.getfile(p)
4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	455 if pd and pd[0] in (
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	456 mergestatemod.ACTION_CREATED,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	457 mergestatemod.ACTION_DELETED_CHANGED,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	458 mergestatemod.ACTION_MERGE,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	459 mergestatemod.ACTION_CREATED_MERGE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	460 ):
34998 a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	461 # 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: 34997 diff changeset	462 # 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: 34997 diff changeset	463 # manifest.
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	464 invalidconflicts.add(p)
a92b9f8e11ba merge: check created file dirs for path conflicts only once (issue5716) Mark Thomas <mbthomas@fb.com> parents: 34997 diff changeset	465
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	466 # 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	467 for p in localconflicts:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	468 if p not in deletedfiles:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	469 ctxname = bytes(wctx).rstrip(b'+')
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	470 pnew = util.safename(p, ctxname, wctx, set(mresult.files()))
44980 818b4f19ef23 merge: move an inspection of the dirstate from record to calculate phase Martin von Zweigbergk <martinvonz@google.com> parents: 44915 diff changeset	471 porig = wctx[p].copysource() or p
45305 31c454a5f1a8 merge: pass mergeresult in checkpassconflicts() instead of actions (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45304 diff changeset	472 mresult.addfile(
31c454a5f1a8 merge: pass mergeresult in checkpassconflicts() instead of actions (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45304 diff changeset	473 pnew,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	474 mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
44980 818b4f19ef23 merge: move an inspection of the dirstate from record to calculate phase Martin von Zweigbergk <martinvonz@google.com> parents: 44915 diff changeset	475 (p, porig),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	476 b'local path conflict',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	477 )
45305 31c454a5f1a8 merge: pass mergeresult in checkpassconflicts() instead of actions (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45304 diff changeset	478 mresult.addfile(
31c454a5f1a8 merge: pass mergeresult in checkpassconflicts() instead of actions (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45304 diff changeset	479 p,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	480 mergestatemod.ACTION_PATH_CONFLICT,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	481 (pnew, b'l'),
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	482 b'path conflict',
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	483 )
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	484
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	485 if remoteconflicts:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	486 # 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	487 ctxname = bytes(mctx).rstrip(b'+')
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	488 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	489 if f not in deletedfiles:
45365 4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	490 m, args, msg = mresult.getfile(p)
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	491 pnew = util.safename(p, ctxname, wctx, set(mresult.files()))
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	492 if m in (
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	493 mergestatemod.ACTION_DELETED_CHANGED,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	494 mergestatemod.ACTION_MERGE,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	495 ):
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	496 # Action was merge, just update target.
45305 31c454a5f1a8 merge: pass mergeresult in checkpassconflicts() instead of actions (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45304 diff changeset	497 mresult.addfile(pnew, m, args, msg)
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	498 else:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	499 # 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	500 fl = args[0]
45305 31c454a5f1a8 merge: pass mergeresult in checkpassconflicts() instead of actions (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45304 diff changeset	501 mresult.addfile(
31c454a5f1a8 merge: pass mergeresult in checkpassconflicts() instead of actions (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45304 diff changeset	502 pnew,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	503 mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	504 (p, fl),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	505 b'remote path conflict',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	506 )
45305 31c454a5f1a8 merge: pass mergeresult in checkpassconflicts() instead of actions (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45304 diff changeset	507 mresult.addfile(
31c454a5f1a8 merge: pass mergeresult in checkpassconflicts() instead of actions (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45304 diff changeset	508 p,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	509 mergestatemod.ACTION_PATH_CONFLICT,
48722 25d5dffbb211 merge: stop using merge action for pathconflict option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48721 diff changeset	510 (pnew, b'r'),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	511 b'path conflict',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	512 )
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	513 remoteconflicts.remove(p)
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	514 break
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	515
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	516 if invalidconflicts:
989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	517 for p in invalidconflicts:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	518 repo.ui.warn(_(b"%s: is both a file and a directory\n") % p)
46486 dc00324e80f4 errors: use StateError more in merge module Martin von Zweigbergk <martinvonz@google.com> parents: 46439 diff changeset	519 raise error.StateError(
dc00324e80f4 errors: use StateError more in merge module Martin von Zweigbergk <martinvonz@google.com> parents: 46439 diff changeset	520 _(b"destination manifest contains path conflicts")
dc00324e80f4 errors: use StateError more in merge module Martin von Zweigbergk <martinvonz@google.com> parents: 46439 diff changeset	521 )
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	522
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	523
45306 e7196f1da2b1 merge: pass mergeresult obj instead of actions in _filternarrowactions() Pulkit Goyal <7895pulkit@gmail.com> parents: 45305 diff changeset	524 def _filternarrowactions(narrowmatch, branchmerge, mresult):
38077 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	525 """
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	526 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: 38003 diff changeset	527
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	528 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: 38003 diff changeset	529 narrowed.
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	530 """
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	531 # 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: 38003 diff changeset	532 # over a copy.
51681 23116aefe786 merge: sort filemap only if requested by the caller Manuel Jacob <me@manueljacob.de> parents: 50260 diff changeset	533 for f, action in list(mresult.filemap()):
38077 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	534 if narrowmatch(f):
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	535 pass
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	536 elif not branchmerge:
45306 e7196f1da2b1 merge: pass mergeresult obj instead of actions in _filternarrowactions() Pulkit Goyal <7895pulkit@gmail.com> parents: 45305 diff changeset	537 mresult.removefile(f) # just updating, ignore changes outside clone
48727 5dfaca4464d1 merge-actions: add an explicite "no_op" attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48725 diff changeset	538 elif action[0].no_op:
45306 e7196f1da2b1 merge: pass mergeresult obj instead of actions in _filternarrowactions() Pulkit Goyal <7895pulkit@gmail.com> parents: 45305 diff changeset	539 mresult.removefile(f) # merge does not affect file
48730 f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	540 elif action[0].narrow_safe:
48751 18e69f224e4b narrow: add support for merging add and remove outside of the tracked set Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48730 diff changeset	541 if not f.endswith(b'/'):
48730 f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	542 mresult.removefile(f) # merge won't affect on-disk files
f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	543
f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	544 mresult.addcommitinfo(
f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	545 f, b'outside-narrow-merge-action', action[0].changes
f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	546 )
f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	547 else: # TODO: handle the tree case
f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	548 msg = _(
f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	549 b'merge affects file \'%s\' outside narrow, '
f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	550 b'which is not yet supported'
f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	551 )
f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	552 hint = _(b'merging in the other direction may work')
f1eb77dceb36 narrow: allow merging non-conflicting change outside of the narrow spec Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48728 diff changeset	553 raise error.Abort(msg % f, hint=hint)
38077 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	554 else:
48716 ec23b0ba85c2 merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48715 diff changeset	555 msg = _(b'conflict in file \'%s\' is outside narrow clone')
ec23b0ba85c2 merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48715 diff changeset	556 raise error.StateError(msg % f)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	557
38077 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	558
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 49018 diff changeset	559 class mergeresult:
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	560 """An object representing result of merging manifests.
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	561
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	562 It has information about what actions need to be performed on dirstate
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	563 mapping of divergent renames and other such cases."""
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	564
45302 fe2040abb183 merge: make mergeresult constructor initialize empty object Pulkit Goyal <7895pulkit@gmail.com> parents: 45301 diff changeset	565 def __init__(self):
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	566 """
45312 26fa2eebc291 mergeresult: rename _actions to _filemapping Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	567 filemapping: dict of filename as keys and action related info as values
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	568 diverge: mapping of source name -> list of dest name for
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	569 divergent renames
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	570 renamedelete: mapping of source name -> list of destinations for files
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	571 deleted on one side and renamed on other.
45296 8e8d513941b4 merge: introduce 'commitinfo' in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45295 diff changeset	572 commitinfo: dict containing data which should be used on commit
8e8d513941b4 merge: introduce 'commitinfo' in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45295 diff changeset	573 contains a filename -> info mapping
45320 e98f7c5babd7 mergeresult: make actionmapping a dict of dict instead of dict of lists Pulkit Goyal <7895pulkit@gmail.com> parents: 45317 diff changeset	574 actionmapping: dict of action names as keys and values are dict of
e98f7c5babd7 mergeresult: make actionmapping a dict of dict instead of dict of lists Pulkit Goyal <7895pulkit@gmail.com> parents: 45317 diff changeset	575 filename as key and related data as values
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	576 """
45312 26fa2eebc291 mergeresult: rename _actions to _filemapping Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	577 self._filemapping = {}
45302 fe2040abb183 merge: make mergeresult constructor initialize empty object Pulkit Goyal <7895pulkit@gmail.com> parents: 45301 diff changeset	578 self._diverge = {}
fe2040abb183 merge: make mergeresult constructor initialize empty object Pulkit Goyal <7895pulkit@gmail.com> parents: 45301 diff changeset	579 self._renamedelete = {}
45403 f970cca30989 merge: use collections.defaultdict() for mergeresult.commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45370 diff changeset	580 self._commitinfo = collections.defaultdict(dict)
45320 e98f7c5babd7 mergeresult: make actionmapping a dict of dict instead of dict of lists Pulkit Goyal <7895pulkit@gmail.com> parents: 45317 diff changeset	581 self._actionmapping = collections.defaultdict(dict)
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	582
45404 72e503a24715 merge: introduce `addcommitinfo()` on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45403 diff changeset	583 def updatevalues(self, diverge, renamedelete):
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	584 self._diverge = diverge
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	585 self._renamedelete = renamedelete
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	586
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	587 def addfile(self, filename, action, data, message):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	588 """adds a new file to the mergeresult object
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	589
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	590 filename: file which we are adding
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	591 action: one of mergestatemod.ACTION_*
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	592 data: a tuple of information like fctx and ctx related to this merge
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	593 message: a message about the merge
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	594 """
45313 69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	595 # if the file already existed, we need to delete it's old
69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	596 # entry form _actionmapping too
69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	597 if filename in self._filemapping:
69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	598 a, d, m = self._filemapping[filename]
45320 e98f7c5babd7 mergeresult: make actionmapping a dict of dict instead of dict of lists Pulkit Goyal <7895pulkit@gmail.com> parents: 45317 diff changeset	599 del self._actionmapping[a][filename]
45313 69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	600
45312 26fa2eebc291 mergeresult: rename _actions to _filemapping Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	601 self._filemapping[filename] = (action, data, message)
45320 e98f7c5babd7 mergeresult: make actionmapping a dict of dict instead of dict of lists Pulkit Goyal <7895pulkit@gmail.com> parents: 45317 diff changeset	602 self._actionmapping[action][filename] = (data, message)
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	603
49984 c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	604 def mapaction(self, actionfrom, actionto, transform):
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	605 """changes all occurrences of action `actionfrom` into `actionto`,
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	606 transforming its args with the function `transform`.
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	607 """
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	608 orig = self._actionmapping[actionfrom]
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	609 del self._actionmapping[actionfrom]
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	610 dest = self._actionmapping[actionto]
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	611 for f, (data, msg) in orig.items():
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	612 data = transform(f, data)
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	613 self._filemapping[f] = (actionto, data, msg)
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	614 dest[f] = (data, msg)
c7a04bfabd4d merge: add mergeresult.mapaction to improve speed Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49983 diff changeset	615
45365 4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	616 def getfile(self, filename, default_return=None):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	617 """returns (action, args, msg) about this file
45365 4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	618
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	619 returns default_return if the file is not present"""
45365 4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	620 if filename in self._filemapping:
4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	621 return self._filemapping[filename]
4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	622 return default_return
4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	623
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	624 def files(self, actions=None):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	625 """returns files on which provided action needs to perfromed
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	626
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	627 If actions is None, all files are returned
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	628 """
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	629 # TODO: think whether we should return renamedelete and
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	630 # diverge filenames also
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	631 if actions is None:
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	632 for f in self._filemapping:
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	633 yield f
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	634
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	635 else:
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	636 for a in actions:
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	637 for f in self._actionmapping[a]:
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	638 yield f
e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	639
45304 f1fb9a079131 merge: add removefile() to mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45303 diff changeset	640 def removefile(self, filename):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	641 """removes a file from the mergeresult object as the file might
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	642 not merging anymore"""
45313 69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	643 action, data, message = self._filemapping[filename]
45312 26fa2eebc291 mergeresult: rename _actions to _filemapping Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	644 del self._filemapping[filename]
45320 e98f7c5babd7 mergeresult: make actionmapping a dict of dict instead of dict of lists Pulkit Goyal <7895pulkit@gmail.com> parents: 45317 diff changeset	645 del self._actionmapping[action][filename]
45313 69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	646
45357 27c6518b7287 mergeresult: add sort argument to getactions() method Pulkit Goyal <7895pulkit@gmail.com> parents: 45356 diff changeset	647 def getactions(self, actions, sort=False):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	648 """get list of files which are marked with these actions
45357 27c6518b7287 mergeresult: add sort argument to getactions() method Pulkit Goyal <7895pulkit@gmail.com> parents: 45356 diff changeset	649 if sort is true, files for each action is sorted and then added
45313 69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	650
69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	651 Returns a list of tuple of form (filename, data, message)
69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	652 """
69691c5b8ce4 mergeresult: introduce action -> (filename, data, msg) mapping and related API Pulkit Goyal <7895pulkit@gmail.com> parents: 45312 diff changeset	653 for a in actions:
45357 27c6518b7287 mergeresult: add sort argument to getactions() method Pulkit Goyal <7895pulkit@gmail.com> parents: 45356 diff changeset	654 if sort:
27c6518b7287 mergeresult: add sort argument to getactions() method Pulkit Goyal <7895pulkit@gmail.com> parents: 45356 diff changeset	655 for f in sorted(self._actionmapping[a]):
27c6518b7287 mergeresult: add sort argument to getactions() method Pulkit Goyal <7895pulkit@gmail.com> parents: 45356 diff changeset	656 args, msg = self._actionmapping[a][f]
45361 cdc50e1929b0 mergeresult: yield from getactions() instead of buidling a list and returning Pulkit Goyal <7895pulkit@gmail.com> parents: 45359 diff changeset	657 yield f, args, msg
45357 27c6518b7287 mergeresult: add sort argument to getactions() method Pulkit Goyal <7895pulkit@gmail.com> parents: 45356 diff changeset	658 else:
49018 c17aee610bab merge: remove pycompat.iteritems() Gregory Szorc <gregory.szorc@gmail.com> parents: 49004 diff changeset	659 for f, (args, msg) in self._actionmapping[a].items():
45361 cdc50e1929b0 mergeresult: yield from getactions() instead of buidling a list and returning Pulkit Goyal <7895pulkit@gmail.com> parents: 45359 diff changeset	660 yield f, args, msg
45304 f1fb9a079131 merge: add removefile() to mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45303 diff changeset	661
45359 72b8c082676b mergeresult: implement a len() function and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45358 diff changeset	662 def len(self, actions=None):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	663 """returns number of files which needs actions
45359 72b8c082676b mergeresult: implement a len() function and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45358 diff changeset	664
72b8c082676b mergeresult: implement a len() function and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45358 diff changeset	665 if actions is passed, total of number of files in that action
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	666 only is returned"""
45359 72b8c082676b mergeresult: implement a len() function and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45358 diff changeset	667
72b8c082676b mergeresult: implement a len() function and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45358 diff changeset	668 if actions is None:
72b8c082676b mergeresult: implement a len() function and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45358 diff changeset	669 return len(self._filemapping)
72b8c082676b mergeresult: implement a len() function and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45358 diff changeset	670
72b8c082676b mergeresult: implement a len() function and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45358 diff changeset	671 return sum(len(self._actionmapping[a]) for a in actions)
72b8c082676b mergeresult: implement a len() function and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45358 diff changeset	672
45367 3c783ff08d40 mergeresult: introduce filemap() which yields filename based mapping Pulkit Goyal <7895pulkit@gmail.com> parents: 45366 diff changeset	673 def filemap(self, sort=False):
51681 23116aefe786 merge: sort filemap only if requested by the caller Manuel Jacob <me@manueljacob.de> parents: 50260 diff changeset	674 if sort:
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	675 for key, val in sorted(self._filemapping.items()):
45367 3c783ff08d40 mergeresult: introduce filemap() which yields filename based mapping Pulkit Goyal <7895pulkit@gmail.com> parents: 45366 diff changeset	676 yield key, val
3c783ff08d40 mergeresult: introduce filemap() which yields filename based mapping Pulkit Goyal <7895pulkit@gmail.com> parents: 45366 diff changeset	677 else:
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	678 for key, val in self._filemapping.items():
45367 3c783ff08d40 mergeresult: introduce filemap() which yields filename based mapping Pulkit Goyal <7895pulkit@gmail.com> parents: 45366 diff changeset	679 yield key, val
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	680
45404 72e503a24715 merge: introduce `addcommitinfo()` on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45403 diff changeset	681 def addcommitinfo(self, filename, key, value):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	682 """adds key-value information about filename which will be required
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	683 while committing this merge"""
45404 72e503a24715 merge: introduce `addcommitinfo()` on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45403 diff changeset	684 self._commitinfo[filename][key] = value
72e503a24715 merge: introduce `addcommitinfo()` on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45403 diff changeset	685
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	686 @property
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	687 def diverge(self):
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	688 return self._diverge
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	689
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	690 @property
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	691 def renamedelete(self):
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	692 return self._renamedelete
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	693
45296 8e8d513941b4 merge: introduce 'commitinfo' in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45295 diff changeset	694 @property
8e8d513941b4 merge: introduce 'commitinfo' in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45295 diff changeset	695 def commitinfo(self):
8e8d513941b4 merge: introduce 'commitinfo' in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45295 diff changeset	696 return self._commitinfo
8e8d513941b4 merge: introduce 'commitinfo' in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45295 diff changeset	697
45300 f4a2b329717b merge: move conversion of file-key dict to action-key dict in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45299 diff changeset	698 @property
f4a2b329717b merge: move conversion of file-key dict to action-key dict in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45299 diff changeset	699 def actionsdict(self):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	700 """returns a dictionary of actions to be perfomed with action as key
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	701 and a list of files and related arguments as values"""
45369 490607efc992 merge: remove emptyactions() and use collections.defaultdict(list) instead Pulkit Goyal <7895pulkit@gmail.com> parents: 45368 diff changeset	702 res = collections.defaultdict(list)
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	703 for a, d in self._actionmapping.items():
f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	704 for f, (args, msg) in d.items():
45320 e98f7c5babd7 mergeresult: make actionmapping a dict of dict instead of dict of lists Pulkit Goyal <7895pulkit@gmail.com> parents: 45317 diff changeset	705 res[a].append((f, args, msg))
e98f7c5babd7 mergeresult: make actionmapping a dict of dict instead of dict of lists Pulkit Goyal <7895pulkit@gmail.com> parents: 45317 diff changeset	706 return res
45300 f4a2b329717b merge: move conversion of file-key dict to action-key dict in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45299 diff changeset	707
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	708 def setactions(self, actions):
45312 26fa2eebc291 mergeresult: rename _actions to _filemapping Pulkit Goyal <7895pulkit@gmail.com> parents: 45311 diff changeset	709 self._filemapping = actions
45320 e98f7c5babd7 mergeresult: make actionmapping a dict of dict instead of dict of lists Pulkit Goyal <7895pulkit@gmail.com> parents: 45317 diff changeset	710 self._actionmapping = collections.defaultdict(dict)
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	711 for f, (act, data, msg) in self._filemapping.items():
45320 e98f7c5babd7 mergeresult: make actionmapping a dict of dict instead of dict of lists Pulkit Goyal <7895pulkit@gmail.com> parents: 45317 diff changeset	712 self._actionmapping[act][f] = data, msg
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	713
45299 0c849f0166c2 merge: introduce hasconflicts() on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45298 diff changeset	714 def hasconflicts(self):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	715 """tells whether this merge resulted in some actions which can
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	716 result in conflicts or not"""
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	717 for a in self._actionmapping.keys():
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	718 if (
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	719 a
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	720 not in (
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	721 mergestatemod.ACTION_GET,
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	722 mergestatemod.ACTION_EXEC,
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	723 mergestatemod.ACTION_REMOVE,
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	724 mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	725 )
4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	726 and self._actionmapping[a]
48727 5dfaca4464d1 merge-actions: add an explicite "no_op" attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48725 diff changeset	727 and not a.no_op
45299 0c849f0166c2 merge: introduce hasconflicts() on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45298 diff changeset	728 ):
0c849f0166c2 merge: introduce hasconflicts() on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45298 diff changeset	729 return True
0c849f0166c2 merge: introduce hasconflicts() on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45298 diff changeset	730
0c849f0166c2 merge: introduce hasconflicts() on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45298 diff changeset	731 return False
0c849f0166c2 merge: introduce hasconflicts() on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45298 diff changeset	732
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	733
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	734 def manifestmerge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	735 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	736 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	737 p2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	738 pa,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	739 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	740 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	741 matcher,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	742 acceptremote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	743 followcopies,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	744 forcefulldiff=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	745 ):
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	746 """
30096 98d3d8108db0 merge: update doc of manifestmerge() per 18c2184c27dc Yuya Nishihara <yuya@tcha.org> parents: 30060 diff changeset	747 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	748
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18544 diff changeset	749 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	750 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	751 acceptremote = accept the incoming changes without prompting
45168 4f71d1a99e45 merge: document return values of manifestmerge() and calculateupdates() Pulkit Goyal <7895pulkit@gmail.com> parents: 45167 diff changeset	752
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	753 Returns an object of mergeresult class
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	754 """
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	755 mresult = mergeresult()
27346 ba0da4b7397d merge: rework manifestmerge to use a matcher Augie Fackler <augie@google.com> parents: 27345 diff changeset	756 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	757 matcher = None
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	758
18651 e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	759 # 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: 42974 diff changeset	760 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	761 x.manifest()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	762 for x in sorted(wctx.parents() + [p2, pa], key=scmutil.intrev)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	763 ]
18651 e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	764
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	765 branch_copies1 = copies.branch_copies()
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	766 branch_copies2 = copies.branch_copies()
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	767 diverge = {}
45296 8e8d513941b4 merge: introduce 'commitinfo' in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45295 diff changeset	768 # information from merge which is needed at commit time
8e8d513941b4 merge: introduce 'commitinfo' in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45295 diff changeset	769 # for example choosing filelog of which parent to commit
8e8d513941b4 merge: introduce 'commitinfo' in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45295 diff changeset	770 # TODO: use specific constants in future for this mapping
18651 e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	771 if followcopies:
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	772 branch_copies1, branch_copies2, diverge = copies.mergecopies(
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	773 repo, wctx, p2, pa
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	774 )
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	775
32664 49e1e5acb8ff py3: convert bool variables to bytes before passing into ui.debug() Pulkit Goyal <7895pulkit@gmail.com> parents: 32635 diff changeset	776 boolbm = pycompat.bytestr(bool(branchmerge))
49e1e5acb8ff py3: convert bool variables to bytes before passing into ui.debug() Pulkit Goyal <7895pulkit@gmail.com> parents: 32635 diff changeset	777 boolf = pycompat.bytestr(bool(force))
49e1e5acb8ff py3: convert bool variables to bytes before passing into ui.debug() Pulkit Goyal <7895pulkit@gmail.com> parents: 32635 diff changeset	778 boolm = pycompat.bytestr(bool(matcher))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	779 repo.ui.note(_(b"resolving manifests\n"))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	780 repo.ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	781 b" branchmerge: %s, force: %s, partial: %s\n" % (boolbm, boolf, boolm)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	782 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	783 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	784
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	785 m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest()
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	786 copied1 = set(branch_copies1.copy.values())
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	787 copied1.update(branch_copies1.movewithdir.values())
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	788 copied2 = set(branch_copies2.copy.values())
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	789 copied2.update(branch_copies2.movewithdir.values())
3295 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	790
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	791 if b'.hgsubstate' in m1 and wctx.rev() is None:
37878 1322ae04d3d7 merge: do not fill manifest of committed revision with pseudo node (issue5526) Yuya Nishihara <yuya@tcha.org> parents: 37762 diff changeset	792 # 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	793 # 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	794 # 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	795 if any(wctx.sub(s).dirty() for s in wctx.substate):
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	796 m1[b'.hgsubstate'] = repo.nodeconstants.modifiednodeid
9783 ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9780 diff changeset	797
32200 4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31651 diff changeset	798 # Don't use m2-vs-ma optimization if:
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31651 diff changeset	799 # - 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: 31651 diff changeset	800 # - 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: 31651 diff changeset	801 # merge.
45583 76d79b80d953 merge: disable `m2-vs-ma` optimization if new filenode config is true Pulkit Goyal <7895pulkit@gmail.com> parents: 45579 diff changeset	802 # - we are tracking salvaged files specifically hence should process all
76d79b80d953 merge: disable `m2-vs-ma` optimization if new filenode config is true Pulkit Goyal <7895pulkit@gmail.com> parents: 45579 diff changeset	803 # files
76d79b80d953 merge: disable `m2-vs-ma` optimization if new filenode config is true Pulkit Goyal <7895pulkit@gmail.com> parents: 45579 diff changeset	804 if (
76d79b80d953 merge: disable `m2-vs-ma` optimization if new filenode config is true Pulkit Goyal <7895pulkit@gmail.com> parents: 45579 diff changeset	805 pa not in ([wctx, p2] + wctx.parents())
76d79b80d953 merge: disable `m2-vs-ma` optimization if new filenode config is true Pulkit Goyal <7895pulkit@gmail.com> parents: 45579 diff changeset	806 and not forcefulldiff
45661 ebc14a2ad23d salvaged: track removal-candidates in more cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45633 diff changeset	807 and not (
ebc14a2ad23d salvaged: track removal-candidates in more cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45633 diff changeset	808 repo.ui.configbool(b'experimental', b'merge-track-salvaged')
ebc14a2ad23d salvaged: track removal-candidates in more cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45633 diff changeset	809 or repo.filecopiesmode == b'changeset-sidedata'
ebc14a2ad23d salvaged: track removal-candidates in more cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45633 diff changeset	810 )
45583 76d79b80d953 merge: disable `m2-vs-ma` optimization if new filenode config is true Pulkit Goyal <7895pulkit@gmail.com> parents: 45579 diff changeset	811 ):
32200 4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31651 diff changeset	812 # 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: 31651 diff changeset	813 # 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: 31651 diff changeset	814 # performance benefits in large repositories.
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31651 diff changeset	815 relevantfiles = set(ma.diff(m2).keys())
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31651 diff changeset	816
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31651 diff changeset	817 # For copied and moved files, we need to add the source file too.
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	818 for copykey, copyvalue in branch_copies1.copy.items():
32200 4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31651 diff changeset	819 if copyvalue in relevantfiles:
4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31651 diff changeset	820 relevantfiles.add(copykey)
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	821 for movedirkey in branch_copies1.movewithdir:
32200 4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31651 diff changeset	822 relevantfiles.add(movedirkey)
32531 bd56bea5ecf8 merge: use intersectmatchers() in "m2-vs-ma optimization" Martin von Zweigbergk <martinvonz@google.com> parents: 32390 diff changeset	823 filesmatcher = scmutil.matchfiles(repo, relevantfiles)
bd56bea5ecf8 merge: use intersectmatchers() in "m2-vs-ma optimization" Martin von Zweigbergk <martinvonz@google.com> parents: 32390 diff changeset	824 matcher = matchmod.intersectmatchers(matcher, filesmatcher)
32200 4d504e541d3d rebase: use matcher to optimize manifestmerge Durham Goode <durham@fb.com> parents: 31651 diff changeset	825
31267 11831d755b51 merge: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31185 diff changeset	826 diff = m1.diff(m2, match=matcher)
11831d755b51 merge: remove uses of manifest.matches Durham Goode <durham@fb.com> parents: 31185 diff changeset	827
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	828 for f, ((n1, fl1), (n2, fl2)) in diff.items():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	829 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	830 if f not in ma:
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	831 # 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: 44274 diff changeset	832 fa = branch_copies1.copy.get(
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	833 f, None
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	834 ) or branch_copies2.copy.get(f, None)
45317 cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	835 args, msg = None, None
23397 c7c95838be9a merge: break out "both renamed a -> b" case Martin von Zweigbergk <martinvonz@google.com> parents: 23396 diff changeset	836 if fa is not None:
45317 cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	837 args = (f, f, fa, False, pa.node())
cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	838 msg = b'both renamed from %s' % fa
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	839 else:
45317 cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	840 args = (f, f, None, False, pa.node())
cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	841 msg = b'both created'
cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	842 mresult.addfile(f, mergestatemod.ACTION_MERGE, args, msg)
45836 58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	843 elif f in branch_copies1.copy:
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	844 fa = branch_copies1.copy[f]
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	845 mresult.addfile(
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	846 f,
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	847 mergestatemod.ACTION_MERGE,
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	848 (f, fa, fa, False, pa.node()),
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	849 b'local replaced from %s' % fa,
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	850 )
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	851 elif f in branch_copies2.copy:
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	852 fa = branch_copies2.copy[f]
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	853 mresult.addfile(
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	854 f,
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	855 mergestatemod.ACTION_MERGE,
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	856 (fa, f, fa, False, pa.node()),
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	857 b'other replaced from %s' % fa,
58e7ee23ddbd copies: handle more cases where a file got replaced by a copy Martin von Zweigbergk <martinvonz@google.com> parents: 45688 diff changeset	858 )
16094 0776a6cababe merge: don't use unknown() Matt Mackall <mpm@selenic.com> parents: 16093 diff changeset	859 else:
23396 6a254a2dd37c merge: separate out "both created" cases Martin von Zweigbergk <martinvonz@google.com> parents: 23395 diff changeset	860 a = ma[f]
6a254a2dd37c merge: separate out "both created" cases Martin von Zweigbergk <martinvonz@google.com> parents: 23395 diff changeset	861 fla = ma.flags(f)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	862 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	863 if n2 == a and fl2 == fla:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	864 mresult.addfile(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	865 f,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	866 mergestatemod.ACTION_KEEP,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	867 (),
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	868 b'remote unchanged',
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	869 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	870 elif n1 == a and fl1 == fla: # local unchanged - use remote
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	871 if n1 == n2: # optimization: keep local content
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	872 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	873 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	874 mergestatemod.ACTION_EXEC,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	875 (fl2,),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	876 b'update permissions',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	877 )
23395 d9ebb475eede merge: indent to prepare for next patch Martin von Zweigbergk <martinvonz@google.com> parents: 23387 diff changeset	878 else:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	879 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	880 f,
45298 c515c54f6530 merge: remove no longer required ACTION_GET_OTHER_AND_STORE Pulkit Goyal <7895pulkit@gmail.com> parents: 45297 diff changeset	881 mergestatemod.ACTION_GET,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	882 (fl2, False),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	883 b'remote is newer',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	884 )
45296 8e8d513941b4 merge: introduce 'commitinfo' in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45295 diff changeset	885 if branchmerge:
45404 72e503a24715 merge: introduce `addcommitinfo()` on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45403 diff changeset	886 mresult.addcommitinfo(
72e503a24715 merge: introduce `addcommitinfo()` on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45403 diff changeset	887 f, b'filenode-source', b'other'
72e503a24715 merge: introduce `addcommitinfo()` on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45403 diff changeset	888 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	889 elif nol and n2 == a: # remote only changed 'x'
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	890 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	891 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	892 mergestatemod.ACTION_EXEC,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	893 (fl2,),
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	894 b'update permissions',
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	895 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	896 elif nol and n1 == a: # local only changed 'x'
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	897 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	898 f,
45298 c515c54f6530 merge: remove no longer required ACTION_GET_OTHER_AND_STORE Pulkit Goyal <7895pulkit@gmail.com> parents: 45297 diff changeset	899 mergestatemod.ACTION_GET,
44688 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	900 (fl1, False),
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	901 b'remote is newer',
1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	902 )
45296 8e8d513941b4 merge: introduce 'commitinfo' in mergeresult Pulkit Goyal <7895pulkit@gmail.com> parents: 45295 diff changeset	903 if branchmerge:
45404 72e503a24715 merge: introduce `addcommitinfo()` on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45403 diff changeset	904 mresult.addcommitinfo(f, b'filenode-source', b'other')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	905 else: # both changed something
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	906 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	907 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	908 mergestatemod.ACTION_MERGE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	909 (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	910 b'versions differ',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	911 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	912 elif n1: # file exists only on local side
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	913 if f in copied2:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	914 pass # we'll deal with it on m2 side
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	915 elif (
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	916 f in branch_copies1.movewithdir
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	917 ): # directory rename, move local
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	918 f2 = branch_copies1.movewithdir[f]
31522 527a247f114f merge: remove unnecessary matcher checks Durham Goode <durham@fb.com> parents: 31482 diff changeset	919 if f2 in m2:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	920 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	921 f2,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	922 mergestatemod.ACTION_MERGE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	923 (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	924 b'remote directory rename, both created',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	925 )
23475 67f1d68861fb merge: don't ignore conflicting file in remote renamed directory Martin von Zweigbergk <martinvonz@google.com> parents: 23474 diff changeset	926 else:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	927 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	928 f2,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	929 mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	930 (f, fl1),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	931 b'remote directory rename - move from %s' % f,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	932 )
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	933 elif f in branch_copies1.copy:
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	934 f2 = branch_copies1.copy[f]
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	935 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	936 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	937 mergestatemod.ACTION_MERGE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	938 (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	939 b'local copied/moved from %s' % f2,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	940 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	941 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	942 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	943 if acceptremote:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	944 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	945 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	946 mergestatemod.ACTION_REMOVE,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	947 None,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	948 b'remote delete',
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	949 )
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	950 else:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	951 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	952 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	953 mergestatemod.ACTION_CHANGED_DELETED,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	954 (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	955 b'prompt changed/deleted',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	956 )
45587 4c8a93ec6908 merge: store commitinfo if these is a dc or cd conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 45583 diff changeset	957 if branchmerge:
4c8a93ec6908 merge: store commitinfo if these is a dc or cd conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 45583 diff changeset	958 mresult.addcommitinfo(
4c8a93ec6908 merge: store commitinfo if these is a dc or cd conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 45583 diff changeset	959 f, b'merge-removal-candidate', b'yes'
4c8a93ec6908 merge: store commitinfo if these is a dc or cd conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 45583 diff changeset	960 )
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	961 elif n1 == repo.nodeconstants.addednodeid:
45118 d0ef8c1dddd4 manifest: tigher manifest parsing and flag use Joerg Sonnenberger <joerg@bec.de> parents: 45073 diff changeset	962 # This file was locally added. We should forget it instead of
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	963 # deleting it.
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	964 mresult.addfile(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	965 f,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	966 mergestatemod.ACTION_FORGET,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	967 None,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	968 b'remote deleted',
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	969 )
20639 1df033640a8e merge: handle acceptremove of create+delete early in manifest merge Mads Kiilerich <madski@unity3d.com> parents: 20620 diff changeset	970 else:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	971 mresult.addfile(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	972 f,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	973 mergestatemod.ACTION_REMOVE,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	974 None,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	975 b'other deleted',
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	976 )
45590 768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	977 if branchmerge:
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	978 # the file must be absent after merging,
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	979 # howeber the user might make
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	980 # the file reappear using revert and if they does,
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	981 # we force create a new node
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	982 mresult.addcommitinfo(
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	983 f, b'merge-removal-candidate', b'yes'
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	984 )
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	985
45480 49ffaa4f65f6 merge: add missing ACTION_KEEP when both remote and ancestor are not present Pulkit Goyal <7895pulkit@gmail.com> parents: 45479 diff changeset	986 else: # file not in ancestor, not in remote
49ffaa4f65f6 merge: add missing ACTION_KEEP when both remote and ancestor are not present Pulkit Goyal <7895pulkit@gmail.com> parents: 45479 diff changeset	987 mresult.addfile(
49ffaa4f65f6 merge: add missing ACTION_KEEP when both remote and ancestor are not present Pulkit Goyal <7895pulkit@gmail.com> parents: 45479 diff changeset	988 f,
45530 6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45526 diff changeset	989 mergestatemod.ACTION_KEEP_NEW,
45480 49ffaa4f65f6 merge: add missing ACTION_KEEP when both remote and ancestor are not present Pulkit Goyal <7895pulkit@gmail.com> parents: 45479 diff changeset	990 None,
49ffaa4f65f6 merge: add missing ACTION_KEEP when both remote and ancestor are not present Pulkit Goyal <7895pulkit@gmail.com> parents: 45479 diff changeset	991 b'ancestor missing, remote missing',
49ffaa4f65f6 merge: add missing ACTION_KEEP when both remote and ancestor are not present Pulkit Goyal <7895pulkit@gmail.com> parents: 45479 diff changeset	992 )
49ffaa4f65f6 merge: add missing ACTION_KEEP when both remote and ancestor are not present Pulkit Goyal <7895pulkit@gmail.com> parents: 45479 diff changeset	993
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	994 elif n2: # file exists only on remote side
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	995 if f in copied1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	996 pass # we'll deal with it on m1 side
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	997 elif f in branch_copies2.movewithdir:
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	998 f2 = branch_copies2.movewithdir[f]
31522 527a247f114f merge: remove unnecessary matcher checks Durham Goode <durham@fb.com> parents: 31482 diff changeset	999 if f2 in m1:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1000 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1001 f2,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1002 mergestatemod.ACTION_MERGE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1003 (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	1004 b'local directory rename, both created',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1005 )
23476 39a12719ec65 merge: don't overwrite conflicting file in locally renamed directory Martin von Zweigbergk <martinvonz@google.com> parents: 23475 diff changeset	1006 else:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1007 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1008 f2,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1009 mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1010 (f, fl2),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1011 b'local directory rename - get from %s' % f,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1012 )
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	1013 elif f in branch_copies2.copy:
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	1014 f2 = branch_copies2.copy[f]
45317 cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	1015 msg, args = None, None
31522 527a247f114f merge: remove unnecessary matcher checks Durham Goode <durham@fb.com> parents: 31482 diff changeset	1016 if f2 in m2:
45317 cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	1017 args = (f2, f, f2, False, pa.node())
cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	1018 msg = b'remote copied from %s' % f2
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1019 else:
45317 cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	1020 args = (f2, f, f2, True, pa.node())
cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	1021 msg = b'remote moved from %s' % f2
cb0cd87e16b4 merge: unify logic of couple of if-else's in manifestmerge() Pulkit Goyal <7895pulkit@gmail.com> parents: 45314 diff changeset	1022 mresult.addfile(f, mergestatemod.ACTION_MERGE, args, msg)
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1023 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	1024 # 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	1025 # 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	1026 #
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1027 # 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	1028 # n * * \| create
23650 b85c548ab14d merge: introduce 'c' action like 'g', but with additional safety Martin von Zweigbergk <martinvonz@google.com> parents: 23649 diff changeset	1029 # y n * \| create
b85c548ab14d merge: introduce 'c' action like 'g', but with additional safety Martin von Zweigbergk <martinvonz@google.com> parents: 23649 diff changeset	1030 # 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	1031 # 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	1032 #
922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1033 # 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	1034 # 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	1035 if not force:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1036 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1037 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1038 mergestatemod.ACTION_CREATED,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1039 (fl2,),
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1040 b'remote created',
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1041 )
23649 18ab5e5955df merge: structure 'remote created' code to match table Martin von Zweigbergk <martinvonz@google.com> parents: 23641 diff changeset	1042 elif not branchmerge:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1043 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1044 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1045 mergestatemod.ACTION_CREATED,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1046 (fl2,),
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1047 b'remote created',
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1048 )
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1049 else:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1050 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1051 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1052 mergestatemod.ACTION_CREATED_MERGE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1053 (fl2, pa.node()),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1054 b'remote created, get or merge',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1055 )
23473 922b10c870c5 merge: branch code into {n1 and n2, n1, n2} top-level cases Martin von Zweigbergk <martinvonz@google.com> parents: 23448 diff changeset	1056 elif n2 != ma[f]:
30586 43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436) G?bor Stefanik <gabor.stefanik@nng.com> parents: 30528 diff changeset	1057 df = None
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	1058 for d in branch_copies1.dirmove:
30586 43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436) G?bor Stefanik <gabor.stefanik@nng.com> parents: 30528 diff changeset	1059 if f.startswith(d):
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436) G?bor Stefanik <gabor.stefanik@nng.com> parents: 30528 diff changeset	1060 # new file added in a directory that was moved
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	1061 df = branch_copies1.dirmove[d] + f[len(d) :]
30586 43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436) G?bor Stefanik <gabor.stefanik@nng.com> parents: 30528 diff changeset	1062 break
31522 527a247f114f merge: remove unnecessary matcher checks Durham Goode <durham@fb.com> parents: 31482 diff changeset	1063 if df is not None and df in m1:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1064 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1065 df,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1066 mergestatemod.ACTION_MERGE,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1067 (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	1068 b'local directory rename - respect move '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1069 b'from %s' % f,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1070 )
30586 43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436) G?bor Stefanik <gabor.stefanik@nng.com> parents: 30528 diff changeset	1071 elif acceptremote:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1072 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1073 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1074 mergestatemod.ACTION_CREATED,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1075 (fl2,),
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1076 b'remote recreating',
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1077 )
18606 95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	1078 else:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1079 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1080 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1081 mergestatemod.ACTION_DELETED_CHANGED,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1082 (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	1083 b'prompt deleted/changed',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1084 )
45587 4c8a93ec6908 merge: store commitinfo if these is a dc or cd conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 45583 diff changeset	1085 if branchmerge:
4c8a93ec6908 merge: store commitinfo if these is a dc or cd conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 45583 diff changeset	1086 mresult.addcommitinfo(
4c8a93ec6908 merge: store commitinfo if these is a dc or cd conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 45583 diff changeset	1087 f, b'merge-removal-candidate', b'yes'
4c8a93ec6908 merge: store commitinfo if these is a dc or cd conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 45583 diff changeset	1088 )
45479 09edbff6ae8d merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally Pulkit Goyal <7895pulkit@gmail.com> parents: 45478 diff changeset	1089 else:
09edbff6ae8d merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally Pulkit Goyal <7895pulkit@gmail.com> parents: 45478 diff changeset	1090 mresult.addfile(
09edbff6ae8d merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally Pulkit Goyal <7895pulkit@gmail.com> parents: 45478 diff changeset	1091 f,
09edbff6ae8d merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally Pulkit Goyal <7895pulkit@gmail.com> parents: 45478 diff changeset	1092 mergestatemod.ACTION_KEEP_ABSENT,
09edbff6ae8d merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally Pulkit Goyal <7895pulkit@gmail.com> parents: 45478 diff changeset	1093 None,
09edbff6ae8d merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally Pulkit Goyal <7895pulkit@gmail.com> parents: 45478 diff changeset	1094 b'local not present, remote unchanged',
09edbff6ae8d merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally Pulkit Goyal <7895pulkit@gmail.com> parents: 45478 diff changeset	1095 )
45590 768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	1096 if branchmerge:
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	1097 # the file must be absent after merging
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	1098 # however the user might make
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	1099 # the file reappear using revert and if they does,
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	1100 # we force create a new node
768412472663 merge: store cases when a file is absent post merge in commitinfo Pulkit Goyal <7895pulkit@gmail.com> parents: 45587 diff changeset	1101 mresult.addcommitinfo(f, b'merge-removal-candidate', b'yes')
23651 72da02d7f126 merge: collect checking for unknown files at end of manifestmerge() Martin von Zweigbergk <martinvonz@google.com> parents: 23650 diff changeset	1102
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1103 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	1104 # If we are merging, look for path conflicts.
45305 31c454a5f1a8 merge: pass mergeresult in checkpassconflicts() instead of actions (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45304 diff changeset	1105 checkpathconflicts(repo, wctx, p2, mresult)
34555 989e884d1be9 merge: check for path conflicts when merging (issue5628) Mark Thomas <mbthomas@fb.com> parents: 34553 diff changeset	1106
38077 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	1107 narrowmatch = repo.narrowmatch()
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	1108 if not narrowmatch.always():
8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	1109 # Updates "actions" in place
45306 e7196f1da2b1 merge: pass mergeresult obj instead of actions in _filternarrowactions() Pulkit Goyal <7895pulkit@gmail.com> parents: 45305 diff changeset	1110 _filternarrowactions(narrowmatch, branchmerge, mresult)
38077 8f37b5fc5abf narrow: filter merge actions in core Martin von Zweigbergk <martinvonz@google.com> parents: 38003 diff changeset	1111
44275 fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	1112 renamedelete = branch_copies1.renamedelete
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	1113 renamedelete.update(branch_copies2.renamedelete)
fa9ad1da2e77 merge: start using the per-side copy dicts Martin von Zweigbergk <martinvonz@google.com> parents: 44274 diff changeset	1114
45404 72e503a24715 merge: introduce `addcommitinfo()` on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45403 diff changeset	1115 mresult.updatevalues(diverge, renamedelete)
45302 fe2040abb183 merge: make mergeresult constructor initialize empty object Pulkit Goyal <7895pulkit@gmail.com> parents: 45301 diff changeset	1116 return mresult
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	1117
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1118
45307 00e9c5edcd58 merge: pass mergeresult obj instead of actions dict in _resolvetrivial() Pulkit Goyal <7895pulkit@gmail.com> parents: 45306 diff changeset	1119 def _resolvetrivial(repo, wctx, mctx, ancestor, mresult):
23531 416c133145ee merge: extract _resolvetrivial() function Martin von Zweigbergk <martinvonz@google.com> parents: 23526 diff changeset	1120 """Resolves false conflicts where the nodeid changed but the content
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1121 remained the same."""
36349 759579bac31d merge: make a copy of dict.items() before mutating the dict during iteration Augie Fackler <augie@google.com> parents: 36215 diff changeset	1122 # 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: 36215 diff changeset	1123 # actions as we resolve trivial conflicts.
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	1124 for f in list(mresult.files((mergestatemod.ACTION_CHANGED_DELETED,))):
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	1125 if f in ancestor and not wctx[f].cmp(ancestor[f]):
23531 416c133145ee merge: extract _resolvetrivial() function Martin von Zweigbergk <martinvonz@google.com> parents: 23526 diff changeset	1126 # local did change but ended up with same content
45307 00e9c5edcd58 merge: pass mergeresult obj instead of actions dict in _resolvetrivial() Pulkit Goyal <7895pulkit@gmail.com> parents: 45306 diff changeset	1127 mresult.addfile(
00e9c5edcd58 merge: pass mergeresult obj instead of actions dict in _resolvetrivial() Pulkit Goyal <7895pulkit@gmail.com> parents: 45306 diff changeset	1128 f, mergestatemod.ACTION_REMOVE, None, b'prompt same'
00e9c5edcd58 merge: pass mergeresult obj instead of actions dict in _resolvetrivial() Pulkit Goyal <7895pulkit@gmail.com> parents: 45306 diff changeset	1129 )
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	1130
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	1131 for f in list(mresult.files((mergestatemod.ACTION_DELETED_CHANGED,))):
45314 4e6a2889dd1d merge: use the new action based mapping introduced in mergeresult obj Pulkit Goyal <7895pulkit@gmail.com> parents: 45313 diff changeset	1132 if f in ancestor and not mctx[f].cmp(ancestor[f]):
23531 416c133145ee merge: extract _resolvetrivial() function Martin von Zweigbergk <martinvonz@google.com> parents: 23526 diff changeset	1133 # remote did change but ended up with same content
45307 00e9c5edcd58 merge: pass mergeresult obj instead of actions dict in _resolvetrivial() Pulkit Goyal <7895pulkit@gmail.com> parents: 45306 diff changeset	1134 mresult.removefile(f) # don't get = keep local deleted
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1135
23531 416c133145ee merge: extract _resolvetrivial() function Martin von Zweigbergk <martinvonz@google.com> parents: 23526 diff changeset	1136
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1137 def calculateupdates(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1138 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1139 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1140 mctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1141 ancestors,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1142 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1143 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1144 acceptremote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1145 followcopies,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1146 matcher=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1147 mergeforce=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1148 ):
45168 4f71d1a99e45 merge: document return values of manifestmerge() and calculateupdates() Pulkit Goyal <7895pulkit@gmail.com> parents: 45167 diff changeset	1149 """
4f71d1a99e45 merge: document return values of manifestmerge() and calculateupdates() Pulkit Goyal <7895pulkit@gmail.com> parents: 45167 diff changeset	1150 Calculate the actions needed to merge mctx into wctx using ancestors
4f71d1a99e45 merge: document return values of manifestmerge() and calculateupdates() Pulkit Goyal <7895pulkit@gmail.com> parents: 45167 diff changeset	1151
4f71d1a99e45 merge: document return values of manifestmerge() and calculateupdates() Pulkit Goyal <7895pulkit@gmail.com> parents: 45167 diff changeset	1152 Uses manifestmerge() to merge manifest and get list of actions required to
4f71d1a99e45 merge: document return values of manifestmerge() and calculateupdates() Pulkit Goyal <7895pulkit@gmail.com> parents: 45167 diff changeset	1153 perform for merging two manifests. If there are multiple ancestors, uses bid
4f71d1a99e45 merge: document return values of manifestmerge() and calculateupdates() Pulkit Goyal <7895pulkit@gmail.com> parents: 45167 diff changeset	1154 merge if enabled.
4f71d1a99e45 merge: document return values of manifestmerge() and calculateupdates() Pulkit Goyal <7895pulkit@gmail.com> parents: 45167 diff changeset	1155
4f71d1a99e45 merge: document return values of manifestmerge() and calculateupdates() Pulkit Goyal <7895pulkit@gmail.com> parents: 45167 diff changeset	1156 Also filters out actions which are unrequired if repository is sparse.
4f71d1a99e45 merge: document return values of manifestmerge() and calculateupdates() Pulkit Goyal <7895pulkit@gmail.com> parents: 45167 diff changeset	1157
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	1158 Returns mergeresult object same as manifestmerge().
45168 4f71d1a99e45 merge: document return values of manifestmerge() and calculateupdates() Pulkit Goyal <7895pulkit@gmail.com> parents: 45167 diff changeset	1159 """
33323 252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	1160 # Avoid cycle.
252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	1161 from . import sparse
252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	1162
45302 fe2040abb183 merge: make mergeresult constructor initialize empty object Pulkit Goyal <7895pulkit@gmail.com> parents: 45301 diff changeset	1163 mresult = None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1164 if len(ancestors) == 1: # default
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	1165 mresult = manifestmerge(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1166 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1167 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1168 mctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1169 ancestors[0],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1170 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1171 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1172 matcher,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1173 acceptremote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1174 followcopies,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1175 )
45308 4ad6c4e9e35f merge: pass mergeresult instead of actions in _checkunknownfiles() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45307 diff changeset	1176 _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce)
49962 becd16690cbe debug: add a config to abort update early Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49365 diff changeset	1177 if repo.ui.configbool(b'devel', b'debug.abort-update'):
becd16690cbe debug: add a config to abort update early Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 49365 diff changeset	1178 exit(1)
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1179
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1180 else: # only when merge.preferancestor=* - the default
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1181 repo.ui.note(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1182 _(b"note: merging %s and %s using bids from ancestors %s\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1183 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1184 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1185 mctx,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1186 _(b' and ').join(pycompat.bytestr(anc) for anc in ancestors),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1187 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1188 )
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1189
45301 98218c83242f merge: improve documentation of fbid dict used for merge bid Pulkit Goyal <7895pulkit@gmail.com> parents: 45300 diff changeset	1190 # mapping filename to bids (action method to list af actions)
98218c83242f merge: improve documentation of fbid dict used for merge bid Pulkit Goyal <7895pulkit@gmail.com> parents: 45300 diff changeset	1191 # {FILENAME1 : BID1, FILENAME2 : BID2}
98218c83242f merge: improve documentation of fbid dict used for merge bid Pulkit Goyal <7895pulkit@gmail.com> parents: 45300 diff changeset	1192 # BID is another dictionary which contains
98218c83242f merge: improve documentation of fbid dict used for merge bid Pulkit Goyal <7895pulkit@gmail.com> parents: 45300 diff changeset	1193 # mapping of following form:
98218c83242f merge: improve documentation of fbid dict used for merge bid Pulkit Goyal <7895pulkit@gmail.com> parents: 45300 diff changeset	1194 # {ACTION_X : [info, ..], ACTION_Y : [info, ..]}
98218c83242f merge: improve documentation of fbid dict used for merge bid Pulkit Goyal <7895pulkit@gmail.com> parents: 45300 diff changeset	1195 fbids = {}
45481 6e474eec4be6 merge: update commitinfo from all mergeresults during bid merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45480 diff changeset	1196 mresult = mergeresult()
23526 a5887f2da5e6 merge: don't treat 'diverge' and 'renamedelete' like actions Martin von Zweigbergk <martinvonz@google.com> parents: 23525 diff changeset	1197 diverge, renamedelete = None, None
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1198 for ancestor in ancestors:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1199 repo.ui.note(_(b'\ncalculating bids for ancestor %s\n') % ancestor)
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	1200 mresult1 = manifestmerge(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1201 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1202 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1203 mctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1204 ancestor,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1205 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1206 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1207 matcher,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1208 acceptremote,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1209 followcopies,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1210 forcefulldiff=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1211 )
45308 4ad6c4e9e35f merge: pass mergeresult instead of actions in _checkunknownfiles() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45307 diff changeset	1212 _checkunknownfiles(repo, wctx, mctx, force, mresult1, mergeforce)
26318 d3bd6cefd742 bidmerge: choose shortest list of diverge and rename/delete warnings Matt Mackall <mpm@selenic.com> parents: 26304 diff changeset	1213
d3bd6cefd742 bidmerge: choose shortest list of diverge and rename/delete warnings Matt Mackall <mpm@selenic.com> parents: 26304 diff changeset	1214 # 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	1215 # merge will correctly incorporate more information
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	1216 if diverge is None or len(mresult1.diverge) < len(diverge):
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	1217 diverge = mresult1.diverge
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	1218 if renamedelete is None or len(renamedelete) < len(
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	1219 mresult1.renamedelete
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	1220 ):
0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	1221 renamedelete = mresult1.renamedelete
26318 d3bd6cefd742 bidmerge: choose shortest list of diverge and rename/delete warnings Matt Mackall <mpm@selenic.com> parents: 26304 diff changeset	1222
45481 6e474eec4be6 merge: update commitinfo from all mergeresults during bid merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45480 diff changeset	1223 # blindly update final mergeresult commitinfo with what we get
6e474eec4be6 merge: update commitinfo from all mergeresults during bid merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45480 diff changeset	1224 # from mergeresult object for each ancestor
6e474eec4be6 merge: update commitinfo from all mergeresults during bid merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45480 diff changeset	1225 # TODO: some commitinfo depends on what bid merge choose and hence
6e474eec4be6 merge: update commitinfo from all mergeresults during bid merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45480 diff changeset	1226 # we will need to make commitinfo also depend on bid merge logic
6e474eec4be6 merge: update commitinfo from all mergeresults during bid merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45480 diff changeset	1227 mresult._commitinfo.update(mresult1._commitinfo)
6e474eec4be6 merge: update commitinfo from all mergeresults during bid merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45480 diff changeset	1228
45367 3c783ff08d40 mergeresult: introduce filemap() which yields filename based mapping Pulkit Goyal <7895pulkit@gmail.com> parents: 45366 diff changeset	1229 for f, a in mresult1.filemap(sort=True):
23638 09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1230 m, args, msg = a
48725 9bc86adf32f6 merge-actions: make merge action a full featured object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48722 diff changeset	1231 repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m.__bytes__()))
23638 09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1232 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	1233 d = fbids[f]
09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1234 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	1235 d[m].append(a)
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1236 else:
23638 09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1237 d[m] = [a]
09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1238 else:
09be050ca98c merge: let bid merge work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23637 diff changeset	1239 fbids[f] = {m: [a]}
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1240
45301 98218c83242f merge: improve documentation of fbid dict used for merge bid Pulkit Goyal <7895pulkit@gmail.com> parents: 45300 diff changeset	1241 # Call for bids
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1242 # Pick the best bid for each file
45458 e7c8a5030a90 merge: show number of ancestors in bid merge debug notes Pulkit Goyal <7895pulkit@gmail.com> parents: 45405 diff changeset	1243 repo.ui.note(
e7c8a5030a90 merge: show number of ancestors in bid merge debug notes Pulkit Goyal <7895pulkit@gmail.com> parents: 45405 diff changeset	1244 _(b'\nauction for merging merge bids (%d ancestors)\n')
e7c8a5030a90 merge: show number of ancestors in bid merge debug notes Pulkit Goyal <7895pulkit@gmail.com> parents: 45405 diff changeset	1245 % len(ancestors)
e7c8a5030a90 merge: show number of ancestors in bid merge debug notes Pulkit Goyal <7895pulkit@gmail.com> parents: 45405 diff changeset	1246 )
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1247 for f, bids in sorted(fbids.items()):
45470 ccd3bf4490c1 merge: show list of bids for each file in bid-merge in ui.debug() Pulkit Goyal <7895pulkit@gmail.com> parents: 45458 diff changeset	1248 if repo.ui.debugflag:
ccd3bf4490c1 merge: show list of bids for each file in bid-merge in ui.debug() Pulkit Goyal <7895pulkit@gmail.com> parents: 45458 diff changeset	1249 repo.ui.debug(b" list of bids for %s:\n" % f)
ccd3bf4490c1 merge: show list of bids for each file in bid-merge in ui.debug() Pulkit Goyal <7895pulkit@gmail.com> parents: 45458 diff changeset	1250 for m, l in sorted(bids.items()):
ccd3bf4490c1 merge: show list of bids for each file in bid-merge in ui.debug() Pulkit Goyal <7895pulkit@gmail.com> parents: 45458 diff changeset	1251 for _f, args, msg in l:
48725 9bc86adf32f6 merge-actions: make merge action a full featured object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48722 diff changeset	1252 repo.ui.debug(b' %s -> %s\n' % (msg, m.__bytes__()))
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1253 # 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	1254 # Consensus?
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1255 if len(bids) == 1: # all bids are the same kind of method
34355 1a5abc45e2fa py3: explicitly convert dict.keys() and dict.items() into a list Pulkit Goyal <7895pulkit@gmail.com> parents: 34309 diff changeset	1256 m, l = list(bids.items())[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1257 if all(a == l[0] for a in l[1:]): # len(bids) is > 1
48725 9bc86adf32f6 merge-actions: make merge action a full featured object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48722 diff changeset	1258 repo.ui.note(
9bc86adf32f6 merge-actions: make merge action a full featured object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48722 diff changeset	1259 _(b" %s: consensus for %s\n") % (f, m.__bytes__())
9bc86adf32f6 merge-actions: make merge action a full featured object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48722 diff changeset	1260 )
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1261 mresult.addfile(f, *l[0])
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1262 continue
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1263 # If keep is an option, just do it.
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1264 if mergestatemod.ACTION_KEEP in bids:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1265 repo.ui.note(_(b" %s: picking 'keep' action\n") % f)
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1266 mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP][0])
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1267 continue
45478 bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45477 diff changeset	1268 # If keep absent is an option, just do that
bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45477 diff changeset	1269 if mergestatemod.ACTION_KEEP_ABSENT in bids:
bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45477 diff changeset	1270 repo.ui.note(_(b" %s: picking 'keep absent' action\n") % f)
bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45477 diff changeset	1271 mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP_ABSENT][0])
bb9888d32601 merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent Pulkit Goyal <7895pulkit@gmail.com> parents: 45477 diff changeset	1272 continue
45622 e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1273 # ACTION_KEEP_NEW and ACTION_CHANGED_DELETED are conflicting actions
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1274 # as one say that file is new while other says that file was present
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1275 # earlier too and has a change delete conflict
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1276 # Let's fall back to conflicting ACTION_CHANGED_DELETED and let user
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1277 # do the right thing
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1278 if (
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1279 mergestatemod.ACTION_CHANGED_DELETED in bids
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1280 and mergestatemod.ACTION_KEEP_NEW in bids
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1281 ):
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1282 repo.ui.note(_(b" %s: picking 'changed/deleted' action\n") % f)
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1283 mresult.addfile(
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1284 f, *bids[mergestatemod.ACTION_CHANGED_DELETED][0]
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1285 )
e8078af6af30 merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED Pulkit Goyal <7895pulkit@gmail.com> parents: 45620 diff changeset	1286 continue
45530 6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45526 diff changeset	1287 # If keep new is an option, let's just do that
6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45526 diff changeset	1288 if mergestatemod.ACTION_KEEP_NEW in bids:
6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45526 diff changeset	1289 repo.ui.note(_(b" %s: picking 'keep new' action\n") % f)
6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45526 diff changeset	1290 mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP_NEW][0])
6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45526 diff changeset	1291 continue
45620 ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1292 # ACTION_GET and ACTION_DELETE_CHANGED are conflicting actions as
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1293 # one action states the file is newer/created on remote side and
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1294 # other states that file is deleted locally and changed on remote
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1295 # side. Let's fallback and rely on a conflicting action to let user
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1296 # do the right thing
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1297 if (
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1298 mergestatemod.ACTION_DELETED_CHANGED in bids
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1299 and mergestatemod.ACTION_GET in bids
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1300 ):
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1301 repo.ui.note(_(b" %s: picking 'delete/changed' action\n") % f)
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1302 mresult.addfile(
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1303 f, *bids[mergestatemod.ACTION_DELETED_CHANGED][0]
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1304 )
ad984583969a merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED Pulkit Goyal <7895pulkit@gmail.com> parents: 45590 diff changeset	1305 continue
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1306 # If there are gets and they all agree [how could they not?], do it.
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1307 if mergestatemod.ACTION_GET in bids:
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1308 ga0 = bids[mergestatemod.ACTION_GET][0]
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1309 if all(a == ga0 for a in bids[mergestatemod.ACTION_GET][1:]):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1310 repo.ui.note(_(b" %s: picking 'get' action\n") % f)
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1311 mresult.addfile(f, *ga0)
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1312 continue
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1313 # 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	1314 # Handle inefficient democrazy.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1315 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	1316 for m, l in sorted(bids.items()):
91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1317 for _f, args, msg in l:
48725 9bc86adf32f6 merge-actions: make merge action a full featured object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48722 diff changeset	1318 repo.ui.note(b' %s -> %s\n' % (msg, m.__bytes__()))
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1319 # Pick random action. TODO: Instead, prompt user when resolving
34355 1a5abc45e2fa py3: explicitly convert dict.keys() and dict.items() into a list Pulkit Goyal <7895pulkit@gmail.com> parents: 34309 diff changeset	1320 m, l = list(bids.items())[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1321 repo.ui.warn(
48725 9bc86adf32f6 merge-actions: make merge action a full featured object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48722 diff changeset	1322 _(b' %s: ambiguous merge - picked %s action\n')
9bc86adf32f6 merge-actions: make merge action a full featured object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48722 diff changeset	1323 % (f, m.__bytes__())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1324 )
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	1325 mresult.addfile(f, *l[0])
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1326 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1327 repo.ui.note(_(b'end of auction\n\n'))
45404 72e503a24715 merge: introduce `addcommitinfo()` on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45403 diff changeset	1328 mresult.updatevalues(diverge, renamedelete)
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1329
23640 b46b9865dd08 merge: let _forgetremoved() work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23639 diff changeset	1330 if wctx.rev() is None:
45368 1aef38d973e8 merge: pass mergeresult obj in _forgetremoved() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45367 diff changeset	1331 _forgetremoved(wctx, mctx, branchmerge, mresult)
23640 b46b9865dd08 merge: let _forgetremoved() work on the file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23639 diff changeset	1332
45311 d70c972cec74 sparse: pass mergeresult obj in sparse.filterupdatesactions() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45310 diff changeset	1333 sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, mresult)
45307 00e9c5edcd58 merge: pass mergeresult obj instead of actions dict in _resolvetrivial() Pulkit Goyal <7895pulkit@gmail.com> parents: 45306 diff changeset	1334 _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult)
33323 252500520d60 sparse: refactor update actions filtering and call from core Gregory Szorc <gregory.szorc@gmail.com> parents: 33321 diff changeset	1335
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	1336 return mresult
23385 91c24457c16a merge: move calculateupdates() before applyupdated() Martin von Zweigbergk <martinvonz@google.com> parents: 23384 diff changeset	1337
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1338
34157 24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34140 diff changeset	1339 def _getcwd():
24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34140 diff changeset	1340 try:
39823 24e493ec2229 py3: rename pycompat.getcwd() to encoding.getcwd() (API) Matt Harbison <matt_harbison@yahoo.com> parents: 39481 diff changeset	1341 return encoding.getcwd()
49314 2e726c934fcd py3: catch FileNotFoundError instead of checking errno == ENOENT Manuel Jacob <me@manueljacob.de> parents: 49037 diff changeset	1342 except FileNotFoundError:
2e726c934fcd py3: catch FileNotFoundError instead of checking errno == ENOENT Manuel Jacob <me@manueljacob.de> parents: 49037 diff changeset	1343 return None
34157 24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34140 diff changeset	1344
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1345
33093 6582dc01aca3 merge: pass wctx to batchremove and batchget Phil Cohen <phillco@fb.com> parents: 32881 diff changeset	1346 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	1347 """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	1348
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	1349 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	1350 """
18640 a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	1351 verbose = repo.ui.verbose
34157 24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34140 diff changeset	1352 cwd = _getcwd()
18633 6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	1353 i = 0
21545 43eecb4e23f8 merge: use separate lists for each action type Mads Kiilerich <madski@unity3d.com> parents: 21524 diff changeset	1354 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	1355 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	1356 if verbose:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1357 repo.ui.note(_(b"removing %s\n") % f)
33098 eb4c49f55f1f workingfilectx: add audit() as a wrapper for wvfs.audit() Phil Cohen <phillco@fb.com> parents: 33097 diff changeset	1358 wctx[f].audit()
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1359 try:
33094 f9e50ee4c52b merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove() Phil Cohen <phillco@fb.com> parents: 33093 diff changeset	1360 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	1361 except OSError as inst:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1362 repo.ui.warn(
45688 ed0ded64a8a9 py3: convert an exception message to bytes Martin von Zweigbergk <martinvonz@google.com> parents: 45661 diff changeset	1363 _(b"update failed to remove %s: %s!\n")
46399 39f23d20ea47 merge: force an exception message to bytes before printing as a warning Matt Harbison <matt_harbison@yahoo.com> parents: 45957 diff changeset	1364 % (f, stringutil.forcebytestr(inst.strerror))
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1365 )
21392 b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1366 if i == 100:
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1367 yield i, f
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1368 i = 0
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1369 i += 1
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1370 if i > 0:
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1371 yield i, f
34157 24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34140 diff changeset	1372
24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34140 diff changeset	1373 if cwd and not _getcwd():
24bf823377fc merge: move cwd-missing detection to helper functions Phil Cohen <phillco@fb.com> parents: 34140 diff changeset	1374 # 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: 34140 diff changeset	1375 # warning.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1376 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1377 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1378 b"current directory was removed\n"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1379 b"(consider changing to repo root: %s)\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1380 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1381 % repo.root
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1382 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1383
21392 b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1384
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1385 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	1386 """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	1387
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1388 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	1389
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1390 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: 42431 diff changeset	1391 exactly one (True, filedata). When wantfiledata is false, filedata is an
42529 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42472 diff changeset	1392 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: 42472 diff changeset	1393 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	1394 """
42529 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42472 diff changeset	1395 filedata = {}
21392 b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1396 verbose = repo.ui.verbose
b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1397 fctx = mctx.filectx
27656 57c0d4888ca8 batchget: add support for backing up files Siddharth Agarwal <sid0@fb.com> parents: 27655 diff changeset	1398 ui = repo.ui
21392 b1ce47dadbdf merge: separate worker functions for batch remove and batch get Mads Kiilerich <madski@unity3d.com> parents: 21391 diff changeset	1399 i = 0
28200 588695ccbb22 merge: perform background file closing in batchget Gregory Szorc <gregory.szorc@gmail.com> parents: 28199 diff changeset	1400 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	1401 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	1402 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	1403 if verbose:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1404 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	1405
28199 d49793aac1ac merge: indent code in batchget() Gregory Szorc <gregory.szorc@gmail.com> parents: 28088 diff changeset	1406 if backup:
34549 a991e1d6bc82 merge: backup conflicting directories when getting files Mark Thomas <mbthomas@fb.com> parents: 34548 diff changeset	1407 # 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	1408 # 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	1409 # with a directory this file is in, and if so, back that up.
41584 1f2714052d7e merge: don't unnecessarily calculate absolute path Martin von Zweigbergk <martinvonz@google.com> parents: 41583 diff changeset	1410 conflicting = f
34549 a991e1d6bc82 merge: backup conflicting directories when getting files Mark Thomas <mbthomas@fb.com> parents: 34548 diff changeset	1411 if not repo.wvfs.lexists(f):
43677 0b7733719d21 utils: move finddirs() to pathutil Martin von Zweigbergk <martinvonz@google.com> parents: 43421 diff changeset	1412 for p in pathutil.finddirs(f):
34549 a991e1d6bc82 merge: backup conflicting directories when getting files Mark Thomas <mbthomas@fb.com> parents: 34548 diff changeset	1413 if repo.wvfs.isfileorlink(p):
41584 1f2714052d7e merge: don't unnecessarily calculate absolute path Martin von Zweigbergk <martinvonz@google.com> parents: 41583 diff changeset	1414 conflicting = p
34549 a991e1d6bc82 merge: backup conflicting directories when getting files Mark Thomas <mbthomas@fb.com> parents: 34548 diff changeset	1415 break
41584 1f2714052d7e merge: don't unnecessarily calculate absolute path Martin von Zweigbergk <martinvonz@google.com> parents: 41583 diff changeset	1416 if repo.wvfs.lexists(conflicting):
41614 ac8cf125d8d5 merge: migrate to scmutil.backuppath() Martin von Zweigbergk <martinvonz@google.com> parents: 41584 diff changeset	1417 orig = scmutil.backuppath(ui, repo, conflicting)
ac8cf125d8d5 merge: migrate to scmutil.backuppath() Martin von Zweigbergk <martinvonz@google.com> parents: 41584 diff changeset	1418 util.rename(repo.wjoin(conflicting), orig)
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1419 wfctx = wctx[f]
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1420 wfctx.clearunknown()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1421 atomictemp = ui.configbool(b"experimental", b"update.atomic-file")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1422 size = wfctx.write(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1423 fctx(f).data(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1424 flags,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1425 backgroundclose=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1426 atomictemp=atomictemp,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1427 )
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1428 if wantfiledata:
48425 c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1429 # XXX note that there is a race window between the time we
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1430 # write the clean data into the file and we stats it. So another
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1431 # writing process meddling with the file content right after we
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1432 # wrote it could cause bad stat data to be gathered.
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1433 #
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1434 # They are 2 data we gather here
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1435 # - the mode:
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1436 # That we actually just wrote, we should not need to read
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1437 # it from disk, (except not all mode might have survived
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1438 # the disk round-trip, which is another issue: we should
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1439 # not depends on this)
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1440 # - the mtime,
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1441 # On system that support nanosecond precision, the mtime
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1442 # could be accurate enough to tell the two writes appart.
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1443 # However gathering it in a racy way make the mtime we
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1444 # gather "unreliable".
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1445 #
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1446 # (note: we get the size from the data we write, which is sane)
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1447 #
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1448 # So in theory the data returned here are fully racy, but in
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1449 # practice "it works mostly fine".
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1450 #
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1451 # Do not be surprised if you end up reading this while looking
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1452 # for the causes of some buggy status. Feel free to improve
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1453 # this in the future, but we cannot simply stop gathering
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1454 # information. Otherwise `hg status` call made after a large `hg
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1455 # update` runs would have to redo a similar amount of work to
c655483ea6e2 dirstate: add a comment about a racy piece of code during updates Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48414 diff changeset	1456 # restore and compare all files content.
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1457 s = wfctx.lstat()
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1458 mode = s.st_mode
48271 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 47609 diff changeset	1459 mtime = timestamp.mtime_of(s)
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 47609 diff changeset	1460 # for dirstate.update_file's parentfiledata argument:
269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 47609 diff changeset	1461 filedata[f] = (mode, size, mtime)
28199 d49793aac1ac merge: indent code in batchget() Gregory Szorc <gregory.szorc@gmail.com> parents: 28088 diff changeset	1462 if i == 100:
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1463 yield False, (i, f)
28199 d49793aac1ac merge: indent code in batchget() Gregory Szorc <gregory.szorc@gmail.com> parents: 28088 diff changeset	1464 i = 0
d49793aac1ac merge: indent code in batchget() Gregory Szorc <gregory.szorc@gmail.com> parents: 28088 diff changeset	1465 i += 1
18633 6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	1466 if i > 0:
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1467 yield False, (i, f)
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1468 yield True, filedata
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	1469
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1470
45356 2c96fd8e05f6 merge: pass mergeresult obj in merge._prefetchfiles() Pulkit Goyal <7895pulkit@gmail.com> parents: 45355 diff changeset	1471 def _prefetchfiles(repo, ctx, mresult):
37762 7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37174 diff changeset	1472 """Invoke ``scmutil.prefetchfiles()`` for the files relevant to the dict
36180 60dd840a7fdb merge: invoke scmutil.fileprefetchhooks() prior to applying updates Matt Harbison <matt_harbison@yahoo.com> parents: 36080 diff changeset	1473 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: 36080 diff changeset	1474
60dd840a7fdb merge: invoke scmutil.fileprefetchhooks() prior to applying updates Matt Harbison <matt_harbison@yahoo.com> parents: 36080 diff changeset	1475 # 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: 36080 diff changeset	1476 # 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: 36080 diff changeset	1477 # changed/deleted never resolves to something from the remote side.
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	1478 files = mresult.files(
45356 2c96fd8e05f6 merge: pass mergeresult obj in merge._prefetchfiles() Pulkit Goyal <7895pulkit@gmail.com> parents: 45355 diff changeset	1479 [
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1480 mergestatemod.ACTION_GET,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1481 mergestatemod.ACTION_DELETED_CHANGED,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1482 mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1483 mergestatemod.ACTION_MERGE,
45356 2c96fd8e05f6 merge: pass mergeresult obj in merge._prefetchfiles() Pulkit Goyal <7895pulkit@gmail.com> parents: 45355 diff changeset	1484 ]
45366 e5b4061f32be mergeresult: add `files()` and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45365 diff changeset	1485 )
45356 2c96fd8e05f6 merge: pass mergeresult obj in merge._prefetchfiles() Pulkit Goyal <7895pulkit@gmail.com> parents: 45355 diff changeset	1486
37762 7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37174 diff changeset	1487 prefetch = scmutil.prefetchfiles
7269b87f817c scmutil: teach the file prefetch hook to handle multiple commits Matt Harbison <matt_harbison@yahoo.com> parents: 37174 diff changeset	1488 matchfiles = scmutil.matchfiles
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1489 prefetch(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1490 repo,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1491 [
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1492 (
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1493 ctx.rev(),
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1494 matchfiles(repo, files),
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1495 )
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1496 ],
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1497 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1498
34139 b90e5b2a9c82 merge: flush any deferred writes before, and after, running any workers Phil Cohen <phillco@fb.com> parents: 34137 diff changeset	1499
37110 71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37090 diff changeset	1500 @attr.s(frozen=True)
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 49018 diff changeset	1501 class updateresult:
37110 71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37090 diff changeset	1502 updatedcount = attr.ib()
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37090 diff changeset	1503 mergedcount = attr.ib()
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37090 diff changeset	1504 removedcount = attr.ib()
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37090 diff changeset	1505 unresolvedcount = attr.ib()
71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37090 diff changeset	1506
37128 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37115 diff changeset	1507 def isempty(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1508 return not (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1509 self.updatedcount
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1510 or self.mergedcount
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1511 or self.removedcount
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1512 or self.unresolvedcount
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1513 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1514
37128 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37115 diff changeset	1515
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1516 def applyupdates(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1517 repo,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1518 mresult,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1519 wctx,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1520 mctx,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1521 overwrite,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1522 wantfiledata,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1523 labels=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1524 ):
11454 9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	1525 """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	1526
45355 b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45354 diff changeset	1527 mresult is a mergeresult object representing result of the merge
11454 9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	1528 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	1529 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	1530
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1531 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: 42431 diff changeset	1532 (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: 42431 diff changeset	1533 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: 42431 diff changeset	1534 batchget.
11454 9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	1535 """
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	1536
45356 2c96fd8e05f6 merge: pass mergeresult obj in merge._prefetchfiles() Pulkit Goyal <7895pulkit@gmail.com> parents: 45355 diff changeset	1537 _prefetchfiles(repo, mctx, mresult)
36180 60dd840a7fdb merge: invoke scmutil.fileprefetchhooks() prior to applying updates Matt Harbison <matt_harbison@yahoo.com> parents: 36080 diff changeset	1538
27078 a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	1539 updated, merged, removed = 0, 0, 0
45510 19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45504 diff changeset	1540 ms = wctx.mergestate(clean=True)
45504 2c10876bb320 mergestate: make clean() only be about creating a clean mergestate Martin von Zweigbergk <martinvonz@google.com> parents: 45499 diff changeset	1541 ms.start(wctx.p1().node(), mctx.node(), labels)
44688 1b8fd4af3318 mergestate: store about files resolved in favour of other Pulkit Goyal <7895pulkit@gmail.com> parents: 44470 diff changeset	1542
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	1543 for f, op in mresult.commitinfo.items():
45297 cb6a72dc0511 merge: pass commitinfo to applyupdates() and get it stored in mergestate Pulkit Goyal <7895pulkit@gmail.com> parents: 45296 diff changeset	1544 # the other side of filenode was choosen while merging, store this in
cb6a72dc0511 merge: pass commitinfo to applyupdates() and get it stored in mergestate Pulkit Goyal <7895pulkit@gmail.com> parents: 45296 diff changeset	1545 # mergestate so that it can be reused on commit
45405 05d19ca33b33 mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45404 diff changeset	1546 ms.addcommitinfo(f, op)
45297 cb6a72dc0511 merge: pass commitinfo to applyupdates() and get it stored in mergestate Pulkit Goyal <7895pulkit@gmail.com> parents: 45296 diff changeset	1547
48727 5dfaca4464d1 merge-actions: add an explicite "no_op" attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48725 diff changeset	1548 num_no_op = mresult.len(mergestatemod.MergeAction.NO_OP_ACTIONS)
5dfaca4464d1 merge-actions: add an explicite "no_op" attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48725 diff changeset	1549 numupdates = mresult.len() - num_no_op
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1550 progress = repo.ui.makeprogress(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1551 _(b'updating'), unit=_(b'files'), total=numupdates
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1552 )
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	1553
45358 5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1554 if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_REMOVE]:
36047 55e8efa2451a subrepo: split non-core functions to new module Yuya Nishihara <yuya@tcha.org> parents: 35726 diff changeset	1555 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	1556
34547 81aebcc73beb merge: add merge action 'p' to record path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34545 diff changeset	1557 # record path conflicts
45358 5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1558 for f, args, msg in mresult.getactions(
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1559 [mergestatemod.ACTION_PATH_CONFLICT], sort=True
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1560 ):
34547 81aebcc73beb merge: add merge action 'p' to record path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34545 diff changeset	1561 f1, fo = args
81aebcc73beb merge: add merge action 'p' to record path conflicts during update Mark Thomas <mbthomas@fb.com> parents: 34545 diff changeset	1562 s = repo.ui.status
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1563 s(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1564 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1565 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	1566 b"directory\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1567 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1568 % f
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1569 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1570 if fo == b'l':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1571 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	1572 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1573 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	1574 s(_(b"resolve manually then use 'hg resolve --mark %s'\n") % f)
45159 e05a488cbed0 mergestate: rename addpath() -> addpathonflict() to prevent confusion Pulkit Goyal <7895pulkit@gmail.com> parents: 45118 diff changeset	1575 ms.addpathconflict(f, f1, fo)
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38078 diff changeset	1576 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	1577
34786 9c899660700a merge: don't use workers in in-memory mode Phil Cohen <phillco@fb.com> parents: 34680 diff changeset	1578 # 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	1579 # 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	1580 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	1581
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	1582 # remove in parallel (must come before resolving path conflicts and getting)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1583 prog = worker.worker(
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1584 repo.ui,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1585 cost,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1586 batchremove,
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1587 (repo, wctx),
45361 cdc50e1929b0 mergeresult: yield from getactions() instead of buidling a list and returning Pulkit Goyal <7895pulkit@gmail.com> parents: 45359 diff changeset	1588 list(mresult.getactions([mergestatemod.ACTION_REMOVE], sort=True)),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1589 )
19095 5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	1590 for i, item in prog:
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38078 diff changeset	1591 progress.increment(step=i, item=item)
45359 72b8c082676b mergeresult: implement a len() function and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45358 diff changeset	1592 removed = mresult.len((mergestatemod.ACTION_REMOVE,))
21390 26b84128c54d merge: move constant assignments a bit and use them more Mads Kiilerich <madski@unity3d.com> parents: 21389 diff changeset	1593
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	1594 # resolve path conflicts (must come before getting)
45358 5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1595 for f, args, msg in mresult.getactions(
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1596 [mergestatemod.ACTION_PATH_CONFLICT_RESOLVE], sort=True
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1597 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1598 repo.ui.debug(b" %s: %s -> pr\n" % (f, msg))
44980 818b4f19ef23 merge: move an inspection of the dirstate from record to calculate phase Martin von Zweigbergk <martinvonz@google.com> parents: 44915 diff changeset	1599 (f0, origf0) = args
34548 b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	1600 if wctx[f0].lexists():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1601 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	1602 wctx[f].audit()
b4955650eb57 merge: add merge action 'pr' to rename files during update Mark Thomas <mbthomas@fb.com> parents: 34547 diff changeset	1603 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	1604 wctx[f0].remove()
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38078 diff changeset	1605 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	1606
38732 be4984261611 merge: mark file gets as not thread safe (issue5933) Gregory Szorc <gregory.szorc@gmail.com> parents: 38498 diff changeset	1607 # get in parallel.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1608 threadsafe = repo.ui.configbool(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1609 b'experimental', b'worker.wdir-get-thread-safe'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1610 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1611 prog = worker.worker(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1612 repo.ui,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1613 cost,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1614 batchget,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1615 (repo, mctx, wctx, wantfiledata),
45361 cdc50e1929b0 mergeresult: yield from getactions() instead of buidling a list and returning Pulkit Goyal <7895pulkit@gmail.com> parents: 45359 diff changeset	1616 list(mresult.getactions([mergestatemod.ACTION_GET], sort=True)),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1617 threadsafe=threadsafe,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1618 hasretval=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1619 )
42529 d29db0a0c4eb update: fix spurious unclean status bug shown by previous commit Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42472 diff changeset	1620 getfiledata = {}
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1621 for final, res in prog:
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1622 if final:
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1623 getfiledata = res
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1624 else:
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1625 i, item = res
87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	1626 progress.increment(step=i, item=item)
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	1627
45358 5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1628 if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_GET]:
36047 55e8efa2451a subrepo: split non-core functions to new module Yuya Nishihara <yuya@tcha.org> parents: 35726 diff changeset	1629 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	1630
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1631 # forget (manifest only, just log it) (must come first)
45358 5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1632 for f, args, msg in mresult.getactions(
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1633 (mergestatemod.ACTION_FORGET,), sort=True
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1634 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1635 repo.ui.debug(b" %s: %s -> f\n" % (f, msg))
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38078 diff changeset	1636 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	1637
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1638 # re-add (manifest only, just log it)
45358 5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1639 for f, args, msg in mresult.getactions(
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1640 (mergestatemod.ACTION_ADD,), sort=True
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1641 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1642 repo.ui.debug(b" %s: %s -> a\n" % (f, msg))
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38078 diff changeset	1643 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	1644
27131 d837da26155e merge: add a new action type representing files to add/mark as modified Siddharth Agarwal <sid0@fb.com> parents: 27130 diff changeset	1645 # re-add/mark as modified (manifest only, just log it)
45358 5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1646 for f, args, msg in mresult.getactions(
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1647 (mergestatemod.ACTION_ADD_MODIFIED,), sort=True
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1648 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1649 repo.ui.debug(b" %s: %s -> am\n" % (f, msg))
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38078 diff changeset	1650 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	1651
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1652 # keep (noop, just log it)
48727 5dfaca4464d1 merge-actions: add an explicite "no_op" attribute Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48725 diff changeset	1653 for a in mergestatemod.MergeAction.NO_OP_ACTIONS:
45530 6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45526 diff changeset	1654 for f, args, msg in mresult.getactions((a,), sort=True):
48725 9bc86adf32f6 merge-actions: make merge action a full featured object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48722 diff changeset	1655 repo.ui.debug(b" %s: %s -> %s\n" % (f, msg, a.__bytes__()))
45530 6877b0ee5f9d mergestate: introduce a new ACTION_KEEP_NEW Pulkit Goyal <7895pulkit@gmail.com> parents: 45526 diff changeset	1656 # no progress
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	1657
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1658 # directory rename, move local
45358 5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1659 for f, args, msg in mresult.getactions(
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1660 (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,), sort=True
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1661 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1662 repo.ui.debug(b" %s: %s -> dm\n" % (f, msg))
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38078 diff changeset	1663 progress.increment(item=f)
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1664 f0, flags = args
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1665 repo.ui.note(_(b"moving %s to %s\n") % (f0, f))
33098 eb4c49f55f1f workingfilectx: add audit() as a wrapper for wvfs.audit() Phil Cohen <phillco@fb.com> parents: 33097 diff changeset	1666 wctx[f].audit()
33095 05c680ebf512 merge: convert repo.wwrite() calls to wctx[f].write() Phil Cohen <phillco@fb.com> parents: 33094 diff changeset	1667 wctx[f].write(wctx.filectx(f0).data(), flags)
33094 f9e50ee4c52b merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove() Phil Cohen <phillco@fb.com> parents: 33093 diff changeset	1668 wctx[f0].remove()
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	1669
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1670 # local directory rename, get
45358 5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1671 for f, args, msg in mresult.getactions(
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1672 (mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,), sort=True
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1673 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1674 repo.ui.debug(b" %s: %s -> dg\n" % (f, msg))
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38078 diff changeset	1675 progress.increment(item=f)
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1676 f0, flags = args
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1677 repo.ui.note(_(b"getting %s to %s\n") % (f0, f))
33095 05c680ebf512 merge: convert repo.wwrite() calls to wctx[f].write() Phil Cohen <phillco@fb.com> parents: 33094 diff changeset	1678 wctx[f].write(mctx.filectx(f0).data(), flags)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	1679
21551 bde505f47141 merge: fix stupid indentation left over from previous refactorings Mads Kiilerich <madski@unity3d.com> parents: 21545 diff changeset	1680 # exec
45358 5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1681 for f, args, msg in mresult.getactions(
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1682 (mergestatemod.ACTION_EXEC,), sort=True
5ce63ee1fe3d merge: replace use of actions dict with mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45357 diff changeset	1683 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1684 repo.ui.debug(b" %s: %s -> e\n" % (f, msg))
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38078 diff changeset	1685 progress.increment(item=f)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1686 (flags,) = args
33098 eb4c49f55f1f workingfilectx: add audit() as a wrapper for wvfs.audit() Phil Cohen <phillco@fb.com> parents: 33097 diff changeset	1687 wctx[f].audit()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1688 wctx[f].setflags(b'l' in flags, b'x' in flags)
21391 cb15835456cb merge: change debug logging - test output changes but no real changes Mads Kiilerich <madski@unity3d.com> parents: 21390 diff changeset	1689
45499 c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1690 moves = []
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1691
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1692 # 'cd' and 'dc' actions are treated like other merge conflicts
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1693 mergeactions = list(
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1694 mresult.getactions(
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1695 [
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1696 mergestatemod.ACTION_CHANGED_DELETED,
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1697 mergestatemod.ACTION_DELETED_CHANGED,
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1698 mergestatemod.ACTION_MERGE,
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1699 ],
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1700 sort=True,
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1701 )
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1702 )
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1703 for f, args, msg in mergeactions:
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1704 f1, f2, fa, move, anc = args
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1705 if f == b'.hgsubstate': # merged internally
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1706 continue
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1707 if f1 is None:
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1708 fcl = filemerge.absentfilectx(wctx, fa)
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1709 else:
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1710 repo.ui.debug(b" preserving %s for resolve of %s\n" % (f1, f))
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1711 fcl = wctx[f1]
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1712 if f2 is None:
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1713 fco = filemerge.absentfilectx(mctx, fa)
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1714 else:
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1715 fco = mctx[f2]
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1716 actx = repo[anc]
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1717 if fa in actx:
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1718 fca = actx[fa]
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1719 else:
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1720 # TODO: move to absentfilectx
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1721 fca = repo.filectx(f1, fileid=nullrev)
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1722 ms.add(fcl, fco, fca, f)
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1723 if f1 != f and move:
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1724 moves.append(f1)
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1725
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1726 # remove renamed files after safely stored
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1727 for f in moves:
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1728 if wctx[f].lexists():
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1729 repo.ui.debug(b"removing %s\n" % f)
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1730 wctx[f].audit()
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1731 wctx[f].remove()
c4f14db3da1d merge: move initial handling of mergeactions near to later one Pulkit Goyal <7895pulkit@gmail.com> parents: 45481 diff changeset	1732
45362 e335936cd4e1 applyupdates: simplfy calculation of number of updated files Pulkit Goyal <7895pulkit@gmail.com> parents: 45361 diff changeset	1733 # these actions updates the file
e335936cd4e1 applyupdates: simplfy calculation of number of updated files Pulkit Goyal <7895pulkit@gmail.com> parents: 45361 diff changeset	1734 updated = mresult.len(
e335936cd4e1 applyupdates: simplfy calculation of number of updated files Pulkit Goyal <7895pulkit@gmail.com> parents: 45361 diff changeset	1735 (
e335936cd4e1 applyupdates: simplfy calculation of number of updated files Pulkit Goyal <7895pulkit@gmail.com> parents: 45361 diff changeset	1736 mergestatemod.ACTION_GET,
e335936cd4e1 applyupdates: simplfy calculation of number of updated files Pulkit Goyal <7895pulkit@gmail.com> parents: 45361 diff changeset	1737 mergestatemod.ACTION_EXEC,
e335936cd4e1 applyupdates: simplfy calculation of number of updated files Pulkit Goyal <7895pulkit@gmail.com> parents: 45361 diff changeset	1738 mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
e335936cd4e1 applyupdates: simplfy calculation of number of updated files Pulkit Goyal <7895pulkit@gmail.com> parents: 45361 diff changeset	1739 mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,
e335936cd4e1 applyupdates: simplfy calculation of number of updated files Pulkit Goyal <7895pulkit@gmail.com> parents: 45361 diff changeset	1740 )
e335936cd4e1 applyupdates: simplfy calculation of number of updated files Pulkit Goyal <7895pulkit@gmail.com> parents: 45361 diff changeset	1741 )
26786 121f80d14e4b merge.applyupdates: call driverpreprocess before starting merge actions Siddharth Agarwal <sid0@fb.com> parents: 26785 diff changeset	1742
34680 c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	1743 try:
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	1744 for f, args, msg in mergeactions:
48472 38941a28406a mergestate: merge `preresolve()` into `resolve()` Martin von Zweigbergk <martinvonz@google.com> parents: 48469 diff changeset	1745 repo.ui.debug(b" %s: %s -> m\n" % (f, msg))
46811 5a0b930cfb3e commit: get info from mergestate whether a file was merged or not Pulkit Goyal <7895pulkit@gmail.com> parents: 46796 diff changeset	1746 ms.addcommitinfo(f, {b'merged': b'yes'})
38351 bec1212eceaa progress: create helper class for incrementing progress Martin von Zweigbergk <martinvonz@google.com> parents: 38078 diff changeset	1747 progress.increment(item=f)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1748 if f == b'.hgsubstate': # subrepo states need updating
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1749 subrepoutil.submerge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1750 repo, wctx, mctx, wctx.ancestor(mctx), overwrite, labels
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1751 )
34680 c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	1752 continue
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	1753 wctx[f].audit()
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	1754 ms.resolve(f, wctx)
26292 007ac1acfcac merge: move merge step to the end Siddharth Agarwal <sid0@fb.com> parents: 25959 diff changeset	1755
47896 5228a6dc212b merge-halt: fix issue with merge.on-failure=halt breaking unshelve Kyle Lippincott <spectral@google.com> parents: 47609 diff changeset	1756 except error.InterventionRequired:
5228a6dc212b merge-halt: fix issue with merge.on-failure=halt breaking unshelve Kyle Lippincott <spectral@google.com> parents: 47609 diff changeset	1757 # If the user has merge.on-failure=halt, catch the error and close the
5228a6dc212b merge-halt: fix issue with merge.on-failure=halt breaking unshelve Kyle Lippincott <spectral@google.com> parents: 47609 diff changeset	1758 # merge state "properly".
5228a6dc212b merge-halt: fix issue with merge.on-failure=halt breaking unshelve Kyle Lippincott <spectral@google.com> parents: 47609 diff changeset	1759 pass
34680 c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	1760 finally:
c0a524f77e8a merge: ensure that we always commit the mergestate Ryan McElroy <rmcelroy@fb.com> parents: 34560 diff changeset	1761 ms.commit()
26787 64848559413a merge.applyupdates: call driverconclude after performing merge actions Siddharth Agarwal <sid0@fb.com> parents: 26786 diff changeset	1762
27078 a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	1763 unresolved = ms.unresolvedcount()
a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	1764
a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	1765 msupdated, msmerged, msremoved = ms.counts()
a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	1766 updated += msupdated
a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	1767 merged += msmerged
a421debae31d merge.applyupdates: use counters from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27077 diff changeset	1768 removed += msremoved
27080 ae2d3782d818 merge.applyupdates: extend action queues with ones returned from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27079 diff changeset	1769
ae2d3782d818 merge.applyupdates: extend action queues with ones returned from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27079 diff changeset	1770 extraactions = ms.actions()
ae2d3782d818 merge.applyupdates: extend action queues with ones returned from mergestate Siddharth Agarwal <sid0@fb.com> parents: 27079 diff changeset	1771
38379 ef692614e601 progress: hide update(None) in a new complete() method Martin von Zweigbergk <martinvonz@google.com> parents: 38351 diff changeset	1772 progress.complete()
47378 9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	1773 return (
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	1774 updateresult(updated, merged, removed, unresolved),
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	1775 getfiledata,
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	1776 extraactions,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	1777 )
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	1778
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1779
45167 796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1780 def _advertisefsmonitor(repo, num_gets, p1node):
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1781 # Advertise fsmonitor when its presence could be useful.
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1782 #
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1783 # We only advertise when performing an update from an empty working
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1784 # directory. This typically only occurs during initial clone.
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1785 #
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1786 # We give users a mechanism to disable the warning in case it is
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1787 # annoying.
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1788 #
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1789 # We only allow on Linux and MacOS because that's where fsmonitor is
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1790 # considered stable.
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1791 fsmonitorwarning = repo.ui.configbool(b'fsmonitor', b'warn_when_unused')
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1792 fsmonitorthreshold = repo.ui.configint(
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1793 b'fsmonitor', b'warn_update_file_count'
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1794 )
45473 c1d6e930ac8a fsmonitor: increase the threshold before we recommend it, when using rust Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 45470 diff changeset	1795 # avoid cycle dirstate -> sparse -> merge -> dirstate
48804 d4486810a179 merge: remove direct rustmod reference Rapha?l Gom?s <rgomes@octobus.net> parents: 48760 diff changeset	1796 dirstate_rustmod = policy.importrust("dirstate")
45473 c1d6e930ac8a fsmonitor: increase the threshold before we recommend it, when using rust Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 45470 diff changeset	1797
48804 d4486810a179 merge: remove direct rustmod reference Rapha?l Gom?s <rgomes@octobus.net> parents: 48760 diff changeset	1798 if dirstate_rustmod is not None:
45473 c1d6e930ac8a fsmonitor: increase the threshold before we recommend it, when using rust Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 45470 diff changeset	1799 # When using rust status, fsmonitor becomes necessary at higher sizes
c1d6e930ac8a fsmonitor: increase the threshold before we recommend it, when using rust Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 45470 diff changeset	1800 fsmonitorthreshold = repo.ui.configint(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1801 b'fsmonitor',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	1802 b'warn_update_file_count_rust',
45473 c1d6e930ac8a fsmonitor: increase the threshold before we recommend it, when using rust Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 45470 diff changeset	1803 )
c1d6e930ac8a fsmonitor: increase the threshold before we recommend it, when using rust Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 45470 diff changeset	1804
45167 796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1805 try:
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1806 # avoid cycle: extensions -> cmdutil -> merge
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1807 from . import extensions
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1808
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1809 extensions.find(b'fsmonitor')
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1810 fsmonitorenabled = repo.ui.config(b'fsmonitor', b'mode') != b'off'
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1811 # We intentionally don't look at whether fsmonitor has disabled
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1812 # itself because a) fsmonitor may have already printed a warning
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1813 # b) we only care about the config state here.
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1814 except KeyError:
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1815 fsmonitorenabled = False
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1816
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1817 if (
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1818 fsmonitorwarning
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1819 and not fsmonitorenabled
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	1820 and p1node == repo.nullid
45167 796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1821 and num_gets >= fsmonitorthreshold
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1822 and pycompat.sysplatform.startswith((b'linux', b'darwin'))
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1823 ):
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1824 repo.ui.warn(
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1825 _(
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1826 b'(warning: large working directory being used without '
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1827 b'fsmonitor enabled; enable fsmonitor to improve performance; '
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1828 b'see "hg help -e fsmonitor")\n'
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1829 )
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1830 )
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1831
796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	1832
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1833 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	1834 UPDATECHECK_NONE = b'none'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1835 UPDATECHECK_LINEAR = b'linear'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1836 UPDATECHECK_NO_CONFLICT = b'noconflict'
42972 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42961 diff changeset	1837
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1838
45563 2c86b9587740 merge: make low-level update() private (API) Martin von Zweigbergk <martinvonz@google.com> parents: 45550 diff changeset	1839 def _update(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1840 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1841 node,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1842 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1843 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1844 ancestor=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1845 mergeancestor=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1846 labels=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1847 matcher=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1848 mergeforce=False,
44318 c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	1849 updatedirstate=True,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1850 updatecheck=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1851 wc=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1852 ):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	1853 """
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	1854 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	1855
30931 e6932e9a262a merge: remove unused handling of default destination in merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30930 diff changeset	1856 node = the node to update to
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	1857 branchmerge = whether to merge between branches
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	1858 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	1859 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	1860 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	1861 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	1862 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	1863 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	1864 as a temporary fix and should be avoided in general.
48760 af9f2c64302e merge: fix documented order of `labels` argument Martin von Zweigbergk <martinvonz@google.com> parents: 48751 diff changeset	1865 labels = labels to use for local, other, and base
28020 cffa46cbdb8f merge: tell _checkunknownfiles about whether this was merge --force Siddharth Agarwal <sid0@fb.com> parents: 28019 diff changeset	1866 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	1867 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	1868
34919 1856de4d1297 update: mention long options explicitly in description of merge.update() muxator <a.mux@inwind.it> parents: 34885 diff changeset	1869 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	1870 -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	1871 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	1872 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	1873 option doesn't exist on the command line, but represents the
31178 41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1874 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	1875
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12032 diff changeset	1876 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	1877
31178 41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1878 -c -C -n -m dirty rev linear \| result
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1879 y y * * * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1880 y * y * * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1881 y * * y * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1882 * y y * * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1883 * y * y * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1884 * * y y * * * \| (1)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1885 * * * * * n n \| x
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1886 * * * * n * * \| ok
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1887 n n n n y * y \| merge
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1888 n n n n y y n \| (2)
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1889 n n n y y * * \| merge
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1890 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: 31176 diff changeset	1891 n y n n y * * \| discard
41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	1892 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	1893
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	1894 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	1895 * = don't-care
31171 351207bfdde9 merge: move "incompatible options" case first in docstring table Martin von Zweigbergk <martinvonz@google.com> parents: 31170 diff changeset	1896 1 = incompatible options (checked in commands.py)
351207bfdde9 merge: move "incompatible options" case first in docstring table Martin von Zweigbergk <martinvonz@google.com> parents: 31170 diff changeset	1897 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: 31170 diff changeset	1898 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	1899
34309 440ece43024c merge: allow a custom working context to be passed to update Phil Cohen <phillco@fb.com> parents: 34157 diff changeset	1900 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: 34157 diff changeset	1901 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: 34157 diff changeset	1902
13162 115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	1903 Return the same tuple as applyupdates().
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	1904 """
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33311 diff changeset	1905 # Avoid cycle.
d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33311 diff changeset	1906 from . import sparse
2815 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2814 diff changeset	1907
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31175 diff changeset	1908 # This function used to find the default destination if node was None, but
30931 e6932e9a262a merge: remove unused handling of default destination in merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30930 diff changeset	1909 # that's now in destutil.py.
e6932e9a262a merge: remove unused handling of default destination in merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30930 diff changeset	1910 assert node is not None
31176 fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31175 diff changeset	1911 if not branchmerge and not force:
fad5e299cfc7 update: accept --merge to allow merging across topo branches (issue5125) Martin von Zweigbergk <martinvonz@google.com> parents: 31175 diff changeset	1912 # 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: 31175 diff changeset	1913 # 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: 31175 diff changeset	1914 # 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: 31175 diff changeset	1915 if updatecheck is None:
42972 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42961 diff changeset	1916 updatecheck = UPDATECHECK_LINEAR
48717 6c4b10d01af0 merge: break up two not-so-one-liner for extra readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48716 diff changeset	1917 okay = (UPDATECHECK_NONE, UPDATECHECK_LINEAR, UPDATECHECK_NO_CONFLICT)
6c4b10d01af0 merge: break up two not-so-one-liner for extra readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48716 diff changeset	1918 if updatecheck not in okay:
6c4b10d01af0 merge: break up two not-so-one-liner for extra readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48716 diff changeset	1919 msg = r'Invalid updatecheck %r (can accept %r)'
6c4b10d01af0 merge: break up two not-so-one-liner for extra readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48716 diff changeset	1920 msg %= (updatecheck, okay)
6c4b10d01af0 merge: break up two not-so-one-liner for extra readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48716 diff changeset	1921 raise ValueError(msg)
45019 d1471dbbdd63 merge: don't grab wlock when merging in memory Martin von Zweigbergk <martinvonz@google.com> parents: 44980 diff changeset	1922 if wc is not None and wc.isinmemory():
d1471dbbdd63 merge: don't grab wlock when merging in memory Martin von Zweigbergk <martinvonz@google.com> parents: 44980 diff changeset	1923 maybe_wlock = util.nullcontextmanager()
d1471dbbdd63 merge: don't grab wlock when merging in memory Martin von Zweigbergk <martinvonz@google.com> parents: 44980 diff changeset	1924 else:
d1471dbbdd63 merge: don't grab wlock when merging in memory Martin von Zweigbergk <martinvonz@google.com> parents: 44980 diff changeset	1925 maybe_wlock = repo.wlock()
d1471dbbdd63 merge: don't grab wlock when merging in memory Martin von Zweigbergk <martinvonz@google.com> parents: 44980 diff changeset	1926 with maybe_wlock:
34309 440ece43024c merge: allow a custom working context to be passed to update Phil Cohen <phillco@fb.com> parents: 34157 diff changeset	1927 if wc is None:
440ece43024c merge: allow a custom working context to be passed to update Phil Cohen <phillco@fb.com> parents: 34157 diff changeset	1928 wc = repo[None]
20279 5b4f963d21cc merge: refactor initialization of variables in update Sean Farley <sean.michael.farley@gmail.com> parents: 20278 diff changeset	1929 pl = wc.parents()
5b4f963d21cc merge: refactor initialization of variables in update Sean Farley <sean.michael.farley@gmail.com> parents: 20278 diff changeset	1930 p1 = pl[0]
42428 72522fe7fb95 merge: reorder some initialization to make more sense Martin von Zweigbergk <martinvonz@google.com> parents: 42205 diff changeset	1931 p2 = repo[node]
23405 2a038deeac9a merge: 0 is a valid ancestor different from None Mads Kiilerich <madski@unity3d.com> parents: 23398 diff changeset	1932 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	1933 pas = [repo[ancestor]]
42429 a5b5ecff5f37 merge: simplify initialization of "pas" Martin von Zweigbergk <martinvonz@google.com> parents: 42428 diff changeset	1934 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1935 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	1936 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	1937 pas = [repo[anc] for anc in (sorted(cahs) or [repo.nullid])]
21128 f4014f646f71 merge: with merge.preferancestor=, run an auction with bids from ancestors Mads Kiilerich <madski@unity3d.com>* parents: 21082 diff changeset	1938 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	1939 pas = [p1.ancestor(p2, warn=branchmerge)]
13874 9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	1940
36215 187f2474bc11 merge: coerce nodes to bytes, not str Augie Fackler <augie@google.com> parents: 36180 diff changeset	1941 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	1942
42428 72522fe7fb95 merge: reorder some initialization to make more sense Martin von Zweigbergk <martinvonz@google.com> parents: 42205 diff changeset	1943 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	1944 ### check phase
27316 777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 27267 diff changeset	1945 if not overwrite:
777f668eca70 merge: refuse update/merge if there are unresolved conflicts (BC) Martin von Zweigbergk <martinvonz@google.com> parents: 27267 diff changeset	1946 if len(pl) > 1:
46486 dc00324e80f4 errors: use StateError more in merge module Martin von Zweigbergk <martinvonz@google.com> parents: 46439 diff changeset	1947 raise error.StateError(_(b"outstanding uncommitted merge"))
45510 19590b126764 merge: use in-memory mergestate when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 45504 diff changeset	1948 ms = wc.mergestate()
46435 dfca84970da8 cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())) Augie Fackler <augie@google.com> parents: 45957 diff changeset	1949 if ms.unresolvedcount():
48717 6c4b10d01af0 merge: break up two not-so-one-liner for extra readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48716 diff changeset	1950 msg = _(b"outstanding merge conflicts")
6c4b10d01af0 merge: break up two not-so-one-liner for extra readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48716 diff changeset	1951 hint = _(b"use 'hg resolve' to resolve")
6c4b10d01af0 merge: break up two not-so-one-liner for extra readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48716 diff changeset	1952 raise error.StateError(msg, hint=hint)
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	1953 if branchmerge:
48718 58a2c66fa94c merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48717 diff changeset	1954 m_a = _(b"merging with a working directory ancestor has no effect")
21081 ffd7b6ce46ff merge: pass merge ancestor to calculateupdates as a list Mads Kiilerich <madski@unity3d.com> parents: 21080 diff changeset	1955 if pas == [p2]:
48718 58a2c66fa94c merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48717 diff changeset	1956 raise error.Abort(m_a)
21081 ffd7b6ce46ff merge: pass merge ancestor to calculateupdates as a list Mads Kiilerich <madski@unity3d.com> parents: 21080 diff changeset	1957 elif pas == [p1]:
31388 b6a6df38a802 merge: check current wc branch for 'nothing to merge', not its p1 Mads Kiilerich <mads@kiilerich.com> parents: 31332 diff changeset	1958 if not mergeancestor and wc.branch() == p2.branch():
48719 bca57b01518f merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48718 diff changeset	1959 msg = _(b"nothing to merge")
bca57b01518f merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48718 diff changeset	1960 hint = _(b"use 'hg update' or check 'hg heads'")
bca57b01518f merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48718 diff changeset	1961 raise error.Abort(msg, hint=hint)
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	1962 if not force and (wc.files() or wc.deleted()):
48720 00bfd920169d merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48719 diff changeset	1963 msg = _(b"uncommitted changes")
00bfd920169d merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48719 diff changeset	1964 hint = _(b"use 'hg status' to list changes")
00bfd920169d merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48719 diff changeset	1965 raise error.StateError(msg, hint=hint)
35293 1b03407e808d merge: skip subrepo state, update hooks, and updating the dirstate in IMM Phil Cohen <phillco@fb.com> parents: 35292 diff changeset	1966 if not wc.isinmemory():
1b03407e808d merge: skip subrepo state, update hooks, and updating the dirstate in IMM Phil Cohen <phillco@fb.com> parents: 35292 diff changeset	1967 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: 35292 diff changeset	1968 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	1969
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	1970 elif not overwrite:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1971 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	1972 # 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	1973 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	1974 repo.hook(b'update', parent1=xp2, parent2=b'', error=0)
37110 71543b942eea merge: return an attrs class from update() and applyupdates() Gregory Szorc <gregory.szorc@gmail.com> parents: 37090 diff changeset	1975 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	1976
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1977 if updatecheck == UPDATECHECK_LINEAR and pas not in (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1978 [p1],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1979 [p2],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1980 ): # nonlinear
18985 a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	1981 dirty = wc.dirty(missing=True)
30931 e6932e9a262a merge: remove unused handling of default destination in merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30930 diff changeset	1982 if dirty:
18985 a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	1983 # Branching is a bit strange to ensure we do the minimal
33152 7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33107 diff changeset	1984 # amount of call to obsutil.foreground.
7017567ebdf2 obsutil: move 'foreground' to the new modules Pierre-Yves David <pierre-yves.david@octobus.net> parents: 33107 diff changeset	1985 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	1986 # 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	1987 if repo[node].node() in foreground:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	1988 pass # allow updating to successors
30931 e6932e9a262a merge: remove unused handling of default destination in merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30930 diff changeset	1989 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1990 msg = _(b"uncommitted changes")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1991 hint = _(b"commit or update --clean to discard changes")
30981 330fbd515512 destutil: remove duplicate check and leave it to merge.update() Martin von Zweigbergk <martinvonz@google.com> parents: 30932 diff changeset	1992 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	1993 else:
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	1994 # Allow jumping branches if clean and specific rev given
30930 47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	1995 pass
47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	1996
47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	1997 if overwrite:
47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	1998 pas = [wc]
47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	1999 elif not branchmerge:
47278970fc8c update: localize logic around which ancestor to use Martin von Zweigbergk <martinvonz@google.com> parents: 30859 diff changeset	2000 pas = [p1]
2814 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2813 diff changeset	2001
25843 bf9ea348b487 merge: mark ancient debugging option Matt Mackall <mpm@selenic.com> parents: 25754 diff changeset	2002 # deprecated config: merge.followcopies
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2003 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	2004 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	2005 followcopies = False
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates G?bor Stefanik <gabor.stefanik@nng.com> parents: 30172 diff changeset	2006 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	2007 followcopies = False
a2804ddcf9ae update: enable copy tracing for backwards and non-linear updates G?bor Stefanik <gabor.stefanik@nng.com> parents: 30172 diff changeset	2008 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	2009 followcopies = False
21080 04540a8499a3 merge: move ancestor selection tweaking from manifestmerge to update function Mads Kiilerich <madski@unity3d.com> parents: 21024 diff changeset	2010
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	2011 ### calculate phase
45295 0e18861f96ab merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45168 diff changeset	2012 mresult = calculateupdates(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2013 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2014 wc,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2015 p2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2016 pas,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2017 branchmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2018 force,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2019 mergeancestor,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2020 followcopies,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2021 matcher=matcher,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2022 mergeforce=mergeforce,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2023 )
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2024
42972 1ad3ebb39c61 merge: replace magic strings with NAMED_CONSTANTS (API) Augie Fackler <augie@google.com> parents: 42961 diff changeset	2025 if updatecheck == UPDATECHECK_NO_CONFLICT:
45299 0c849f0166c2 merge: introduce hasconflicts() on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45298 diff changeset	2026 if mresult.hasconflicts():
0c849f0166c2 merge: introduce hasconflicts() on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45298 diff changeset	2027 msg = _(b"conflicting changes")
0c849f0166c2 merge: introduce hasconflicts() on mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45298 diff changeset	2028 hint = _(b"commit or update --clean to discard changes")
46486 dc00324e80f4 errors: use StateError more in merge module Martin von Zweigbergk <martinvonz@google.com> parents: 46439 diff changeset	2029 raise error.StateError(msg, hint=hint)
31178 41a9edc5d00f update: allow setting default update check to "noconflict" Martin von Zweigbergk <martinvonz@google.com> parents: 31176 diff changeset	2030
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2031 # 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	2032 # already, but we can't handle .hgsubstate in filemerge or
36047 55e8efa2451a subrepo: split non-core functions to new module Yuya Nishihara <yuya@tcha.org> parents: 35726 diff changeset	2033 # subrepoutil.submerge yet so we have to keep prompting for it.
45365 4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	2034 vals = mresult.getfile(b'.hgsubstate')
4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	2035 if vals:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2036 f = b'.hgsubstate'
45365 4c6004afd836 mergeresult: introduce getfile() and use it where required Pulkit Goyal <7895pulkit@gmail.com> parents: 45364 diff changeset	2037 m, args, msg = vals
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29629 diff changeset	2038 prompts = filemerge.partextras(labels)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2039 prompts[b'f'] = f
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	2040 if m == mergestatemod.ACTION_CHANGED_DELETED:
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2041 if repo.ui.promptchoice(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2042 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2043 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	2044 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	2045 b"$$ &Changed $$ &Delete"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2046 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2047 % prompts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2048 0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2049 ):
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	2050 mresult.addfile(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2051 f,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2052 mergestatemod.ACTION_REMOVE,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2053 None,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2054 b'prompt delete',
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	2055 )
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2056 elif f in p1:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	2057 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	2058 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	2059 mergestatemod.ACTION_ADD_MODIFIED,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2060 None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2061 b'prompt keep',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2062 )
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2063 else:
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	2064 mresult.addfile(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2065 f,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2066 mergestatemod.ACTION_ADD,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2067 None,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2068 b'prompt keep',
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	2069 )
b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	2070 elif m == mergestatemod.ACTION_DELETED_CHANGED:
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2071 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	2072 flags = p2[f2].flags()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2073 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2074 repo.ui.promptchoice(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2075 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2076 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	2077 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	2078 b"$$ &Changed $$ &Deleted"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2079 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2080 % prompts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2081 0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2082 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2083 == 0
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2084 ):
45303 b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	2085 mresult.addfile(
b442920ab1de merge: introduce mergeresult.addfile() and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45302 diff changeset	2086 f,
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	2087 mergestatemod.ACTION_GET,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2088 (flags, False),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2089 b'prompt recreating',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2090 )
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2091 else:
45304 f1fb9a079131 merge: add removefile() to mergeresult object Pulkit Goyal <7895pulkit@gmail.com> parents: 45303 diff changeset	2092 mresult.removefile(f)
27951 6bce6d925e45 merge: don't try to merge subrepos twice (issue4988) Siddharth Agarwal <sid0@fb.com> parents: 27852 diff changeset	2093
29893 6f447b9ec263 util: rename checkcase() to fscasesensitive() (API) Martin von Zweigbergk <martinvonz@google.com> parents: 29842 diff changeset	2094 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	2095 # check collision between files only in p2 for clean update
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2096 if not branchmerge and (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2097 force or not wc.dirty(missing=True, branch=False)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2098 ):
23544 7cc0fb0080b6 merge: perform case-collision checking on final set of actions Martin von Zweigbergk <martinvonz@google.com> parents: 23541 diff changeset	2099 _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	2100 else:
45354 f569ca3eb430 merge: pass mergeresult obj instead of actions in _checkcollision() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45320 diff changeset	2101 _checkcollision(repo, wc.manifest(), mresult)
23544 7cc0fb0080b6 merge: perform case-collision checking on final set of actions Martin von Zweigbergk <martinvonz@google.com> parents: 23541 diff changeset	2102
23525 5126d7718d7c merge: move dr/rd warning messages out of applyupdates() Martin von Zweigbergk <martinvonz@google.com> parents: 23524 diff changeset	2103 # divergent renames
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	2104 for f, fl in sorted(mresult.diverge.items()):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2105 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2106 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2107 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	2108 b"multiple times to:\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2109 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2110 % f
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2111 )
42110 3a7efcbdf288 copies: print list of divergent renames in sorted order Martin von Zweigbergk <martinvonz@google.com> parents: 42057 diff changeset	2112 for nf in sorted(fl):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2113 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	2114
5126d7718d7c merge: move dr/rd warning messages out of applyupdates() Martin von Zweigbergk <martinvonz@google.com> parents: 23524 diff changeset	2115 # rename and delete
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	2116 for f, fl in sorted(mresult.renamedelete.items()):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2117 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2118 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2119 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	2120 b"and renamed to:\n"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2121 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2122 % f
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2123 )
42110 3a7efcbdf288 copies: print list of divergent renames in sorted order Martin von Zweigbergk <martinvonz@google.com> parents: 42057 diff changeset	2124 for nf in sorted(fl):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2125 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	2126
26957 d16d73173fdd merge: move messages about possible conflicts a litte earlier Martin von Zweigbergk <martinvonz@google.com> parents: 26949 diff changeset	2127 ### apply phase
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2128 if not branchmerge: # just jump to the new rev
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	2129 fp1, fp2, xp1, xp2 = fp2, repo.nullid, xp2, b''
44245 ae9310709c13 merge: move definition of `partial` closer to where it's used Martin von Zweigbergk <martinvonz@google.com> parents: 44236 diff changeset	2130 # If we're doing a partial update, we need to skip updating
44246 faec51c76b7b merge: avoid a negation in the definition of updatedirstate Martin von Zweigbergk <martinvonz@google.com> parents: 44245 diff changeset	2131 # the dirstate.
faec51c76b7b merge: avoid a negation in the definition of updatedirstate Martin von Zweigbergk <martinvonz@google.com> parents: 44245 diff changeset	2132 always = matcher is None or matcher.always()
44318 c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2133 updatedirstate = updatedirstate and always and not wc.isinmemory()
44236 d1c0f239193f merge: define updatedirstate a little earlier and reuse it Martin von Zweigbergk <martinvonz@google.com> parents: 44235 diff changeset	2134 if updatedirstate:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2135 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	2136 # 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	2137 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	2138
45167 796b63b0f0dd merge: refactor code to advise fsmonitor in separate function Pulkit Goyal <7895pulkit@gmail.com> parents: 45159 diff changeset	2139 _advertisefsmonitor(
45359 72b8c082676b mergeresult: implement a len() function and use it Pulkit Goyal <7895pulkit@gmail.com> parents: 45358 diff changeset	2140 repo, mresult.len((mergestatemod.ACTION_GET,)), p1.node()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2141 )
34885 df2ff314e36f fsmonitor: warn when fsmonitor could be used Gregory Szorc <gregory.szorc@gmail.com> parents: 34787 diff changeset	2142
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	2143 wantfiledata = updatedirstate and not branchmerge
47378 9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2144 stats, getfiledata, extraactions = applyupdates(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2145 repo,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2146 mresult,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2147 wc,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2148 p2,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2149 overwrite,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2150 wantfiledata,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45955 diff changeset	2151 labels=labels,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2152 )
26957 d16d73173fdd merge: move messages about possible conflicts a litte earlier Martin von Zweigbergk <martinvonz@google.com> parents: 26949 diff changeset	2153
42472 87a34c767384 merge: fix race that could cause wrong size in dirstate Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 42431 diff changeset	2154 if updatedirstate:
47378 9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2155 if extraactions:
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	2156 for k, acts in extraactions.items():
47378 9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2157 for a in acts:
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2158 mresult.addfile(a[0], k, *a[1:])
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2159 if k == mergestatemod.ACTION_GET and wantfiledata:
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2160 # no filedata until mergestate is updated to provide it
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2161 for a in acts:
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2162 getfiledata[a[0]] = None
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2163
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2164 assert len(getfiledata) == (
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2165 mresult.len((mergestatemod.ACTION_GET,)) if wantfiledata else 0
9e6e12e1a87e merge: make applyupdates() not mutate mresult argument Martin von Zweigbergk <martinvonz@google.com> parents: 47055 diff changeset	2166 )
50023 7a8bfc05b691 dirstate: rename parentchange to changing_parents Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50022 diff changeset	2167 with repo.dirstate.changing_parents(repo):
48428 6dc3dc5e9636 update: filter the ambiguous mtime in update directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48425 diff changeset	2168 if getfiledata:
52082 f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2169 getfiledata = filter_ambiguous_files(repo, getfiledata)
48428 6dc3dc5e9636 update: filter the ambiguous mtime in update directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48425 diff changeset	2170
32390 c568c187102f merge: migrate to context manager for changing dirstate parents Augie Fackler <augie@google.com> parents: 32286 diff changeset	2171 repo.setparents(fp1, fp2)
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	2172 mergestatemod.recordupdates(
45355 b9b055f15035 merge: pass mergeresult obj instead of actions in applyupdates() (API) Pulkit Goyal <7895pulkit@gmail.com> parents: 45354 diff changeset	2173 repo, mresult.actionsdict, branchmerge, getfiledata
44915 b7808443ed6a mergestate: split out merge state handling code from main merge module Augie Fackler <augie@google.com> parents: 44688 diff changeset	2174 )
32390 c568c187102f merge: migrate to context manager for changing dirstate parents Augie Fackler <augie@google.com> parents: 32286 diff changeset	2175 # update completed, clear state
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2176 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	2177
32390 c568c187102f merge: migrate to context manager for changing dirstate parents Augie Fackler <augie@google.com> parents: 32286 diff changeset	2178 if not branchmerge:
50260 e60f9168263c branch: pass current transaction when writing branch in merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50023 diff changeset	2179 repo.dirstate.setbranch(
e60f9168263c branch: pass current transaction when writing branch in merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50023 diff changeset	2180 p2.branch(), repo.currenttransaction()
e60f9168263c branch: pass current transaction when writing branch in merge Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50023 diff changeset	2181 )
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10431 diff changeset	2182
47609 c8d6e23fb14a sparse: adjust the temporary includes within a `parentchange` context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47378 diff changeset	2183 # If we're updating to a location, clean up any stale temporary includes
c8d6e23fb14a sparse: adjust the temporary includes within a `parentchange` context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47378 diff changeset	2184 # (ex: this happens during hg rebase --abort).
c8d6e23fb14a sparse: adjust the temporary includes within a `parentchange` context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47378 diff changeset	2185 if not branchmerge:
c8d6e23fb14a sparse: adjust the temporary includes within a `parentchange` context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47378 diff changeset	2186 sparse.prunetemporaryincludes(repo)
33321 d09e948dc303 sparse: move pruning of temporary includes into core Gregory Szorc <gregory.szorc@gmail.com> parents: 33311 diff changeset	2187
44235 ff22c76825b9 merge: don't call update hook when using in-memory context Martin von Zweigbergk <martinvonz@google.com> parents: 44092 diff changeset	2188 if updatedirstate:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2189 repo.hook(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2190 b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2191 )
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10431 diff changeset	2192 return stats
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2193
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2194
52082 f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2195 # filename -> (mode, size, timestamp)
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2196 FileData = Dict[bytes, Optional[Tuple[int, int, Optional[timestamp.timestamp]]]]
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2197
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2198
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2199 def filter_ambiguous_files(repo, file_data: FileData) -> Optional[FileData]:
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2200 """We've gathered "cache" information for the clean files while updating
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2201 them: their mtime, size and mode.
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2202
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2203 At the time this comment is written, there are various issues with how we
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2204 gather the `mode` and `mtime` information (see the comment in `batchget`).
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2205
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2206 We are going to smooth one of these issues here: mtime ambiguity.
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2207
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2208 i.e. even if the mtime gathered during `batchget` was correct[1] a change
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2209 happening right after it could change the content while keeping
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2210 the same mtime[2].
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2211
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2212 When we reach the current code, the "on disk" part of the update operation
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2213 is finished. We still assume that no other process raced that "on disk"
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2214 part, but we want to at least prevent later file changes to alter the
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2215 contents of the file right after the update operation so quickly that the
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2216 same mtime is recorded for the operation.
52083 b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2217
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2218 To prevent such ambiguities from happenning, we will do (up to) two things:
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2219 - wait until the filesystem clock has ticked
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2220 - only keep the "file data" for files with mtimes that are strictly in
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2221 the past, i.e. whose mtime is strictly lower than the current time.
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2222
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2223 We only wait for the system clock to tick if using dirstate-v2, since v1
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2224 only has second-level granularity and waiting for a whole second is
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2225 too much of a penalty in the general case.
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2226
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2227 Although we're assuming that people running dirstate-v2 on Linux
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2228 don't have a second-granularity FS (with the exclusion of NFS), users
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2229 can be surprising, and at some point in the future, dirstate-v2 will become
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2230 the default. To that end, we limit the wait time to 100ms and fall back
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2231 to the filtering method in case of a timeout.
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2232
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2233 +------------+------+--------------+
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2234 \| version \| wait \| filter level \|
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2235 +------------+------+--------------+
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2236 \| V1 \| No \| Second \|
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2237 \| V2 \| Yes \| Nanosecond \|
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2238 \| V2-slow-fs \| No \| Second \|
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2239 +------------+------+--------------+
52082 f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2240
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2241 This protects us from race conditions from operations that could run right
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2242 after this one, especially other Mercurial operations that could be waiting
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2243 for the wlock to touch files contents and the dirstate.
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2244
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2245 In an ideal world, we could only get reliable information in `getfiledata`
52083 b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2246 (from `getbatch`), however this filtering approach has been a successful
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2247 compromise for many years. A patch series of the linux kernel might change
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2248 this in 6.12³.
52082 f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2249
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2250 At the time this comment is written, not using any "cache" file data at all
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2251 here would not be viable, as it would result is a very large amount of work
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2252 (equivalent to the previous `hg update` during the next status after an
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2253 update).
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2254
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2255 [1] the current code cannot grantee that the `mtime` and `mode`
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2256 are correct, but the result is "okay in practice".
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2257 (see the comment in `batchget`)
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2258
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2259 [2] using nano-second precision can greatly help here because it makes the
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2260 "different write with same mtime" issue virtually vanish. However,
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2261 dirstate v1 cannot store such precision and a bunch of python-runtime,
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2262 operating-system and filesystem parts do not provide us with such
52083 b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2263 precision, so we have to operate as if it wasn't available.
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2264
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2265 [3] https://lore.kernel.org/all/20241002-mgtime-v10-8-d1c4717f5284@kernel.org
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2266 """
52082 f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2267 ambiguous_mtime: FileData = {}
52083 b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2268 dirstate_v2 = repo.dirstate._use_dirstate_v2
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2269 fs_now_result = None
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2270 fast_enough_fs = True
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2271 if dirstate_v2:
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2272 fstype = util.getfstype(repo.vfs.base)
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2273 # Exclude NFS right off the bat
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2274 fast_enough_fs = fstype != b'nfs'
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2275 if fstype is not None and fast_enough_fs:
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2276 fs_now_result = timestamp.wait_until_fs_tick(repo.vfs)
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2277
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2278 if fs_now_result is None:
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2279 try:
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2280 now = timestamp.get_fs_now(repo.vfs)
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2281 fs_now_result = (now, False)
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2282 except OSError:
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2283 pass
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2284
52082 f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2285 if fs_now_result is None:
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2286 # we can't write to the FS, so we won't actually update
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2287 # the dirstate content anyway, no need to put cache
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2288 # information.
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2289 return None
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2290 else:
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2291 now, timed_out = fs_now_result
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2292 if timed_out:
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2293 fast_enough_fs = False
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2294 for f, m in file_data.items():
52083 b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2295 if m is not None:
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2296 reliable = timestamp.make_mtime_reliable(m[2], now)
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2297 if reliable is None or (
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2298 reliable[2] and (not dirstate_v2 or not fast_enough_fs)
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2299 ):
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2300 # Either it's not reliable, or it's second ambiguous
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2301 # and we're in dirstate-v1 or in a slow fs, so discard
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2302 # the mtime.
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2303 ambiguous_mtime[f] = (m[0], m[1], None)
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2304 elif reliable[2]:
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2305 # We need to remember that this time is "second ambiguous"
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2306 # otherwise the next status might miss a subsecond change
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2307 # if its "stat" doesn't provide nanoseconds.
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2308 #
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2309 # TODO make osutil.c understand nanoseconds when possible
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2310 # (see timestamp.py for the same note)
b332ae615714 merge: improve working-copy mtime race handling Rapha?l Gom?s <rgomes@octobus.net> parents: 52082 diff changeset	2311 ambiguous_mtime[f] = (m[0], m[1], reliable)
52082 f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2312 for f, m in ambiguous_mtime.items():
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2313 file_data[f] = m
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2314 return file_data
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2315
f5742367a279 merge: move the filtering of ambiguous files to a dedicated function Rapha?l Gom?s <rgomes@octobus.net> parents: 51901 diff changeset	2316
44430 a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2317 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: 44425 diff changeset	2318 """Merge another topological branch into the working copy.
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2319
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2320 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: 44425 diff changeset	2321 """
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2322
45563 2c86b9587740 merge: make low-level update() private (API) Martin von Zweigbergk <martinvonz@google.com> parents: 45550 diff changeset	2323 return _update(
44430 a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2324 ctx.repo(),
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2325 ctx.rev(),
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2326 labels=labels,
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2327 branchmerge=True,
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2328 force=force,
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2329 mergeforce=force,
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2330 wc=wc,
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2331 )
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2332
a45ffad9ae98 merge: introduce a merge() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44425 diff changeset	2333
45579 c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2334 def update(ctx, updatecheck=None, wc=None):
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2335 """Do a regular update to the given commit, aborting if there are conflicts.
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2336
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2337 The 'updatecheck' argument can be used to control what to do in case of
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2338 conflicts.
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2339
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2340 Note: This is a new, higher-level update() than the one that used to exist
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2341 in this module. That function is now called _update(). You can hopefully
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2342 replace your callers to use this new update(), or clean_update(), merge(),
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2343 revert_to(), or graft().
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2344 """
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2345 return _update(
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2346 ctx.repo(),
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2347 ctx.rev(),
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2348 branchmerge=False,
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2349 force=False,
48612 7e503eff3c76 update: set custom conflict label for base commit Martin von Zweigbergk <martinvonz@google.com> parents: 48489 diff changeset	2350 labels=[b'working copy', b'destination', b'working copy parent'],
45579 c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2351 updatecheck=updatecheck,
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2352 wc=wc,
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2353 )
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2354
c1b603cdc95a merge: add a higher-level update() for the common `hg update` use case Martin von Zweigbergk <martinvonz@google.com> parents: 45563 diff changeset	2355
44317 f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44289 diff changeset	2356 def clean_update(ctx, wc=None):
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44289 diff changeset	2357 """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: 44289 diff changeset	2358
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44289 diff changeset	2359 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: 44289 diff changeset	2360 working copy.
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44289 diff changeset	2361 """
45563 2c86b9587740 merge: make low-level update() private (API) Martin von Zweigbergk <martinvonz@google.com> parents: 45550 diff changeset	2362 return _update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc)
44317 f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44289 diff changeset	2363
f546d2170b0f merge: introduce a clean_update() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44289 diff changeset	2364
44318 c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2365 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: 44317 diff changeset	2366 """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: 44317 diff changeset	2367
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2368 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: 44317 diff changeset	2369 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: 44317 diff changeset	2370 """
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2371
45563 2c86b9587740 merge: make low-level update() private (API) Martin von Zweigbergk <martinvonz@google.com> parents: 45550 diff changeset	2372 return _update(
44318 c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2373 ctx.repo(),
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2374 ctx.rev(),
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2375 branchmerge=False,
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2376 force=True,
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2377 updatedirstate=False,
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2378 matcher=matcher,
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2379 wc=wc,
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2380 )
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2381
c791ed6a2154 merge: introduce a revert_to() for that use-case Martin von Zweigbergk <martinvonz@google.com> parents: 44317 diff changeset	2382
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2383 def graft(
44285 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2384 repo,
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2385 ctx,
44286 cb8b67016110 graft: default `base` argument to common case of `ctx.p1()` Martin von Zweigbergk <martinvonz@google.com> parents: 44285 diff changeset	2386 base=None,
44285 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2387 labels=None,
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2388 keepparent=False,
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2389 keepconflictparent=False,
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2390 wctx=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2391 ):
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2392 """Do a graft-like merge.
ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2393
ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2394 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	2395 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	2396 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	2397 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	2398 renames/copies appropriately.
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2399
ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2400 ctx - changeset to rebase
44286 cb8b67016110 graft: default `base` argument to common case of `ctx.p1()` Martin von Zweigbergk <martinvonz@google.com> parents: 44285 diff changeset	2401 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	2402 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	2403 keepparent - keep second parent if any
42431 127937874395 merge: correct argument name in docstring Anton Shestakov <av6@dwimlabs.net> parents: 42429 diff changeset	2404 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	2405
ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2406 """
24643 a8e6897dffbe graft: allow creating sibling grafts Durham Goode <durham@fb.com> parents: 24471 diff changeset	2407 # 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	2408 # 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	2409 # 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	2410 # 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	2411 # 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	2412 # which local deleted".
44414 218feb1a7e00 graft: always allow hg graft --base . (issue6248) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44335 diff changeset	2413 # 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: 44335 diff changeset	2414 # doesn't matter as there can't possibly be conflicts, but 1) is necessary.
44285 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2415 wctx = wctx or repo[None]
44089 bd22e90c54b3 graft: extract repo[None] to a variable Martin von Zweigbergk <martinvonz@google.com> parents: 44060 diff changeset	2416 pctx = wctx.p1()
44286 cb8b67016110 graft: default `base` argument to common case of `ctx.p1()` Martin von Zweigbergk <martinvonz@google.com> parents: 44285 diff changeset	2417 base = base or ctx.p1()
44414 218feb1a7e00 graft: always allow hg graft --base . (issue6248) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44335 diff changeset	2418 mergeancestor = (
218feb1a7e00 graft: always allow hg graft --base . (issue6248) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44335 diff changeset	2419 repo.changelog.isancestor(pctx.node(), ctx.node())
218feb1a7e00 graft: always allow hg graft --base . (issue6248) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44335 diff changeset	2420 or pctx.rev() == base.rev()
218feb1a7e00 graft: always allow hg graft --base . (issue6248) Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44335 diff changeset	2421 )
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2422
45563 2c86b9587740 merge: make low-level update() private (API) Martin von Zweigbergk <martinvonz@google.com> parents: 45550 diff changeset	2423 stats = _update(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2424 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2425 ctx.node(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2426 True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2427 True,
43814 ebfd349eac46 graft: rename `pctx` argument to `base` since that's what it is Martin von Zweigbergk <martinvonz@google.com> parents: 43807 diff changeset	2428 base.node(),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2429 mergeancestor=mergeancestor,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2430 labels=labels,
44285 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2431 wc=wctx,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2432 )
38498 d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38431 diff changeset	2433
d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38431 diff changeset	2434 if keepconflictparent and stats.unresolvedcount:
d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38431 diff changeset	2435 pother = ctx.node()
d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38431 diff changeset	2436 else:
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	2437 pother = repo.nullid
38498 d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38431 diff changeset	2438 parents = ctx.parents()
43814 ebfd349eac46 graft: rename `pctx` argument to `base` since that's what it is Martin von Zweigbergk <martinvonz@google.com> parents: 43807 diff changeset	2439 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: 43807 diff changeset	2440 parents.remove(base)
38498 d4be8ea8f22d merge: add a 'keepconflictparent' argument to graft Boris Feld <boris.feld@octobus.net> parents: 38431 diff changeset	2441 pother = parents[0].node()
43816 32d11a23c9cf graft: never set both parents equal in the dirstate (issue6098) Martin von Zweigbergk <martinvonz@google.com> parents: 43815 diff changeset	2442 # 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: 43815 diff changeset	2443 if pother == pctx.node():
47055 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46819 diff changeset	2444 pother = repo.nullid
27267 d6859d86a5d5 merge.graft: add option to keep second parent Andrew Halberstadt <ahalberstadt@mozilla.com> parents: 27137 diff changeset	2445
44285 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2446 if wctx.isinmemory():
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2447 wctx.setparents(pctx.node(), pother)
32390 c568c187102f merge: migrate to context manager for changing dirstate parents Augie Fackler <augie@google.com> parents: 32286 diff changeset	2448 # 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	2449 copies.graftcopies(wctx, ctx, base)
44285 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2450 else:
50023 7a8bfc05b691 dirstate: rename parentchange to changing_parents Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50022 diff changeset	2451 with repo.dirstate.changing_parents(repo):
44285 fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2452 repo.setparents(pctx.node(), pother)
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2453 repo.dirstate.write(repo.currenttransaction())
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2454 # fix up dirstate for copies and renames
fc7175df6359 graft: let caller pass in overlayworkingctx to merge.graft() Martin von Zweigbergk <martinvonz@google.com> parents: 44275 diff changeset	2455 copies.graftcopies(wctx, ctx, base)
22902 ce0592328d68 merge: add merge.graft helper Matt Mackall <mpm@selenic.com> parents: 22841 diff changeset	2456 return stats
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2457
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2458
45550 2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2459 def back_out(ctx, parent=None, wc=None):
2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2460 if parent is None:
2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2461 if ctx.p2() is not None:
48721 48aff31e7f4c merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48720 diff changeset	2462 msg = b"must specify parent of merge commit to back out"
48aff31e7f4c merge: break up a not-so-one-liner for readability Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48720 diff changeset	2463 raise error.ProgrammingError(msg)
45550 2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2464 parent = ctx.p1()
45563 2c86b9587740 merge: make low-level update() private (API) Martin von Zweigbergk <martinvonz@google.com> parents: 45550 diff changeset	2465 return _update(
45550 2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2466 ctx.repo(),
2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2467 parent,
2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2468 branchmerge=True,
2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2469 force=True,
2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2470 ancestor=ctx.node(),
2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2471 mergeancestor=False,
2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2472 )
2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2473
2b339c6c6e99 merge: add a back_out() function to encapsulate update() Martin von Zweigbergk <martinvonz@google.com> parents: 45531 diff changeset	2474
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2475 def purge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2476 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2477 matcher,
44335 9f8eddd2723f purge: add -i flag to delete ignored files instead of untracked files Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44333 diff changeset	2478 unknown=True,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2479 ignored=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2480 removeemptydirs=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2481 removefiles=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2482 abortonerror=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2483 noop=False,
46438 135056e8b5a8 purge: add a --confirm option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46435 diff changeset	2484 confirm=False,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42974 diff changeset	2485 ):
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2486 """Purge the working directory of untracked files.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2487
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2488 ``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	2489 potentially a subset.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2490
44335 9f8eddd2723f purge: add -i flag to delete ignored files instead of untracked files Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44333 diff changeset	2491 ``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: 44333 diff changeset	2492
9f8eddd2723f purge: add -i flag to delete ignored files instead of untracked files Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44333 diff changeset	2493 ``ignored`` controls whether ignored files should be purged.
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2494
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2495 ``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	2496
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2497 ``removefiles`` controls whether files are removed.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2498
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2499 ``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	2500 deleting a file or directory.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2501
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2502 ``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	2503 will be taken.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2504
46438 135056e8b5a8 purge: add a --confirm option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46435 diff changeset	2505 ``confirm`` ask confirmation before actually removing anything.
135056e8b5a8 purge: add a --confirm option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46435 diff changeset	2506
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2507 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	2508 or would be removed.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2509 """
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2510
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2511 def remove(removefn, path):
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2512 try:
39481 3dd34b401bc2 merge: use vfs methods for I/O Gregory Szorc <gregory.szorc@gmail.com> parents: 39480 diff changeset	2513 removefn(path)
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2514 except OSError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2515 m = _(b'%s cannot be removed') % path
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2516 if abortonerror:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2517 raise error.Abort(m)
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2518 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2519 repo.ui.warn(_(b'warning: %s\n') % m)
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2520
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2521 # 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	2522 # restore it when we're done.
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2523 oldtraversedir = matcher.traversedir
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2524
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2525 res = []
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2526
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2527 try:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2528 if removeemptydirs:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2529 directories = []
43752 95d2eab0a7b9 dirstate: include explicit matches in match.traversedir calls Martin von Zweigbergk <martinvonz@google.com> parents: 43677 diff changeset	2530 matcher.traversedir = directories.append
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2531
44335 9f8eddd2723f purge: add -i flag to delete ignored files instead of untracked files Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> parents: 44333 diff changeset	2532 status = repo.status(match=matcher, ignored=ignored, unknown=unknown)
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2533
46438 135056e8b5a8 purge: add a --confirm option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46435 diff changeset	2534 if confirm:
48894 0cc5f74ff7f0 purge: prevent a silly crash with --confirm --files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48804 diff changeset	2535 msg = None
46438 135056e8b5a8 purge: add a --confirm option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46435 diff changeset	2536 nb_ignored = len(status.ignored)
48469 fff5942d445f typo: s/unkown/unknown across the codebase Rapha?l Gom?s <rgomes@octobus.net> parents: 48428 diff changeset	2537 nb_unknown = len(status.unknown)
fff5942d445f typo: s/unkown/unknown across the codebase Rapha?l Gom?s <rgomes@octobus.net> parents: 48428 diff changeset	2538 if nb_unknown and nb_ignored:
fff5942d445f typo: s/unkown/unknown across the codebase Rapha?l Gom?s <rgomes@octobus.net> parents: 48428 diff changeset	2539 msg = _(b"permanently delete %d unknown and %d ignored files?")
fff5942d445f typo: s/unkown/unknown across the codebase Rapha?l Gom?s <rgomes@octobus.net> parents: 48428 diff changeset	2540 msg %= (nb_unknown, nb_ignored)
fff5942d445f typo: s/unkown/unknown across the codebase Rapha?l Gom?s <rgomes@octobus.net> parents: 48428 diff changeset	2541 elif nb_unknown:
fff5942d445f typo: s/unkown/unknown across the codebase Rapha?l Gom?s <rgomes@octobus.net> parents: 48428 diff changeset	2542 msg = _(b"permanently delete %d unknown files?")
fff5942d445f typo: s/unkown/unknown across the codebase Rapha?l Gom?s <rgomes@octobus.net> parents: 48428 diff changeset	2543 msg %= nb_unknown
46438 135056e8b5a8 purge: add a --confirm option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46435 diff changeset	2544 elif nb_ignored:
135056e8b5a8 purge: add a --confirm option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46435 diff changeset	2545 msg = _(b"permanently delete %d ignored files?")
135056e8b5a8 purge: add a --confirm option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46435 diff changeset	2546 msg %= nb_ignored
46439 57370e7deb7b purge: also deal with directory with --confirm Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46438 diff changeset	2547 elif removeemptydirs:
57370e7deb7b purge: also deal with directory with --confirm Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46438 diff changeset	2548 dir_count = 0
57370e7deb7b purge: also deal with directory with --confirm Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46438 diff changeset	2549 for f in directories:
57370e7deb7b purge: also deal with directory with --confirm Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46438 diff changeset	2550 if matcher(f) and not repo.wvfs.listdir(f):
57370e7deb7b purge: also deal with directory with --confirm Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46438 diff changeset	2551 dir_count += 1
57370e7deb7b purge: also deal with directory with --confirm Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46438 diff changeset	2552 if dir_count:
57370e7deb7b purge: also deal with directory with --confirm Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46438 diff changeset	2553 msg = _(
57370e7deb7b purge: also deal with directory with --confirm Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46438 diff changeset	2554 b"permanently delete at least %d empty directories?"
57370e7deb7b purge: also deal with directory with --confirm Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46438 diff changeset	2555 )
57370e7deb7b purge: also deal with directory with --confirm Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46438 diff changeset	2556 msg %= dir_count
48894 0cc5f74ff7f0 purge: prevent a silly crash with --confirm --files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48804 diff changeset	2557 if msg is None:
0cc5f74ff7f0 purge: prevent a silly crash with --confirm --files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48804 diff changeset	2558 return res
0cc5f74ff7f0 purge: prevent a silly crash with --confirm --files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48804 diff changeset	2559 else:
0cc5f74ff7f0 purge: prevent a silly crash with --confirm --files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48804 diff changeset	2560 msg += b" (yN)$$ &Yes $$ &No"
0cc5f74ff7f0 purge: prevent a silly crash with --confirm --files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48804 diff changeset	2561 if repo.ui.promptchoice(msg, default=1) == 1:
0cc5f74ff7f0 purge: prevent a silly crash with --confirm --files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48804 diff changeset	2562 raise error.CanceledError(_(b'removal cancelled'))
46438 135056e8b5a8 purge: add a --confirm option Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46435 diff changeset	2563
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2564 if removefiles:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2565 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	2566 if not noop:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2567 repo.ui.note(_(b'removing file %s\n') % f)
39481 3dd34b401bc2 merge: use vfs methods for I/O Gregory Szorc <gregory.szorc@gmail.com> parents: 39480 diff changeset	2568 remove(repo.wvfs.unlink, f)
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2569 res.append(f)
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2570
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2571 if removeemptydirs:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2572 for f in sorted(directories, reverse=True):
39481 3dd34b401bc2 merge: use vfs methods for I/O Gregory Szorc <gregory.szorc@gmail.com> parents: 39480 diff changeset	2573 if matcher(f) and not repo.wvfs.listdir(f):
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2574 if not noop:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2575 repo.ui.note(_(b'removing directory %s\n') % f)
39481 3dd34b401bc2 merge: use vfs methods for I/O Gregory Szorc <gregory.szorc@gmail.com> parents: 39480 diff changeset	2576 remove(repo.wvfs.rmdir, f)
39480 7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2577 res.append(f)
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2578
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2579 return res
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2580
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2581 finally:
7fea205fd5dc merge: move purge logic from extension Gregory Szorc <gregory.szorc@gmail.com> parents: 38757 diff changeset	2582 matcher.traversedir = oldtraversedir

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/merge.py @ 52083:b332ae615714