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

annotate mercurial/metadata.py @ 45663:cf474af69766

changing-files: split the changing files computation from encoding The side data encoding is already in its own function, now we move the changing files computation in it own function, it will receive more updates in the coming changesets. Differential Revision: https://phab.mercurial-scm.org/D9123

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Tue, 29 Sep 2020 22:19:46 +0200
parents	e66db30f95a8
children	f6811e5bd994

rev	line source
44940 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	1 # metadata.py -- code related to various metadata computation and access.
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	2 #
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	3 # Copyright 2019 Google, Inc <martinvonz@google.com>
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	4 # Copyright 2020 Pierre-Yves David <pierre-yves.david@octobus.net>
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	5 #
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	6 # This software may be used and distributed according to the terms of the
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	7 # GNU General Public License version 2 or any later version.
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	8 from __future__ import absolute_import, print_function
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	9
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	10 import multiprocessing
45634 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	11 import struct
44940 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	12
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	13 from . import (
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	14 error,
44941 edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	15 node,
44940 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	16 pycompat,
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	17 util,
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	18 )
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	19
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	20 from .revlogutils import (
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	21 flagutil as sidedataflag,
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	22 sidedata as sidedatamod,
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	23 )
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	24
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	25
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	26 class ChangingFiles(object):
45621 646a676f5365 changing-files: fix docstring Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45613 diff changeset	27 """A class recording the changes made to files by a changeset
45506 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	28
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	29 Actions performed on files are gathered into 3 sets:
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	30
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	31 - added: files actively added in the changeset.
45611 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	32 - merged: files whose history got merged
45506 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	33 - removed: files removed in the revision
45659 a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	34 - salvaged: files that might have been deleted by a merge but were not
45506 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	35 - touched: files affected by the merge
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	36
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	37 and copies information is held by 2 mappings
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	38
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	39 - copied_from_p1: {"<new-name>": "<source-name-in-p1>"} mapping for copies
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	40 - copied_from_p2: {"<new-name>": "<source-name-in-p2>"} mapping for copies
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	41
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	42 See their inline help for details.
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	43 """
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	44
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	45 def __init__(
45589 3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45571 diff changeset	46 self,
3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45571 diff changeset	47 touched=None,
3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45571 diff changeset	48 added=None,
3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45571 diff changeset	49 removed=None,
45611 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	50 merged=None,
45659 a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	51 salvaged=None,
45589 3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45571 diff changeset	52 p1_copies=None,
3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45571 diff changeset	53 p2_copies=None,
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	54 ):
45589 3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45571 diff changeset	55 self._added = set(() if added is None else added)
45611 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	56 self._merged = set(() if merged is None else merged)
45589 3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45571 diff changeset	57 self._removed = set(() if removed is None else removed)
3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45571 diff changeset	58 self._touched = set(() if touched is None else touched)
45659 a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	59 self._salvaged = set(() if salvaged is None else salvaged)
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	60 self._touched.update(self._added)
45611 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	61 self._touched.update(self._merged)
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	62 self._touched.update(self._removed)
45589 3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45571 diff changeset	63 self._p1_copies = dict(() if p1_copies is None else p1_copies)
3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45571 diff changeset	64 self._p2_copies = dict(() if p2_copies is None else p2_copies)
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	65
45507 df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45506 diff changeset	66 def __eq__(self, other):
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45506 diff changeset	67 return (
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45506 diff changeset	68 self.added == other.added
45611 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	69 and self.merged == other.merged
45507 df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45506 diff changeset	70 and self.removed == other.removed
45659 a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	71 and self.salvaged == other.salvaged
45507 df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45506 diff changeset	72 and self.touched == other.touched
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45506 diff changeset	73 and self.copied_from_p1 == other.copied_from_p1
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45506 diff changeset	74 and self.copied_from_p2 == other.copied_from_p2
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45506 diff changeset	75 )
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45506 diff changeset	76
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	77 @util.propertycache
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	78 def added(self):
45506 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	79 """files actively added in the changeset
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	80
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	81 Any file present in that revision that was absent in all the changeset's
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	82 parents.
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	83
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	84 In case of merge, this means a file absent in one of the parents but
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	85 existing in the other will not be contained in this set. (They were
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	86 added by an ancestor)
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	87 """
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	88 return frozenset(self._added)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	89
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	90 def mark_added(self, filename):
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	91 if 'added' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	92 del self.added
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	93 self._added.add(filename)
45622 42bb6c4f8106 changing-files: always use `mark_touched` to update the touched set Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45621 diff changeset	94 self.mark_touched(filename)
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	95
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	96 def update_added(self, filenames):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	97 for f in filenames:
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	98 self.mark_added(f)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	99
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	100 @util.propertycache
45611 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	101 def merged(self):
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	102 """files actively merged during a merge
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	103
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	104 Any modified files which had modification on both size that needed merging.
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	105
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	106 In this case a new filenode was created and it has two parents.
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	107 """
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	108 return frozenset(self._merged)
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	109
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	110 def mark_merged(self, filename):
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	111 if 'merged' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	112 del self.merged
45611 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	113 self._merged.add(filename)
45622 42bb6c4f8106 changing-files: always use `mark_touched` to update the touched set Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45621 diff changeset	114 self.mark_touched(filename)
45611 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	115
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	116 def update_merged(self, filenames):
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	117 for f in filenames:
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	118 self.mark_merged(f)
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45589 diff changeset	119
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	120 @util.propertycache
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	121 def removed(self):
45506 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	122 """files actively removed by the changeset
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	123
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	124 In case of merge this will only contain the set of files removing "new"
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	125 content. For any file absent in the current changeset:
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	126
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	127 a) If the file exists in both parents, it is clearly "actively" removed
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	128 by this changeset.
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	129
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	130 b) If a file exists in only one parent and in none of the common
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	131 ancestors, then the file was newly added in one of the merged branches
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	132 and then got "actively" removed.
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	133
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	134 c) If a file exists in only one parent and at least one of the common
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	135 ancestors using the same filenode, then the file was unchanged on one
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	136 side and deleted on the other side. The merge "passively" propagated
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	137 that deletion, but didn't "actively" remove the file. In this case the
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	138 file is not included in the `removed` set.
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	139
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	140 d) If a file exists in only one parent and at least one of the common
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	141 ancestors using a different filenode, then the file was changed on one
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	142 side and removed on the other side. The merge process "actively"
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	143 decided to drop the new change and delete the file. Unlike in the
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	144 previous case, (c), the file included in the `removed` set.
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	145
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	146 Summary table for merge:
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	147
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	148 case \| exists in parents \| exists in gca \|\| removed
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	149 (a) \| both \| * \|\| yes
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	150 (b) \| one \| none \|\| yes
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	151 (c) \| one \| same filenode \|\| no
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	152 (d) \| one \| new filenode \|\| yes
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	153 """
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	154 return frozenset(self._removed)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	155
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	156 def mark_removed(self, filename):
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	157 if 'removed' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	158 del self.removed
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	159 self._removed.add(filename)
45622 42bb6c4f8106 changing-files: always use `mark_touched` to update the touched set Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45621 diff changeset	160 self.mark_touched(filename)
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	161
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	162 def update_removed(self, filenames):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	163 for f in filenames:
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	164 self.mark_removed(f)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	165
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	166 @util.propertycache
45659 a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	167 def salvaged(self):
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	168 """files that might have been deleted by a merge, but still exists.
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	169
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	170 During a merge, the manifest merging might select some files for
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	171 removal, or for a removed/changed conflict. If at commit time the file
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	172 still exists, its removal was "reverted" and the file is "salvaged"
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	173 """
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	174 return frozenset(self._salvaged)
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	175
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	176 def mark_salvaged(self, filename):
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	177 if "salvaged" in vars(self):
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	178 del self.salvaged
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	179 self._salvaged.add(filename)
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	180 self.mark_touched(filename)
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	181
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	182 def update_salvaged(self, filenames):
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	183 for f in filenames:
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	184 self.mark_salvaged(f)
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	185
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45635 diff changeset	186 @util.propertycache
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	187 def touched(self):
45506 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45325 diff changeset	188 """files either actively modified, added or removed"""
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	189 return frozenset(self._touched)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	190
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	191 def mark_touched(self, filename):
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	192 if 'touched' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	193 del self.touched
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	194 self._touched.add(filename)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	195
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	196 def update_touched(self, filenames):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	197 for f in filenames:
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	198 self.mark_touched(f)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	199
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	200 @util.propertycache
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	201 def copied_from_p1(self):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	202 return self._p1_copies.copy()
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	203
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	204 def mark_copied_from_p1(self, source, dest):
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	205 if 'copied_from_p1' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	206 del self.copied_from_p1
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	207 self._p1_copies[dest] = source
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	208
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	209 def update_copies_from_p1(self, copies):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	210 for dest, source in copies.items():
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	211 self.mark_copied_from_p1(source, dest)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	212
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	213 @util.propertycache
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	214 def copied_from_p2(self):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	215 return self._p2_copies.copy()
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	216
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	217 def mark_copied_from_p2(self, source, dest):
45623 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	218 if 'copied_from_p2' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45622 diff changeset	219 del self.copied_from_p2
45323 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	220 self._p2_copies[dest] = source
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	221
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	222 def update_copies_from_p2(self, copies):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	223 for dest, source in copies.items():
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	224 self.mark_copied_from_p2(source, dest)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	225
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44942 diff changeset	226
45663 cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	227 def compute_all_files_changes(ctx):
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	228 """compute the files changed by a revision"""
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	229 filescopies = computechangesetcopies(ctx)
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	230 filesadded = computechangesetfilesadded(ctx)
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	231 filesremoved = computechangesetfilesremoved(ctx)
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	232 filesmerged = computechangesetfilesmerged(ctx)
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	233 files = ChangingFiles()
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	234 files.update_touched(ctx.files())
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	235 files.update_added(filesadded)
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	236 files.update_removed(filesremoved)
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	237 files.update_merged(filesmerged)
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	238 files.update_copies_from_p1(filescopies[0])
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	239 files.update_copies_from_p2(filescopies[1])
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	240 return files
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	241
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	242
44940 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	243 def computechangesetfilesadded(ctx):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	244 """return the list of files added in a changeset
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	245 """
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	246 added = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	247 for f in ctx.files():
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	248 if not any(f in p for p in ctx.parents()):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	249 added.append(f)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	250 return added
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	251
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	252
44941 edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	253 def get_removal_filter(ctx, x=None):
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	254 """return a function to detect files "wrongly" detected as `removed`
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	255
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	256 When a file is removed relative to p1 in a merge, this
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	257 function determines whether the absence is due to a
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	258 deletion from a parent, or whether the merge commit
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	259 itself deletes the file. We decide this by doing a
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	260 simplified three way merge of the manifest entry for
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	261 the file. There are two ways we decide the merge
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	262 itself didn't delete a file:
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	263 - neither parent (nor the merge) contain the file
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	264 - exactly one parent contains the file, and that
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	265 parent has the same filelog entry as the merge
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	266 ancestor (or all of them if there two). In other
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	267 words, that parent left the file unchanged while the
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	268 other one deleted it.
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	269 One way to think about this is that deleting a file is
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	270 similar to emptying it, so the list of changed files
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	271 should be similar either way. The computation
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	272 described above is not done directly in _filecommit
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	273 when creating the list of changed files, however
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	274 it does something very similar by comparing filelog
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	275 nodes.
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	276 """
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	277
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	278 if x is not None:
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	279 p1, p2, m1, m2 = x
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	280 else:
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	281 p1 = ctx.p1()
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	282 p2 = ctx.p2()
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	283 m1 = p1.manifest()
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	284 m2 = p2.manifest()
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	285
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	286 @util.cachefunc
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	287 def mas():
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	288 p1n = p1.node()
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	289 p2n = p2.node()
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	290 cahs = ctx.repo().changelog.commonancestorsheads(p1n, p2n)
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	291 if not cahs:
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	292 cahs = [node.nullrev]
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	293 return [ctx.repo()[r].manifest() for r in cahs]
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	294
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	295 def deletionfromparent(f):
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	296 if f in m1:
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	297 return f not in m2 and all(
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	298 f in ma and ma.find(f) == m1.find(f) for ma in mas()
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	299 )
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	300 elif f in m2:
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	301 return all(f in ma and ma.find(f) == m2.find(f) for ma in mas())
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	302 else:
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	303 return True
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	304
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	305 return deletionfromparent
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	306
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44940 diff changeset	307
44940 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	308 def computechangesetfilesremoved(ctx):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	309 """return the list of files removed in a changeset
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	310 """
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	311 removed = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	312 for f in ctx.files():
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	313 if f not in ctx:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	314 removed.append(f)
44942 25512a65cefd metadata: filter the `removed` set to only contains relevant data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44941 diff changeset	315 if removed:
25512a65cefd metadata: filter the `removed` set to only contains relevant data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44941 diff changeset	316 rf = get_removal_filter(ctx)
25512a65cefd metadata: filter the `removed` set to only contains relevant data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44941 diff changeset	317 removed = [r for r in removed if not rf(r)]
44940 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	318 return removed
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	319
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	320
45613 ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	321 def computechangesetfilesmerged(ctx):
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	322 """return the list of files merged in a changeset
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	323 """
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	324 merged = []
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	325 if len(ctx.parents()) < 2:
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	326 return merged
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	327 for f in ctx.files():
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	328 if f in ctx:
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	329 fctx = ctx[f]
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	330 parents = fctx._filelog.parents(fctx._filenode)
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	331 if parents[1] != node.nullid:
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	332 merged.append(f)
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	333 return merged
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	334
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45611 diff changeset	335
44940 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	336 def computechangesetcopies(ctx):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	337 """return the copies data for a changeset
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	338
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	339 The copies data are returned as a pair of dictionnary (p1copies, p2copies).
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	340
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	341 Each dictionnary are in the form: `{newname: oldname}`
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	342 """
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	343 p1copies = {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	344 p2copies = {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	345 p1 = ctx.p1()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	346 p2 = ctx.p2()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	347 narrowmatch = ctx._repo.narrowmatch()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	348 for dst in ctx.files():
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	349 if not narrowmatch(dst) or dst not in ctx:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	350 continue
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	351 copied = ctx[dst].renamed()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	352 if not copied:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	353 continue
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	354 src, srcnode = copied
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	355 if src in p1 and p1[src].filenode() == srcnode:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	356 p1copies[dst] = src
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	357 elif src in p2 and p2[src].filenode() == srcnode:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	358 p2copies[dst] = src
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	359 return p1copies, p2copies
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	360
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	361
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	362 def encodecopies(files, copies):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	363 items = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	364 for i, dst in enumerate(files):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	365 if dst in copies:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	366 items.append(b'%d\0%s' % (i, copies[dst]))
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	367 if len(items) != len(copies):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	368 raise error.ProgrammingError(
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	369 b'some copy targets missing from file list'
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	370 )
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	371 return b"\n".join(items)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	372
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	373
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	374 def decodecopies(files, data):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	375 try:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	376 copies = {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	377 if not data:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	378 return copies
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	379 for l in data.split(b'\n'):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	380 strindex, src = l.split(b'\0')
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	381 i = int(strindex)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	382 dst = files[i]
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	383 copies[dst] = src
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	384 return copies
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	385 except (ValueError, IndexError):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	386 # Perhaps someone had chosen the same key name (e.g. "p1copies") and
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	387 # used different syntax for the value.
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	388 return None
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	389
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	390
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	391 def encodefileindices(files, subset):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	392 subset = set(subset)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	393 indices = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	394 for i, f in enumerate(files):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	395 if f in subset:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	396 indices.append(b'%d' % i)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	397 return b'\n'.join(indices)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	398
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	399
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	400 def decodefileindices(files, data):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	401 try:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	402 subset = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	403 if not data:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	404 return subset
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	405 for strindex in data.split(b'\n'):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	406 i = int(strindex)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	407 if i < 0 or i >= len(files):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	408 return None
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	409 subset.append(files[i])
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	410 return subset
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	411 except (ValueError, IndexError):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	412 # Perhaps someone had chosen the same key name (e.g. "added") and
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	413 # used different syntax for the value.
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	414 return None
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	415
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	416
45634 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	417 # see mercurial/helptext/internals/revlogs.txt for details about the format
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	418
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	419 ACTION_MASK = int("111" "00", 2)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	420 # note: untouched file used as copy source will as `000` for this mask.
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	421 ADDED_FLAG = int("001" "00", 2)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	422 MERGED_FLAG = int("010" "00", 2)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	423 REMOVED_FLAG = int("011" "00", 2)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	424 # `100` is reserved for future use
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	425 TOUCHED_FLAG = int("101" "00", 2)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	426
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	427 COPIED_MASK = int("11", 2)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	428 COPIED_FROM_P1_FLAG = int("10", 2)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	429 COPIED_FROM_P2_FLAG = int("11", 2)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	430
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	431 # structure is <flag><filename-end><copy-source>
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	432 INDEX_HEADER = struct.Struct(">L")
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	433 INDEX_ENTRY = struct.Struct(">bLL")
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	434
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	435
45569 64d18e9e8508 sidedata: rename `encode_copies_sidedata` to `encode_files_sidedata` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45507 diff changeset	436 def encode_files_sidedata(files):
45660 e66db30f95a8 salvaged: explicitly skip salvaged file while encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45659 diff changeset	437 all_files = set(files.touched - files.salvaged)
45634 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	438 all_files.update(files.copied_from_p1.values())
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	439 all_files.update(files.copied_from_p2.values())
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	440 all_files = sorted(all_files)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	441 file_idx = {f: i for (i, f) in enumerate(all_files)}
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	442 file_idx[None] = 0
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	443
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	444 chunks = [INDEX_HEADER.pack(len(all_files))]
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	445
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	446 filename_length = 0
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	447 for f in all_files:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	448 filename_size = len(f)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	449 filename_length += filename_size
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	450 flag = 0
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	451 if f in files.added:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	452 flag \|= ADDED_FLAG
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	453 elif f in files.merged:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	454 flag \|= MERGED_FLAG
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	455 elif f in files.removed:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	456 flag \|= REMOVED_FLAG
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	457 elif f in files.touched:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	458 flag \|= TOUCHED_FLAG
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	459
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	460 copy = None
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	461 if f in files.copied_from_p1:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	462 flag \|= COPIED_FROM_P1_FLAG
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	463 copy = files.copied_from_p1.get(f)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	464 elif f in files.copied_from_p2:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	465 copy = files.copied_from_p2.get(f)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	466 flag \|= COPIED_FROM_P2_FLAG
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	467 copy_idx = file_idx[copy]
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	468 chunks.append(INDEX_ENTRY.pack(flag, filename_length, copy_idx))
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	469 chunks.extend(all_files)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	470 return {sidedatamod.SD_FILES: b''.join(chunks)}
45325 c6eea5804551 commitctx: extract sidedata encoding inside its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45323 diff changeset	471
c6eea5804551 commitctx: extract sidedata encoding inside its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45323 diff changeset	472
45635 9003e6524f78 changing-files: drop the now useless changelogrevision argument Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45634 diff changeset	473 def decode_files_sidedata(sidedata):
45634 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	474 md = ChangingFiles()
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	475 raw = sidedata.get(sidedatamod.SD_FILES)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	476
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	477 if raw is None:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	478 return md
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	479
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	480 copies = []
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	481 all_files = []
45571 7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45569 diff changeset	482
45634 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	483 assert len(raw) >= INDEX_HEADER.size
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	484 total_files = INDEX_HEADER.unpack_from(raw, 0)[0]
45571 7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45569 diff changeset	485
45634 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	486 offset = INDEX_HEADER.size
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	487 file_offset_base = offset + (INDEX_ENTRY.size * total_files)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	488 file_offset_last = file_offset_base
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	489
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	490 assert len(raw) >= file_offset_base
45571 7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45569 diff changeset	491
45634 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	492 for idx in range(total_files):
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	493 flag, file_end, copy_idx = INDEX_ENTRY.unpack_from(raw, offset)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	494 file_end += file_offset_base
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	495 filename = raw[file_offset_last:file_end]
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	496 filesize = file_end - file_offset_last
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	497 assert len(filename) == filesize
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	498 offset += INDEX_ENTRY.size
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	499 file_offset_last = file_end
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	500 all_files.append(filename)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	501 if flag & ACTION_MASK == ADDED_FLAG:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	502 md.mark_added(filename)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	503 elif flag & ACTION_MASK == MERGED_FLAG:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	504 md.mark_merged(filename)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	505 elif flag & ACTION_MASK == REMOVED_FLAG:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	506 md.mark_removed(filename)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	507 elif flag & ACTION_MASK == TOUCHED_FLAG:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	508 md.mark_touched(filename)
45571 7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45569 diff changeset	509
45634 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	510 copied = None
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	511 if flag & COPIED_MASK == COPIED_FROM_P1_FLAG:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	512 copied = md.mark_copied_from_p1
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	513 elif flag & COPIED_MASK == COPIED_FROM_P2_FLAG:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	514 copied = md.mark_copied_from_p2
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	515
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	516 if copied is not None:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	517 copies.append((copied, filename, copy_idx))
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	518
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	519 for copied, filename, copy_idx in copies:
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	520 copied(all_files[copy_idx], filename)
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	521
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	522 return md
45571 7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45569 diff changeset	523
7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45569 diff changeset	524
44940 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	525 def _getsidedata(srcrepo, rev):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	526 ctx = srcrepo[rev]
45663 cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	527 files = compute_all_files_changes(ctx)
45634 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45623 diff changeset	528 return encode_files_sidedata(files)
44940 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	529
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	530
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	531 def getsidedataadder(srcrepo, destrepo):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	532 use_w = srcrepo.ui.configbool(b'experimental', b'worker.repository-upgrade')
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	533 if pycompat.iswindows or not use_w:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	534 return _get_simple_sidedata_adder(srcrepo, destrepo)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	535 else:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	536 return _get_worker_sidedata_adder(srcrepo, destrepo)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	537
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	538
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	539 def _sidedata_worker(srcrepo, revs_queue, sidedata_queue, tokens):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	540 """The function used by worker precomputing sidedata
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	541
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	542 It read an input queue containing revision numbers
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	543 It write in an output queue containing (rev, <sidedata-map>)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	544
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	545 The `None` input value is used as a stop signal.
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	546
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	547 The `tokens` semaphore is user to avoid having too many unprocessed
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	548 entries. The workers needs to acquire one token before fetching a task.
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	549 They will be released by the consumer of the produced data.
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	550 """
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	551 tokens.acquire()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	552 rev = revs_queue.get()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	553 while rev is not None:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	554 data = _getsidedata(srcrepo, rev)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	555 sidedata_queue.put((rev, data))
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	556 tokens.acquire()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	557 rev = revs_queue.get()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	558 # processing of `None` is completed, release the token.
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	559 tokens.release()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	560
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	561
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	562 BUFF_PER_WORKER = 50
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	563
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	564
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	565 def _get_worker_sidedata_adder(srcrepo, destrepo):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	566 """The parallel version of the sidedata computation
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	567
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	568 This code spawn a pool of worker that precompute a buffer of sidedata
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	569 before we actually need them"""
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	570 # avoid circular import copies -> scmutil -> worker -> copies
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	571 from . import worker
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	572
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	573 nbworkers = worker._numworkers(srcrepo.ui)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	574
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	575 tokens = multiprocessing.BoundedSemaphore(nbworkers * BUFF_PER_WORKER)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	576 revsq = multiprocessing.Queue()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	577 sidedataq = multiprocessing.Queue()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	578
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	579 assert srcrepo.filtername is None
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	580 # queue all tasks beforehand, revision numbers are small and it make
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	581 # synchronisation simpler
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	582 #
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	583 # Since the computation for each node can be quite expensive, the overhead
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	584 # of using a single queue is not revelant. In practice, most computation
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	585 # are fast but some are very expensive and dominate all the other smaller
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	586 # cost.
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	587 for r in srcrepo.changelog.revs():
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	588 revsq.put(r)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	589 # queue the "no more tasks" markers
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	590 for i in range(nbworkers):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	591 revsq.put(None)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	592
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	593 allworkers = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	594 for i in range(nbworkers):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	595 args = (srcrepo, revsq, sidedataq, tokens)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	596 w = multiprocessing.Process(target=_sidedata_worker, args=args)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	597 allworkers.append(w)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	598 w.start()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	599
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	600 # dictionnary to store results for revision higher than we one we are
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	601 # looking for. For example, if we need the sidedatamap for 42, and 43 is
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	602 # received, when shelve 43 for later use.
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	603 staging = {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	604
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	605 def sidedata_companion(revlog, rev):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	606 sidedata = {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	607 if util.safehasattr(revlog, b'filteredrevs'): # this is a changelog
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	608 # Is the data previously shelved ?
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	609 sidedata = staging.pop(rev, None)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	610 if sidedata is None:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	611 # look at the queued result until we find the one we are lookig
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	612 # for (shelve the other ones)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	613 r, sidedata = sidedataq.get()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	614 while r != rev:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	615 staging[r] = sidedata
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	616 r, sidedata = sidedataq.get()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	617 tokens.release()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	618 return False, (), sidedata
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	619
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	620 return sidedata_companion
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	621
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	622
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	623 def _get_simple_sidedata_adder(srcrepo, destrepo):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	624 """The simple version of the sidedata computation
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	625
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	626 It just compute it in the same thread on request"""
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	627
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	628 def sidedatacompanion(revlog, rev):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	629 sidedata = {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	630 if util.safehasattr(revlog, 'filteredrevs'): # this is a changelog
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	631 sidedata = _getsidedata(srcrepo, rev)
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	632 return False, (), sidedata
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	633
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	634 return sidedatacompanion
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	635
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	636
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	637 def getsidedataremover(srcrepo, destrepo):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	638 def sidedatacompanion(revlog, rev):
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	639 f = ()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	640 if util.safehasattr(revlog, 'filteredrevs'): # this is a changelog
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	641 if revlog.flags(rev) & sidedataflag.REVIDX_SIDEDATA:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	642 f = (
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	643 sidedatamod.SD_P1COPIES,
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	644 sidedatamod.SD_P2COPIES,
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	645 sidedatamod.SD_FILESADDED,
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	646 sidedatamod.SD_FILESREMOVED,
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	647 )
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	648 return False, f, {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	649
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	650 return sidedatacompanion

Mercurial > public > mercurial-scm > hg

annotate mercurial/metadata.py @ 45663:cf474af69766