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

annotate mercurial/commit.py @ 46386:d6fa9fbd375d stable

commit: reorder if-else conditional to give mergestate info priority Looking at the code now, I was unable to find a good reason as why we only rely on mergestate extras info after checking whether a filelog parent is ancestor of other or not. I mean if we have stored in mergestate that `other` was chosed, we should blindly pick that one. This cleanup will also help introduce more cases when both `fparent1` and `fparent2` are non-null but using info from mergestate, we can fastpath. The test change actually demonstrates the point of the patch. During merge we were getting the other side of the file but on commit we were marking that as merged. Differential Revision: https://phab.mercurial-scm.org/D10147

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Thu, 04 Mar 2021 17:35:58 +0530
parents	89a2afe31e82
children	e2f7b2695ba1

rev	line source
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	1 # commit.py - fonction to perform commit
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	2 #
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	3 # This software may be used and distributed according to the terms of the
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	4 # GNU General Public License version 2 or any later version.
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	5
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	6 from __future__ import absolute_import
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	7
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	8 import errno
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	9
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	10 from .i18n import _
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	11 from .node import (
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	12 hex,
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	13 nullid,
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	14 nullrev,
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	15 )
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	16
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	17 from . import (
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	18 context,
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	19 mergestate,
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	20 metadata,
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	21 phases,
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	22 scmutil,
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	23 subrepoutil,
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	24 )
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	25
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	26
45260 ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	27 def _write_copy_meta(repo):
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	28 """return a (changelog, filelog) boolean tuple
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	29
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	30 changelog: copy related information should be stored in the changeset
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	31 filelof: copy related information should be written in the file revision
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	32 """
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	33 if repo.filecopiesmode == b'changeset-sidedata':
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	34 writechangesetcopy = True
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	35 writefilecopymeta = True
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	36 else:
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	37 writecopiesto = repo.ui.config(b'experimental', b'copies.write-to')
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	38 writefilecopymeta = writecopiesto != b'changeset-only'
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	39 writechangesetcopy = writecopiesto in (
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	40 b'changeset-only',
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	41 b'compatibility',
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	42 )
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	43 return writechangesetcopy, writefilecopymeta
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	44
ada51c1b6916 commitctx: move copy meta config reading in a dedicated function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45259 diff changeset	45
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	46 def commitctx(repo, ctx, error=False, origctx=None):
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	47 """Add a new revision to the target repository.
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	48 Revision information is passed via the context argument.
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	49
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	50 ctx.files() should list all files involved in this commit, i.e.
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	51 modified/added/removed files. On merge, it may be wider than the
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	52 ctx.files() to be committed, since any file nodes derived directly
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	53 from p1 or p2 are excluded from the committed ctx.files().
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	54
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	55 origctx is for convert to work around the problem that bug
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	56 fixes to the files list in changesets change hashes. For
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	57 convert to be the identity, it can pass an origctx and this
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	58 function will use the same files list when it makes sense to
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	59 do so.
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	60 """
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	61 repo = repo.unfiltered()
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	62
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	63 p1, p2 = ctx.p1(), ctx.p2()
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	64 user = ctx.user()
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	65
45265 bd7515273fd6 commitctx: gather more preparation code within the lock context Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45264 diff changeset	66 with repo.lock(), repo.transaction(b"commit") as tr:
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	67 mn, files = _prepare_files(tr, ctx, error=error, origctx=origctx)
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	68
45274 4cde23ba076e commitctx: create the new extra dict on its own line Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45273 diff changeset	69 extra = ctx.extra().copy()
4cde23ba076e commitctx: create the new extra dict on its own line Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45273 diff changeset	70
45275 b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	71 if extra is not None:
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	72 for name in (
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	73 b'p1copies',
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	74 b'p2copies',
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	75 b'filesadded',
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	76 b'filesremoved',
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	77 ):
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	78 extra.pop(name, None)
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	79 if repo.changelog._copiesstorage == b'extra':
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	80 extra = _extra_with_copies(repo, extra, files)
45275 b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	81
45756 067707e026b4 commit: don't change phases for preexisting commits Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 45715 diff changeset	82 # save the tip to check whether we actually committed anything
067707e026b4 commit: don't change phases for preexisting commits Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 45715 diff changeset	83 oldtip = repo.changelog.tiprev()
067707e026b4 commit: don't change phases for preexisting commits Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 45715 diff changeset	84
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	85 # update changelog
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	86 repo.ui.note(_(b"committing changelog\n"))
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	87 repo.changelog.delayupdate(tr)
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	88 n = repo.changelog.add(
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	89 mn,
45345 6c56277317c2 commitctx: directly pass a ChangingFiles object to changelog.add Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45344 diff changeset	90 files,
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	91 ctx.description(),
45257 5d0998ccedbb commitctx: stop using weakref proxy for transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45256 diff changeset	92 tr,
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	93 p1.node(),
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	94 p2.node(),
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	95 user,
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	96 ctx.date(),
45274 4cde23ba076e commitctx: create the new extra dict on its own line Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45273 diff changeset	97 extra,
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	98 )
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	99 xp1, xp2 = p1.hex(), p2 and p2.hex() or b''
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	100 repo.hook(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	101 b'pretxncommit',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	102 throw=True,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	103 node=hex(n),
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	104 parent1=xp1,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	105 parent2=xp2,
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	106 )
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	107 # set the new commit is proper phase
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	108 targetphase = subrepoutil.newcommitphase(repo.ui, ctx)
45756 067707e026b4 commit: don't change phases for preexisting commits Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 45715 diff changeset	109
067707e026b4 commit: don't change phases for preexisting commits Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 45715 diff changeset	110 # prevent unmarking changesets as public on recommit
067707e026b4 commit: don't change phases for preexisting commits Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 45715 diff changeset	111 waspublic = oldtip == repo.changelog.tiprev() and not repo[n].phase()
067707e026b4 commit: don't change phases for preexisting commits Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 45715 diff changeset	112
067707e026b4 commit: don't change phases for preexisting commits Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 45715 diff changeset	113 if targetphase and not waspublic:
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	114 # retract boundary do not alter parent changeset.
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	115 # if a parent have higher the resulting phase will
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	116 # be compliant anyway
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	117 #
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	118 # if minimal phase was 0 we don't need to retract anything
45813 5d65e04b6a80 phases: convert registernew users to use revision sets Joerg Sonnenberger <joerg@bec.de> parents: 45715 diff changeset	119 phases.registernew(repo, tr, targetphase, [repo[n].rev()])
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	120 return n
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	121
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	122
45266 13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	123 def _prepare_files(tr, ctx, error=False, origctx=None):
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	124 repo = ctx.repo()
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	125 p1 = ctx.p1()
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	126
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	127 writechangesetcopy, writefilecopymeta = _write_copy_meta(repo)
45708 60c46cc28bf4 commit: pass ChangingFiles object as argument to _process_files Pulkit Goyal <7895pulkit@gmail.com> parents: 45707 diff changeset	128 files = metadata.ChangingFiles()
45706 b92887ce8db4 commit: move salvaged calculation a bit earlier in the function Pulkit Goyal <7895pulkit@gmail.com> parents: 45705 diff changeset	129 ms = mergestate.mergestate.read(repo)
b92887ce8db4 commit: move salvaged calculation a bit earlier in the function Pulkit Goyal <7895pulkit@gmail.com> parents: 45705 diff changeset	130 salvaged = _get_salvaged(repo, ms, ctx)
45708 60c46cc28bf4 commit: pass ChangingFiles object as argument to _process_files Pulkit Goyal <7895pulkit@gmail.com> parents: 45707 diff changeset	131 for s in salvaged:
60c46cc28bf4 commit: pass ChangingFiles object as argument to _process_files Pulkit Goyal <7895pulkit@gmail.com> parents: 45707 diff changeset	132 files.mark_salvaged(s)
45266 13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	133
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	134 if ctx.manifestnode():
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	135 # reuse an existing manifest revision
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	136 repo.ui.debug(b'reusing known manifest\n')
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	137 mn = ctx.manifestnode()
45349 e52031f5e046 commitctx: create the ChangingFiles object directly in the various case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45348 diff changeset	138 files.update_touched(ctx.files())
45266 13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	139 if writechangesetcopy:
45349 e52031f5e046 commitctx: create the ChangingFiles object directly in the various case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45348 diff changeset	140 files.update_added(ctx.filesadded())
e52031f5e046 commitctx: create the ChangingFiles object directly in the various case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45348 diff changeset	141 files.update_removed(ctx.filesremoved())
45266 13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	142 elif not ctx.files():
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	143 repo.ui.debug(b'reusing manifest from p1 (no file change)\n')
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	144 mn = p1.manifestnode()
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	145 else:
45708 60c46cc28bf4 commit: pass ChangingFiles object as argument to _process_files Pulkit Goyal <7895pulkit@gmail.com> parents: 45707 diff changeset	146 mn = _process_files(tr, ctx, ms, files, error=error)
45266 13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	147
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	148 if origctx and origctx.manifestnode() == mn:
45349 e52031f5e046 commitctx: create the ChangingFiles object directly in the various case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45348 diff changeset	149 origfiles = origctx.files()
e52031f5e046 commitctx: create the ChangingFiles object directly in the various case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45348 diff changeset	150 assert files.touched.issubset(origfiles)
e52031f5e046 commitctx: create the ChangingFiles object directly in the various case Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45348 diff changeset	151 files.update_touched(origfiles)
45266 13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	152
45347 99614011892b commitctx: directly gather p1 and p2 copies in `files` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45345 diff changeset	153 if writechangesetcopy:
99614011892b commitctx: directly gather p1 and p2 copies in `files` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45345 diff changeset	154 files.update_copies_from_p1(ctx.p1copies())
99614011892b commitctx: directly gather p1 and p2 copies in `files` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45345 diff changeset	155 files.update_copies_from_p2(ctx.p2copies())
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	156
45705 61454026fa04 commit: refactor salvage calculation to a different function Pulkit Goyal <7895pulkit@gmail.com> parents: 45662 diff changeset	157 return mn, files
61454026fa04 commit: refactor salvage calculation to a different function Pulkit Goyal <7895pulkit@gmail.com> parents: 45662 diff changeset	158
61454026fa04 commit: refactor salvage calculation to a different function Pulkit Goyal <7895pulkit@gmail.com> parents: 45662 diff changeset	159
61454026fa04 commit: refactor salvage calculation to a different function Pulkit Goyal <7895pulkit@gmail.com> parents: 45662 diff changeset	160 def _get_salvaged(repo, ms, ctx):
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	161 """returns a list of salvaged files
45705 61454026fa04 commit: refactor salvage calculation to a different function Pulkit Goyal <7895pulkit@gmail.com> parents: 45662 diff changeset	162
61454026fa04 commit: refactor salvage calculation to a different function Pulkit Goyal <7895pulkit@gmail.com> parents: 45662 diff changeset	163 returns empty list if config option which process salvaged files are
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	164 not enabled"""
45705 61454026fa04 commit: refactor salvage calculation to a different function Pulkit Goyal <7895pulkit@gmail.com> parents: 45662 diff changeset	165 salvaged = []
61454026fa04 commit: refactor salvage calculation to a different function Pulkit Goyal <7895pulkit@gmail.com> parents: 45662 diff changeset	166 copy_sd = repo.filecopiesmode == b'changeset-sidedata'
45662 64a4b85c4a00 salvaged: record salvaged in ChangingFiles at commit time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45615 diff changeset	167 if copy_sd and len(ctx.parents()) > 1:
64a4b85c4a00 salvaged: record salvaged in ChangingFiles at commit time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45615 diff changeset	168 if ms.active():
45715 0428978bca22 mergestate: add `allextras()` to get all extras Pulkit Goyal <7895pulkit@gmail.com> parents: 45708 diff changeset	169 for fname in sorted(ms.allextras().keys()):
45662 64a4b85c4a00 salvaged: record salvaged in ChangingFiles at commit time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45615 diff changeset	170 might_removed = ms.extras(fname).get(b'merge-removal-candidate')
64a4b85c4a00 salvaged: record salvaged in ChangingFiles at commit time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45615 diff changeset	171 if might_removed == b'yes':
64a4b85c4a00 salvaged: record salvaged in ChangingFiles at commit time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45615 diff changeset	172 if fname in ctx:
45705 61454026fa04 commit: refactor salvage calculation to a different function Pulkit Goyal <7895pulkit@gmail.com> parents: 45662 diff changeset	173 salvaged.append(fname)
61454026fa04 commit: refactor salvage calculation to a different function Pulkit Goyal <7895pulkit@gmail.com> parents: 45662 diff changeset	174 return salvaged
45266 13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	175
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	176
45708 60c46cc28bf4 commit: pass ChangingFiles object as argument to _process_files Pulkit Goyal <7895pulkit@gmail.com> parents: 45707 diff changeset	177 def _process_files(tr, ctx, ms, files, error=False):
45263 0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	178 repo = ctx.repo()
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	179 p1 = ctx.p1()
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	180 p2 = ctx.p2()
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	181
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	182 writechangesetcopy, writefilecopymeta = _write_copy_meta(repo)
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	183
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	184 m1ctx = p1.manifestctx()
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	185 m2ctx = p2.manifestctx()
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	186 mctx = m1ctx.copy()
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	187
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	188 m = mctx.read()
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	189 m1 = m1ctx.read()
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	190 m2 = m2ctx.read()
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	191
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	192 # check in files
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	193 added = []
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	194 removed = list(ctx.removed())
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	195 linkrev = len(repo)
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	196 repo.ui.note(_(b"committing files:\n"))
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	197 uipathfn = scmutil.getuipathfn(repo)
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	198 for f in sorted(ctx.modified() + ctx.added()):
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	199 repo.ui.note(uipathfn(f) + b"\n")
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	200 try:
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	201 fctx = ctx[f]
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	202 if fctx is None:
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	203 removed.append(f)
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	204 else:
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	205 added.append(f)
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	206 m[f], is_touched = _filecommit(
45454 037e88d453fa commit: pass mergestate into _filecommit() instead of re-reading it Pulkit Goyal <7895pulkit@gmail.com> parents: 45443 diff changeset	207 repo, fctx, m1, m2, linkrev, tr, writefilecopymeta, ms
45263 0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	208 )
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	209 if is_touched:
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	210 if is_touched == 'added':
45353 54eeb1a0e325 commitctx: directly update the touched and added set of files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45352 diff changeset	211 files.mark_added(f)
45615 094a91a183f1 changing-files: record merged files at commit time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45588 diff changeset	212 elif is_touched == 'merged':
094a91a183f1 changing-files: record merged files at commit time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45588 diff changeset	213 files.mark_merged(f)
45353 54eeb1a0e325 commitctx: directly update the touched and added set of files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45352 diff changeset	214 else:
54eeb1a0e325 commitctx: directly update the touched and added set of files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45352 diff changeset	215 files.mark_touched(f)
45263 0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	216 m.setflag(f, fctx.flags())
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	217 except OSError:
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	218 repo.ui.warn(_(b"trouble committing %s!\n") % uipathfn(f))
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	219 raise
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	220 except IOError as inst:
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	221 errcode = getattr(inst, 'errno', errno.ENOENT)
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	222 if error or errcode and errcode != errno.ENOENT:
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	223 repo.ui.warn(_(b"trouble committing %s!\n") % uipathfn(f))
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	224 raise
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	225
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	226 # update manifest
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	227 removed = [f for f in removed if f in m1 or f in m2]
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	228 drop = sorted([f for f in removed if f in m])
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	229 for f in drop:
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	230 del m[f]
45352 027f3dd76302 commitctx: directly updated the set of removed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45351 diff changeset	231 if p2.rev() == nullrev:
027f3dd76302 commitctx: directly updated the set of removed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45351 diff changeset	232 files.update_removed(removed)
027f3dd76302 commitctx: directly updated the set of removed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45351 diff changeset	233 else:
45263 0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	234 rf = metadata.get_removal_filter(ctx, (p1, p2, m1, m2))
45352 027f3dd76302 commitctx: directly updated the set of removed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45351 diff changeset	235 for f in removed:
027f3dd76302 commitctx: directly updated the set of removed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45351 diff changeset	236 if not rf(f):
027f3dd76302 commitctx: directly updated the set of removed files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45351 diff changeset	237 files.mark_removed(f)
45263 0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	238
45351 a852e5058e69 commitctx: create the `ChangingFiles` object sooner Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45350 diff changeset	239 mn = _commit_manifest(tr, linkrev, ctx, mctx, m, files.touched, added, drop)
45350 dcbad0f17d76 commitctx: move ChangingFiles creation directly inside `_process_files` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45349 diff changeset	240
45708 60c46cc28bf4 commit: pass ChangingFiles object as argument to _process_files Pulkit Goyal <7895pulkit@gmail.com> parents: 45707 diff changeset	241 return mn
45263 0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	242
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	243
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	244 def _filecommit(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	245 repo,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	246 fctx,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	247 manifest1,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	248 manifest2,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	249 linkrev,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	250 tr,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	251 includecopymeta,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45817 diff changeset	252 ms,
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	253 ):
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	254 """
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	255 commit an individual file as part of a larger transaction
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	256
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	257 input:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	258
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	259 fctx: a file context with the content we are trying to commit
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	260 manifest1: manifest of changeset first parent
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	261 manifest2: manifest of changeset second parent
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	262 linkrev: revision number of the changeset being created
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	263 tr: current transation
45443 f52b0297acc8 commit: fix a wrong argument name in documentation Pulkit Goyal <7895pulkit@gmail.com> parents: 45402 diff changeset	264 includecopymeta: boolean, set to False to skip storing the copy data
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	265 (only used by the Google specific feature of using
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	266 changeset extra as copy source of truth).
45454 037e88d453fa commit: pass mergestate into _filecommit() instead of re-reading it Pulkit Goyal <7895pulkit@gmail.com> parents: 45443 diff changeset	267 ms: mergestate object
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	268
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	269 output: (filenode, touched)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	270
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	271 filenode: the filenode that should be used by this changeset
45256 d056a131c93f commitctx: document the None return for "touched" value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45240 diff changeset	272 touched: one of: None (mean untouched), 'added' or 'modified'
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	273 """
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	274
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	275 fname = fctx.path()
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	276 fparent1 = manifest1.get(fname, nullid)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	277 fparent2 = manifest2.get(fname, nullid)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	278 touched = None
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	279 if fparent1 == fparent2 == nullid:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	280 touched = 'added'
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	281
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	282 if isinstance(fctx, context.filectx):
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	283 # This block fast path most comparisons which are usually done. It
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	284 # assumes that bare filectx is used and no merge happened, hence no
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	285 # need to create a new file revision in this case.
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	286 node = fctx.filenode()
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	287 if node in [fparent1, fparent2]:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	288 repo.ui.debug(b'reusing %s filelog entry\n' % fname)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	289 if (
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	290 fparent1 != nullid and manifest1.flags(fname) != fctx.flags()
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	291 ) or (
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	292 fparent2 != nullid and manifest2.flags(fname) != fctx.flags()
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	293 ):
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	294 touched = 'modified'
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	295 return node, touched
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	296
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	297 flog = repo.file(fname)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	298 meta = {}
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	299 cfname = fctx.copysource()
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	300 fnode = None
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	301
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	302 if cfname and cfname != fname:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	303 # Mark the new revision of this file as a copy of another
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	304 # file. This copy data will effectively act as a parent
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	305 # of this new revision. If this is a merge, the first
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	306 # parent will be the nullid (meaning "look up the copy data")
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	307 # and the second one will be the other parent. For example:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	308 #
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	309 # 0 --- 1 --- 3 rev1 changes file foo
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	310 # \ / rev2 renames foo to bar and changes it
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	311 # \- 2 -/ rev3 should have bar with all changes and
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	312 # should record that bar descends from
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	313 # bar in rev2 and foo in rev1
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	314 #
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	315 # this allows this merge to succeed:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	316 #
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	317 # 0 --- 1 --- 3 rev4 reverts the content change from rev2
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	318 # \ / merging rev3 and rev4 should use bar@rev2
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	319 # \- 2 --- 4 as the merge base
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	320 #
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	321
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	322 cnode = manifest1.get(cfname)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	323 newfparent = fparent2
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	324
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	325 if manifest2: # branch merge
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	326 if fparent2 == nullid or cnode is None: # copied on remote side
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	327 if cfname in manifest2:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	328 cnode = manifest2[cfname]
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	329 newfparent = fparent1
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	330
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	331 # Here, we used to search backwards through history to try to find
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	332 # where the file copy came from if the source of a copy was not in
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	333 # the parent directory. However, this doesn't actually make sense to
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	334 # do (what does a copy from something not in your working copy even
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	335 # mean?) and it causes bugs (eg, issue4476). Instead, we will warn
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	336 # the user that copy information was dropped, so if they didn't
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	337 # expect this outcome it can be fixed, but this is the correct
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	338 # behavior in this circumstance.
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	339
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	340 if cnode:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	341 repo.ui.debug(b" %s: copy %s:%s\n" % (fname, cfname, hex(cnode)))
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	342 if includecopymeta:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	343 meta[b"copy"] = cfname
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	344 meta[b"copyrev"] = hex(cnode)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	345 fparent1, fparent2 = nullid, newfparent
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	346 else:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	347 repo.ui.warn(
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	348 _(
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	349 b"warning: can't find ancestor for '%s' "
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	350 b"copied from '%s'!\n"
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	351 )
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	352 % (fname, cfname)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	353 )
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	354
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	355 elif fparent1 == nullid:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	356 fparent1, fparent2 = fparent2, nullid
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	357 elif fparent2 != nullid:
46386 d6fa9fbd375d commit: reorder if-else conditional to give mergestate info priority Pulkit Goyal <7895pulkit@gmail.com> parents: 45957 diff changeset	358 if ms.active() and ms.extras(fname).get(b'filenode-source') == b'other':
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	359 fparent1, fparent2 = fparent2, nullid
46386 d6fa9fbd375d commit: reorder if-else conditional to give mergestate info priority Pulkit Goyal <7895pulkit@gmail.com> parents: 45957 diff changeset	360 # is one parent an ancestor of the other?
d6fa9fbd375d commit: reorder if-else conditional to give mergestate info priority Pulkit Goyal <7895pulkit@gmail.com> parents: 45957 diff changeset	361 else:
d6fa9fbd375d commit: reorder if-else conditional to give mergestate info priority Pulkit Goyal <7895pulkit@gmail.com> parents: 45957 diff changeset	362 fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
d6fa9fbd375d commit: reorder if-else conditional to give mergestate info priority Pulkit Goyal <7895pulkit@gmail.com> parents: 45957 diff changeset	363 if fparent1 in fparentancestors:
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	364 fparent1, fparent2 = fparent2, nullid
46386 d6fa9fbd375d commit: reorder if-else conditional to give mergestate info priority Pulkit Goyal <7895pulkit@gmail.com> parents: 45957 diff changeset	365 elif fparent2 in fparentancestors:
d6fa9fbd375d commit: reorder if-else conditional to give mergestate info priority Pulkit Goyal <7895pulkit@gmail.com> parents: 45957 diff changeset	366 fparent2 = nullid
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	367
45588 479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	368 force_new_node = False
479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	369 # The file might have been deleted by merge code and user explicitly choose
479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	370 # to revert the file and keep it. The other case can be where there is
479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	371 # change-delete or delete-change conflict and user explicitly choose to keep
479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	372 # the file. The goal is to create a new filenode for users explicit choices
479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	373 if (
479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	374 repo.ui.configbool(b'experimental', b'merge-track-salvaged')
479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	375 and ms.active()
479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	376 and ms.extras(fname).get(b'merge-removal-candidate') == b'yes'
479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	377 ):
479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	378 force_new_node = True
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	379 # is the file changed?
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	380 text = fctx.data()
45588 479cce8c9882 commit: force create a new filenode if it was set in mergestate by merge Pulkit Goyal <7895pulkit@gmail.com> parents: 45454 diff changeset	381 if fparent2 != nullid or meta or flog.cmp(fparent1, text) or force_new_node:
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	382 if touched is None: # do not overwrite added
45615 094a91a183f1 changing-files: record merged files at commit time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45588 diff changeset	383 if fparent2 == nullid:
094a91a183f1 changing-files: record merged files at commit time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45588 diff changeset	384 touched = 'modified'
094a91a183f1 changing-files: record merged files at commit time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45588 diff changeset	385 else:
094a91a183f1 changing-files: record merged files at commit time Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45588 diff changeset	386 touched = 'merged'
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	387 fnode = flog.add(text, meta, tr, linkrev, fparent1, fparent2)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	388 # are just the flags changed during merge?
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	389 elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	390 touched = 'modified'
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	391 fnode = fparent1
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	392 else:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	393 fnode = fparent1
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	394 return fnode, touched
45258 f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	395
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	396
45273 e15416c95b25 commitctx: explicitly pass `manifest` to _commit_manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45266 diff changeset	397 def _commit_manifest(tr, linkrev, ctx, mctx, manifest, files, added, drop):
45258 f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	398 """make a new manifest entry (or reuse a new one)
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	399
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	400 given an initialised manifest context and precomputed list of
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	401 - files: files affected by the commit
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	402 - added: new entries in the manifest
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	403 - drop: entries present in parents but absent of this one
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	404
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	405 Create a new manifest revision, reuse existing ones if possible.
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	406
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	407 Return the nodeid of the manifest revision.
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	408 """
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	409 repo = ctx.repo()
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	410
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	411 md = None
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	412
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	413 # all this is cached, so it is find to get them all from the ctx.
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	414 p1 = ctx.p1()
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	415 p2 = ctx.p2()
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	416 m1ctx = p1.manifestctx()
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	417
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	418 m1 = m1ctx.read()
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	419
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	420 if not files:
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	421 # if no "files" actually changed in terms of the changelog,
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	422 # try hard to detect unmodified manifest entry so that the
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	423 # exact same commit can be reproduced later on convert.
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	424 md = m1.diff(manifest, scmutil.matchfiles(repo, ctx.files()))
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	425 if not files and md:
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	426 repo.ui.debug(
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	427 b'not reusing manifest (no file change in '
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	428 b'changelog, but manifest differs)\n'
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	429 )
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	430 if files or md:
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	431 repo.ui.note(_(b"committing manifest\n"))
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	432 # we're using narrowmatch here since it's already applied at
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	433 # other stages (such as dirstate.walk), so we're already
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	434 # ignoring things outside of narrowspec in most cases. The
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	435 # one case where we might have files outside the narrowspec
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	436 # at this point is merges, and we already error out in the
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	437 # case where the merge has files outside of the narrowspec,
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	438 # so this is safe.
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	439 mn = mctx.write(
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	440 tr,
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	441 linkrev,
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	442 p1.manifestnode(),
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	443 p2.manifestnode(),
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	444 added,
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	445 drop,
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	446 match=repo.narrowmatch(),
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	447 )
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	448 else:
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	449 repo.ui.debug(
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	450 b'reusing manifest from p1 (listed files ' b'actually unchanged)\n'
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	451 )
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	452 mn = p1.manifestnode()
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	453
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	454 return mn
45275 b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	455
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	456
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	457 def _extra_with_copies(repo, extra, files):
45275 b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	458 """encode copy information into a `extra` dictionnary"""
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	459 p1copies = files.copied_from_p1
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	460 p2copies = files.copied_from_p2
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	461 filesadded = files.added
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	462 filesremoved = files.removed
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	463 files = sorted(files.touched)
45277 0041a42c6f28 commitctx: gather more code dealing with copy-in-extra Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45276 diff changeset	464 if not _write_copy_meta(repo)[1]:
0041a42c6f28 commitctx: gather more code dealing with copy-in-extra Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45276 diff changeset	465 # If writing only to changeset extras, use None to indicate that
0041a42c6f28 commitctx: gather more code dealing with copy-in-extra Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45276 diff changeset	466 # no entry should be written. If writing to both, write an empty
0041a42c6f28 commitctx: gather more code dealing with copy-in-extra Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45276 diff changeset	467 # entry to prevent the reader from falling back to reading
0041a42c6f28 commitctx: gather more code dealing with copy-in-extra Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45276 diff changeset	468 # filelogs.
0041a42c6f28 commitctx: gather more code dealing with copy-in-extra Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45276 diff changeset	469 p1copies = p1copies or None
0041a42c6f28 commitctx: gather more code dealing with copy-in-extra Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45276 diff changeset	470 p2copies = p2copies or None
0041a42c6f28 commitctx: gather more code dealing with copy-in-extra Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45276 diff changeset	471 filesadded = filesadded or None
0041a42c6f28 commitctx: gather more code dealing with copy-in-extra Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45276 diff changeset	472 filesremoved = filesremoved or None
0041a42c6f28 commitctx: gather more code dealing with copy-in-extra Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45276 diff changeset	473
45275 b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	474 extrasentries = p1copies, p2copies, filesadded, filesremoved
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	475 if extra is None and any(x is not None for x in extrasentries):
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	476 extra = {}
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	477 if p1copies is not None:
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	478 p1copies = metadata.encodecopies(files, p1copies)
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	479 extra[b'p1copies'] = p1copies
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	480 if p2copies is not None:
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	481 p2copies = metadata.encodecopies(files, p2copies)
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	482 extra[b'p2copies'] = p2copies
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	483 if filesadded is not None:
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	484 filesadded = metadata.encodefileindices(files, filesadded)
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	485 extra[b'filesadded'] = filesadded
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	486 if filesremoved is not None:
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	487 filesremoved = metadata.encodefileindices(files, filesremoved)
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	488 extra[b'filesremoved'] = filesremoved
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	489 return extra

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/commit.py @ 46386:d6fa9fbd375d stable