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

annotate mercurial/commit.py @ 45344:aea6a812f7cb

commitctx: return a richer object from _prepare_files Instead of returning a lot of different list, we introduce a rich object that hold all the file related information. The unique object help with data consistency and simply functions arguments and return. In the rest of this series we will increase usage of this object to simplify more code.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Sat, 25 Jul 2020 15:49:12 +0200
parents	0041a42c6f28
children	6c56277317c2

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
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	82 # update changelog
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	83 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	84 repo.changelog.delayupdate(tr)
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	85 n = repo.changelog.add(
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	86 mn,
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	87 files.touched,
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	88 ctx.description(),
45257 5d0998ccedbb commitctx: stop using weakref proxy for transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45256 diff changeset	89 tr,
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	90 p1.node(),
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	91 p2.node(),
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	92 user,
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	93 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	94 extra,
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	95 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	96 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	97 files.added,
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	98 files.removed,
45239 ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	99 )
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	100 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	101 repo.hook(
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	102 b'pretxncommit', throw=True, node=hex(n), parent1=xp1, parent2=xp2,
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	103 )
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	104 # 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	105 targetphase = subrepoutil.newcommitphase(repo.ui, ctx)
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	106 if targetphase:
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	107 # 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	108 # 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	109 # be compliant anyway
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	110 #
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	111 # if minimal phase was 0 we don't need to retract anything
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	112 phases.registernew(repo, tr, targetphase, [n])
ae5c1a3bc339 commitctx: extract the function in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	113 return n
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	114
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	115
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	116 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	117 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	118 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	119
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	120 writechangesetcopy, writefilecopymeta = _write_copy_meta(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	121
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	122 p1copies, p2copies = None, 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	123 if writechangesetcopy:
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 p1copies = ctx.p1copies()
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 p2copies = ctx.p2copies()
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 filesadded, filesremoved = None, 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	127 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	128 # 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	129 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	130 mn = ctx.manifestnode()
45276 efe8a67793b6 commitctx: rename files to touched in a couple of place Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45275 diff changeset	131 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	132 if writechangesetcopy:
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 filesadded = ctx.filesadded()
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 filesremoved = ctx.filesremoved()
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 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	136 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	137 mn = p1.manifestnode()
45276 efe8a67793b6 commitctx: rename files to touched in a couple of place Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45275 diff changeset	138 touched = []
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 else:
45276 efe8a67793b6 commitctx: rename files to touched in a couple of place Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45275 diff changeset	140 mn, touched, added, removed = _process_files(tr, ctx, 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	141 if writechangesetcopy:
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 filesremoved = removed
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 filesadded = added
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
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 if origctx and origctx.manifestnode() == mn:
45276 efe8a67793b6 commitctx: rename files to touched in a couple of place Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45275 diff changeset	146 touched = origctx.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	147
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	148 files = metadata.ChangingFiles()
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	149 if touched:
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	150 files.update_touched(touched)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	151 if p1copies:
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	152 files.update_copies_from_p1(p1copies)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	153 if p2copies:
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	154 files.update_copies_from_p2(p2copies)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	155 if filesadded:
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	156 files.update_added(filesadded)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	157 if filesremoved:
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	158 files.update_removed(filesremoved)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	159
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	160 return mn, 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	161
13814622b3b1 commitctx: extract all the file preparation logic in a new function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45265 diff changeset	162
45263 0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	163 def _process_files(tr, ctx, error=False):
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	164 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	165 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	166 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	167
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	168 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	169
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	170 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	171 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	172 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	173
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	174 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	175 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	176 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	177
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	178 # 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	179 added = []
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	180 filesadded = []
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	181 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	182 touched = []
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	183 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	184 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	185 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	186 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	187 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	188 try:
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	189 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	190 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	191 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	192 else:
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.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	194 m[f], is_touched = _filecommit(
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	195 repo, fctx, m1, m2, linkrev, tr, writefilecopymeta,
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	196 )
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	197 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	198 touched.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	199 if is_touched == 'added':
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	200 filesadded.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	201 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	202 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	203 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	204 raise
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	205 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	206 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	207 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	208 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	209 raise
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	210
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	211 # 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	212 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	213 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	214 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	215 del m[f]
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	216 if p2.rev() != nullrev:
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	217 rf = metadata.get_removal_filter(ctx, (p1, p2, m1, m2))
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	218 removed = [f for f in removed if not rf(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
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	220 touched.extend(removed)
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	221
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	222 files = touched
45273 e15416c95b25 commitctx: explicitly pass `manifest` to _commit_manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45266 diff changeset	223 mn = _commit_manifest(tr, linkrev, ctx, mctx, m, files, added, drop)
45263 0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	224
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	225 return mn, files, filesadded, removed
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	226
0c468fef09b3 commitctx: extract all the manual logic to process the files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45262 diff changeset	227
45240 ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	228 def _filecommit(
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	229 repo, fctx, manifest1, manifest2, linkrev, tr, includecopymeta,
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	230 ):
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	231 """
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	232 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	233
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	234 input:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	235
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	236 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	237 manifest1: manifest of changeset first parent
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	238 manifest2: manifest of changeset second parent
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	239 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	240 tr: current transation
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	241 individual: boolean, set to False to skip storing the copy data
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	242 (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	243 changeset extra as copy source of truth).
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	244
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	245 output: (filenode, touched)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	246
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	247 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	248 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	249 """
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	250
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	251 fname = fctx.path()
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	252 fparent1 = manifest1.get(fname, nullid)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	253 fparent2 = manifest2.get(fname, nullid)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	254 touched = None
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	255 if fparent1 == fparent2 == nullid:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	256 touched = 'added'
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	257
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	258 if isinstance(fctx, context.filectx):
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	259 # 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	260 # 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	261 # 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	262 node = fctx.filenode()
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	263 if node in [fparent1, fparent2]:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	264 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	265 if (
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	266 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	267 ) or (
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	268 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	269 ):
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	270 touched = 'modified'
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	271 return node, touched
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	272
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	273 flog = repo.file(fname)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	274 meta = {}
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	275 cfname = fctx.copysource()
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	276 fnode = None
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	277
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	278 if cfname and cfname != fname:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	279 # 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	280 # 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	281 # 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	282 # 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	283 # 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	284 #
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	285 # 0 --- 1 --- 3 rev1 changes file foo
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	286 # \ / 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	287 # \- 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	288 # should record that bar descends from
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	289 # bar in rev2 and foo in rev1
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	290 #
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	291 # this allows this merge to succeed:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	292 #
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	293 # 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	294 # \ / 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	295 # \- 2 --- 4 as the merge base
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
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	298 cnode = manifest1.get(cfname)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	299 newfparent = fparent2
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	300
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	301 if manifest2: # branch merge
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	302 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	303 if cfname in manifest2:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	304 cnode = manifest2[cfname]
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	305 newfparent = fparent1
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	306
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	307 # 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	308 # 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	309 # 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	310 # 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	311 # 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	312 # 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	313 # 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	314 # behavior in this circumstance.
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	315
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	316 if cnode:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	317 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	318 if includecopymeta:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	319 meta[b"copy"] = cfname
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	320 meta[b"copyrev"] = hex(cnode)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	321 fparent1, fparent2 = nullid, newfparent
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	322 else:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	323 repo.ui.warn(
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 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	326 b"copied from '%s'!\n"
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	327 )
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	328 % (fname, cfname)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	329 )
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 elif fparent1 == nullid:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	332 fparent1, fparent2 = fparent2, nullid
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	333 elif fparent2 != nullid:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	334 # is one parent an ancestor of the other?
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	335 fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	336 if fparent1 in fparentancestors:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	337 fparent1, fparent2 = fparent2, nullid
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	338 elif fparent2 in fparentancestors:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	339 fparent2 = nullid
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	340 elif not fparentancestors:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	341 # TODO: this whole if-else might be simplified much more
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	342 ms = mergestate.mergestate.read(repo)
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	343 if (
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	344 fname in ms
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	345 and ms[fname] == mergestate.MERGE_RECORD_MERGED_OTHER
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	346 ):
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	347 fparent1, fparent2 = fparent2, nullid
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 # is the file changed?
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	350 text = fctx.data()
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	351 if fparent2 != nullid or meta or flog.cmp(fparent1, text):
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	352 if touched is None: # do not overwrite added
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	353 touched = 'modified'
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	354 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	355 # are just the flags changed during merge?
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	356 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	357 touched = 'modified'
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	358 fnode = fparent1
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	359 else:
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	360 fnode = fparent1
ce9ee81df9ff commitctx: extract _filecommit too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45239 diff changeset	361 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	362
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	363
45273 e15416c95b25 commitctx: explicitly pass `manifest` to _commit_manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45266 diff changeset	364 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	365 """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	366
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	367 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	368 - 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	369 - 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	370 - 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	371
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	372 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	373
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	374 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	375 """
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	376 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	377
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	378 md = None
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	379
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	380 # 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	381 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	382 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	383 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	384
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	385 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	386
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	387 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	388 # 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	389 # 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	390 # 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	391 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	392 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	393 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	394 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	395 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	396 )
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	397 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	398 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	399 # 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	400 # 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	401 # 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	402 # 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	403 # 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	404 # 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	405 # 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	406 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	407 tr,
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	408 linkrev,
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	409 p1.manifestnode(),
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	410 p2.manifestnode(),
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	411 added,
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	412 drop,
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	413 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	414 )
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	415 else:
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	416 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	417 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	418 )
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	419 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	420
f0d4d1343cb4 commitctx: extract the function that commit a new manifest Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45257 diff changeset	421 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	422
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	423
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	424 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	425 """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	426 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	427 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	428 filesadded = files.added
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	429 filesremoved = files.removed
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45277 diff changeset	430 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	431 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	432 # 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	433 # 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	434 # 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	435 # filelogs.
0041a42c6f28 commitctx: gather more code dealing with copy-in-extra Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45276 diff changeset	436 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	437 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	438 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	439 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	440
45275 b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	441 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	442 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	443 extra = {}
b3040b6739ce commitctx: extract copy information encoding into extra into commit.py Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45274 diff changeset	444 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	445 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	446 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	447 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	448 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	449 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	450 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	451 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	452 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	453 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	454 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	455 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	456 return extra

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/commit.py @ 45344:aea6a812f7cb