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

annotate mercurial/metadata.py @ 45669:e53778ad64bf

salvaged: persist the salvaged set on disk With the new side data storage, this is trivial. Differential Revision: https://phab.mercurial-scm.org/D9129

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Tue, 15 Sep 2020 10:55:17 +0200
parents	47ad23549b81
children	232c88dd89e3

rev	line source
45668 47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	1 # coding: utf8
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	2 # 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	3 #
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 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	5 # 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	6 #
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	7 # 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	8 # 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	9 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	10
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	11 import multiprocessing
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	12 import struct
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	13
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	14 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	15 error,
44982 edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	16 node,
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	17 pycompat,
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	18 util,
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
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	21 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	22 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	23 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	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
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	26
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	27 class ChangingFiles(object):
45624 646a676f5365 changing-files: fix docstring Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45616 diff changeset	28 """A class recording the changes made to files by a changeset
45516 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	29
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	30 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: 45346 diff changeset	31
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	32 - added: files actively added in the changeset.
45614 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	33 - merged: files whose history got merged
45516 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	34 - 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: 45637 diff changeset	35 - salvaged: files that might have been deleted by a merge but were not
45516 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	36 - touched: files affected by the merge
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	37
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	38 and copies information is held by 2 mappings
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	39
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	40 - 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: 45346 diff changeset	41 - 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: 45346 diff changeset	42
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	43 See their inline help for details.
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	44 """
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	45
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	46 def __init__(
45592 3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45574 diff changeset	47 self,
3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45574 diff changeset	48 touched=None,
3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45574 diff changeset	49 added=None,
3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45574 diff changeset	50 removed=None,
45614 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	51 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: 45637 diff changeset	52 salvaged=None,
45592 3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45574 diff changeset	53 p1_copies=None,
3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45574 diff changeset	54 p2_copies=None,
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	55 ):
45592 3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45574 diff changeset	56 self._added = set(() if added is None else added)
45614 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	57 self._merged = set(() if merged is None else merged)
45592 3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45574 diff changeset	58 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: 45574 diff changeset	59 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: 45637 diff changeset	60 self._salvaged = set(() if salvaged is None else salvaged)
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	61 self._touched.update(self._added)
45614 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	62 self._touched.update(self._merged)
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	63 self._touched.update(self._removed)
45592 3d5b2b8e93fd changing-files: move default constructor value to None Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45574 diff changeset	64 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: 45574 diff changeset	65 self._p2_copies = dict(() if p2_copies is None else p2_copies)
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	66
45517 df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45516 diff changeset	67 def __eq__(self, other):
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45516 diff changeset	68 return (
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45516 diff changeset	69 self.added == other.added
45614 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	70 and self.merged == other.merged
45517 df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45516 diff changeset	71 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: 45637 diff changeset	72 and self.salvaged == other.salvaged
45517 df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45516 diff changeset	73 and self.touched == other.touched
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45516 diff changeset	74 and self.copied_from_p1 == other.copied_from_p1
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45516 diff changeset	75 and self.copied_from_p2 == other.copied_from_p2
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45516 diff changeset	76 )
df87821081ee changing-files: implement equality checking Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45516 diff changeset	77
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	78 @util.propertycache
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	79 def added(self):
45516 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	80 """files actively added in the changeset
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	81
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	82 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: 45346 diff changeset	83 parents.
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	84
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	85 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: 45346 diff changeset	86 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: 45346 diff changeset	87 added by an ancestor)
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	88 """
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	89 return frozenset(self._added)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	90
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	91 def mark_added(self, filename):
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	92 if 'added' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	93 del self.added
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	94 self._added.add(filename)
45625 42bb6c4f8106 changing-files: always use `mark_touched` to update the touched set Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45624 diff changeset	95 self.mark_touched(filename)
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	96
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	97 def update_added(self, filenames):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	98 for f in filenames:
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	99 self.mark_added(f)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	100
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	101 @util.propertycache
45614 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	102 def merged(self):
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	103 """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: 45592 diff changeset	104
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	105 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: 45592 diff changeset	106
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	107 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: 45592 diff changeset	108 """
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	109 return frozenset(self._merged)
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	110
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	111 def mark_merged(self, filename):
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	112 if 'merged' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	113 del self.merged
45614 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	114 self._merged.add(filename)
45625 42bb6c4f8106 changing-files: always use `mark_touched` to update the touched set Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45624 diff changeset	115 self.mark_touched(filename)
45614 e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	116
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	117 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: 45592 diff changeset	118 for f in filenames:
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	119 self.mark_merged(f)
e5578dbe36cb changing-files: add the ability to track merged files too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45592 diff changeset	120
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	121 @util.propertycache
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	122 def removed(self):
45516 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	123 """files actively removed by the changeset
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	124
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	125 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: 45346 diff changeset	126 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: 45346 diff changeset	127
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	128 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: 45346 diff changeset	129 by this changeset.
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	130
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	131 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: 45346 diff changeset	132 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: 45346 diff changeset	133 and then got "actively" removed.
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	134
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	135 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: 45346 diff changeset	136 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: 45346 diff changeset	137 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: 45346 diff changeset	138 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: 45346 diff changeset	139 file is not included in the `removed` set.
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	140
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	141 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: 45346 diff changeset	142 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: 45346 diff changeset	143 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: 45346 diff changeset	144 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: 45346 diff changeset	145 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: 45346 diff changeset	146
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	147 Summary table for merge:
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	148
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	149 case \| exists in parents \| exists in gca \|\| removed
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	150 (a) \| both \| * \|\| yes
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	151 (b) \| one \| none \|\| yes
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	152 (c) \| one \| same filenode \|\| no
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	153 (d) \| one \| new filenode \|\| yes
1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	154 """
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	155 return frozenset(self._removed)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	156
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	157 def mark_removed(self, filename):
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	158 if 'removed' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	159 del self.removed
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	160 self._removed.add(filename)
45625 42bb6c4f8106 changing-files: always use `mark_touched` to update the touched set Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45624 diff changeset	161 self.mark_touched(filename)
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	162
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	163 def update_removed(self, filenames):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	164 for f in filenames:
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	165 self.mark_removed(f)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	166
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	167 @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: 45637 diff changeset	168 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: 45637 diff changeset	169 """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: 45637 diff changeset	170
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45637 diff changeset	171 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: 45637 diff changeset	172 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: 45637 diff changeset	173 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: 45637 diff changeset	174 """
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45637 diff changeset	175 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: 45637 diff changeset	176
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45637 diff changeset	177 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: 45637 diff changeset	178 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: 45637 diff changeset	179 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: 45637 diff changeset	180 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: 45637 diff changeset	181 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: 45637 diff changeset	182
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45637 diff changeset	183 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: 45637 diff changeset	184 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: 45637 diff changeset	185 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: 45637 diff changeset	186
a475db79d84d changing-files: add a "salvaged" set to track file that were not removed Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45637 diff changeset	187 @util.propertycache
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	188 def touched(self):
45516 1f50bcc96595 changing-files: document the various sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45346 diff changeset	189 """files either actively modified, added or removed"""
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	190 return frozenset(self._touched)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	191
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	192 def mark_touched(self, filename):
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	193 if 'touched' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	194 del self.touched
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	195 self._touched.add(filename)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	196
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	197 def update_touched(self, filenames):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	198 for f in filenames:
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	199 self.mark_touched(f)
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	200
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	201 @util.propertycache
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	202 def copied_from_p1(self):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	203 return self._p1_copies.copy()
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	204
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	205 def mark_copied_from_p1(self, source, dest):
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	206 if 'copied_from_p1' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	207 del self.copied_from_p1
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	208 self._p1_copies[dest] = source
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	209
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	210 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: 44983 diff changeset	211 for dest, source in copies.items():
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	212 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: 44983 diff changeset	213
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	214 @util.propertycache
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	215 def copied_from_p2(self):
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	216 return self._p2_copies.copy()
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	217
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	218 def mark_copied_from_p2(self, source, dest):
45626 d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	219 if 'copied_from_p2' in vars(self):
d31483377673 changing-files: cache the various property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45625 diff changeset	220 del self.copied_from_p2
45344 aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	221 self._p2_copies[dest] = source
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	222
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	223 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: 44983 diff changeset	224 for dest, source in copies.items():
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	225 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: 44983 diff changeset	226
aea6a812f7cb commitctx: return a richer object from _prepare_files Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44983 diff changeset	227
45663 cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	228 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	229 """compute the files changed by a revision"""
45666 f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	230 p1 = ctx.p1()
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	231 p2 = ctx.p2()
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	232 if p1.rev() == node.nullrev and p2.rev() == node.nullrev:
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	233 return _process_root(ctx)
45667 0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	234 elif p1.rev() != node.nullrev and p2.rev() == node.nullrev:
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	235 return _process_linear(p1, ctx)
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	236 elif p1.rev() == node.nullrev and p2.rev() != node.nullrev:
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	237 # In the wild, one can encounter changeset where p1 is null but p2 is not
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	238 return _process_linear(p1, ctx, parent=2)
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	239 elif p1.rev() == p2.rev():
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	240 # In the wild, one can encounter such "non-merge"
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	241 return _process_linear(p1, ctx)
45668 47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	242 else:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	243 return _process_merge(p1, p2, ctx)
45663 cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	244
cf474af69766 changing-files: split the changing files computation from encoding Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45660 diff changeset	245
45666 f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	246 def _process_root(ctx):
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	247 """compute the appropriate changed files for a changeset with no parents
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	248 """
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	249 # Simple, there was nothing before it, so everything is added.
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	250 md = ChangingFiles()
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	251 manifest = ctx.manifest()
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	252 for filename in manifest:
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	253 md.mark_added(filename)
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	254 return md
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	255
f6811e5bd994 changing-files: add clean computation of changed files for roots Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45663 diff changeset	256
45667 0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	257 def _process_linear(parent_ctx, children_ctx, parent=1):
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	258 """compute the appropriate changed files for a changeset with a single parent
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	259 """
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	260 md = ChangingFiles()
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	261 parent_manifest = parent_ctx.manifest()
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	262 children_manifest = children_ctx.manifest()
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	263
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	264 copies_candidate = []
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	265
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	266 for filename, d in parent_manifest.diff(children_manifest).items():
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	267 if d[1][0] is None:
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	268 # no filenode for the "new" value, file is absent
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	269 md.mark_removed(filename)
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	270 else:
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	271 copies_candidate.append(filename)
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	272 if d[0][0] is None:
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	273 # not filenode for the "old" value file was absent
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	274 md.mark_added(filename)
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	275 else:
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	276 # filenode for both "old" and "new"
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	277 md.mark_touched(filename)
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	278
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	279 if parent == 1:
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	280 copied = md.mark_copied_from_p1
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	281 elif parent == 2:
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	282 copied = md.mark_copied_from_p2
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	283 else:
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	284 assert False, "bad parent value %d" % parent
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	285
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	286 for filename in copies_candidate:
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	287 copy_info = children_ctx[filename].renamed()
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	288 if copy_info:
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	289 source, srcnode = copy_info
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	290 copied(source, filename)
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	291
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	292 return md
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	293
0303fc1f43f8 changing-files: add clean computation of changed files for linear changesets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45666 diff changeset	294
45668 47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	295 def _process_merge(p1_ctx, p2_ctx, ctx):
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	296 """compute the appropriate changed files for a changeset with two parents
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	297
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	298 This is a more advance case. The information we need to record is summarise
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	299 in the following table:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	300
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	301 ┌──────────────┬──────────────┬──────────────┬──────────────┬──────────────┐
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	302 │ diff ╲ diff │ ø │ (Some, None) │ (None, Some) │ (Some, Some) │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	303 │ p2 ╲ p1 │ │ │ │ │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	304 ├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	305 │ │ │🄱 No Changes │🄳 No Changes │ │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	306 │ ø │🄰 No Changes │ OR │ OR │🄵 No Changes │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	307 │ │ │🄲 Deleted[1] │🄴 Salvaged[2]│ [3] │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	308 ├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	309 │ │🄶 No Changes │ │ │ │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	310 │ (Some, None) │ OR │🄻 Deleted │ ø │ ø │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	311 │ │🄷 Deleted[1] │ │ │ │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	312 ├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	313 │ │🄸 No Changes │ │ │ │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	314 │ (None, Some) │ OR │ ø │🄼 Added │🄽 Merged │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	315 │ │🄹 Salvaged[2]│ │ (copied?) │ (copied?) │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	316 ├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	317 │ │ │ │ │ │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	318 │ (Some, Some) │🄺 No Changes │ ø │🄾 Merged │🄿 Merged │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	319 │ │ [3] │ │ (copied?) │ (copied?) │
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	320 └──────────────┴──────────────┴──────────────┴──────────────┴──────────────┘
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	321
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	322 Special case [1]:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	323
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	324 The situation is:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	325 - parent-A: file exists,
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	326 - parent-B: no file,
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	327 - working-copy: no file.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	328
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	329 Detecting a "deletion" will depend on the presence of actual change on
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	330 the "parent-A" branch:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	331
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	332 Subcase 🄱 or 🄶 : if the state of the file in "parent-A" is unchanged
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	333 compared to the merge ancestors, then parent-A branch left the file
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	334 untouched while parent-B deleted it. We simply apply the change from
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	335 "parent-B" branch the file was automatically dropped.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	336 The result is:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	337 - file is not recorded as touched by the merge.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	338
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	339 Subcase 🄲 or 🄷 : otherwise, the change from parent-A branch were explicitly dropped and
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	340 the file was "deleted again". From a user perspective, the message
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	341 about "locally changed" while "remotely deleted" (or the other way
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	342 around) was issued and the user chose to deleted the file.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	343 The result:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	344 - file is recorded as touched by the merge.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	345
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	346
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	347 Special case [2]:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	348
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	349 The situation is:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	350 - parent-A: no file,
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	351 - parent-B: file,
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	352 - working-copy: file (same content as parent-B).
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	353
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	354 There are three subcases depending on the ancestors contents:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	355
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	356 - A) the file is missing in all ancestors,
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	357 - B) at least one ancestor has the file with filenode ≠ from parent-B,
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	358 - C) all ancestors use the same filenode as parent-B,
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	359
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	360 Subcase (A) is the simpler, nothing happend on parent-A side while
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	361 parent-B added it.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	362
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	363 The result:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	364 - the file is not marked as touched by the merge.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	365
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	366 Subcase (B) is the counter part of "Special case [1]", the file was
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	367 modified on parent-B side, while parent-A side deleted it. However this
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	368 time, the conflict was solved by keeping the file (and its
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	369 modification). We consider the file as "salvaged".
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	370
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	371 The result:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	372 - the file is marked as "salvaged" by the merge.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	373
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	374 Subcase (C) is subtle variation of the case above. In this case, the
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	375 file in unchanged on the parent-B side and actively removed on the
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	376 parent-A side. So the merge machinery correctly decide it should be
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	377 removed. However, the file was explicitly restored to its parent-B
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	378 content before the merge was commited. The file is be marked
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	379 as salvaged too. From the merge result perspective, this is similar to
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	380 Subcase (B), however from the merge resolution perspective they differ
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	381 since in (C), there was some conflict not obvious solution to the
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	382 merge (That got reversed)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	383
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	384 Special case [3]:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	385
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	386 The situation is:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	387 - parent-A: file,
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	388 - parent-B: file (different filenode as parent-A),
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	389 - working-copy: file (same filenode as parent-B).
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	390
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	391 This case is in theory much simple, for this to happens, this mean the
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	392 filenode in parent-A is purely replacing the one in parent-B (either a
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	393 descendant, or a full new file history, see changeset). So the merge
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	394 introduce no changes, and the file is not affected by the merge...
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	395
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	396 However, in the wild it is possible to find commit with the above is not
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	397 True. For example repository have some commit where the new node is an
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	398 ancestor of the node in parent-A, or where parent-A and parent-B are two
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	399 branches of the same file history, yet not merge-filenode were created
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	400 (while the "merge" should have led to a "modification").
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	401
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	402 Detecting such cases (and not recording the file as modified) would be a
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	403 nice bonus. However do not any of this yet.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	404 """
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	405
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	406 md = ChangingFiles()
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	407
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	408 m = ctx.manifest()
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	409 p1m = p1_ctx.manifest()
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	410 p2m = p2_ctx.manifest()
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	411 diff_p1 = p1m.diff(m)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	412 diff_p2 = p2m.diff(m)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	413
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	414 cahs = ctx.repo().changelog.commonancestorsheads(
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	415 p1_ctx.node(), p2_ctx.node()
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	416 )
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	417 if not cahs:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	418 cahs = [node.nullrev]
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	419 mas = [ctx.repo()[r].manifest() for r in cahs]
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	420
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	421 copy_candidates = []
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	422
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	423 # Dealing with case 🄰 happens automatically. Since there are no entry in
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	424 # d1 nor d2, we won't iterate on it ever.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	425
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	426 # Iteration over d1 content will deal with all cases, but the one in the
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	427 # first column of the table.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	428 for filename, d1 in diff_p1.items():
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	429
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	430 d2 = diff_p2.pop(filename, None)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	431
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	432 if d2 is None:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	433 # this deal with the first line of the table.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	434 _process_other_unchanged(md, mas, filename, d1)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	435 else:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	436
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	437 if d1[0][0] is None and d2[0][0] is None:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	438 # case 🄼 — both deleted the file.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	439 md.mark_added(filename)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	440 copy_candidates.append(filename)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	441 elif d1[1][0] is None and d2[1][0] is None:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	442 # case 🄻 — both deleted the file.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	443 md.mark_removed(filename)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	444 elif d1[1][0] is not None and d2[1][0] is not None:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	445 # case 🄽 🄾 🄿
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	446 md.mark_merged(filename)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	447 copy_candidates.append(filename)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	448 else:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	449 # Impossible case, the post-merge file status cannot be None on
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	450 # one side and Something on the other side.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	451 assert False, "unreachable"
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	452
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	453 # Iteration over remaining d2 content deal with the first column of the
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	454 # table.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	455 for filename, d2 in diff_p2.items():
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	456 _process_other_unchanged(md, mas, filename, d2)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	457
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	458 for filename in copy_candidates:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	459 copy_info = ctx[filename].renamed()
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	460 if copy_info:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	461 source, srcnode = copy_info
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	462 if source in p1_ctx and p1_ctx[source].filenode() == srcnode:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	463 md.mark_copied_from_p1(source, filename)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	464 elif source in p2_ctx and p2_ctx[source].filenode() == srcnode:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	465 md.mark_copied_from_p2(source, filename)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	466 return md
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	467
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	468
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	469 def _find(manifest, filename):
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	470 """return the associate filenode or None"""
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	471 if filename not in manifest:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	472 return None
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	473 return manifest.find(filename)[0]
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	474
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	475
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	476 def _process_other_unchanged(md, mas, filename, diff):
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	477 source_node = diff[0][0]
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	478 target_node = diff[1][0]
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	479
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	480 if source_node is not None and target_node is None:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	481 if any(not _find(ma, filename) == source_node for ma in mas):
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	482 # case 🄲 of 🄷
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	483 md.mark_removed(filename)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	484 # else, we have case 🄱 or 🄶 : no change need to be recorded
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	485 elif source_node is None and target_node is not None:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	486 if any(_find(ma, filename) is not None for ma in mas):
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	487 # case 🄴 or 🄹
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	488 md.mark_salvaged(filename)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	489 # else, we have case 🄳 or 🄸 : simple merge without intervention
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	490 elif source_node is not None and target_node is not None:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	491 # case 🄵 or 🄺 : simple merge without intervention
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	492 #
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	493 # In buggy case where source_node is not an ancestors of target_node.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	494 # There should have a been a new filenode created, recording this as
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	495 # "modified". We do not deal with them yet.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	496 pass
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	497 else:
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	498 # An impossible case, the diff algorithm should not return entry if the
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	499 # file is missing on both side.
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	500 assert False, "unreachable"
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	501
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	502
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	503 def _missing_from_all_ancestors(mas, filename):
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	504 return all(_find(ma, filename) is None for ma in mas)
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	505
47ad23549b81 changing-files: add clean computation of changed file for merges Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45667 diff changeset	506
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	507 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	508 """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	509 """
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	510 added = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	511 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	512 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	513 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	514 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	515
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	516
44982 edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	517 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: 44981 diff changeset	518 """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: 44981 diff changeset	519
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	520 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: 44981 diff changeset	521 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: 44981 diff changeset	522 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: 44981 diff changeset	523 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: 44981 diff changeset	524 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: 44981 diff changeset	525 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: 44981 diff changeset	526 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: 44981 diff changeset	527 - 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: 44981 diff changeset	528 - 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: 44981 diff changeset	529 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: 44981 diff changeset	530 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: 44981 diff changeset	531 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: 44981 diff changeset	532 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: 44981 diff changeset	533 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: 44981 diff changeset	534 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: 44981 diff changeset	535 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: 44981 diff changeset	536 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: 44981 diff changeset	537 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: 44981 diff changeset	538 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: 44981 diff changeset	539 nodes.
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	540 """
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	541
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	542 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: 44981 diff changeset	543 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: 44981 diff changeset	544 else:
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	545 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: 44981 diff changeset	546 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: 44981 diff changeset	547 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: 44981 diff changeset	548 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: 44981 diff changeset	549
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	550 @util.cachefunc
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	551 def mas():
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	552 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: 44981 diff changeset	553 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: 44981 diff changeset	554 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: 44981 diff changeset	555 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: 44981 diff changeset	556 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: 44981 diff changeset	557 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: 44981 diff changeset	558
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	559 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: 44981 diff changeset	560 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: 44981 diff changeset	561 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: 44981 diff changeset	562 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: 44981 diff changeset	563 )
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	564 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: 44981 diff changeset	565 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: 44981 diff changeset	566 else:
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	567 return True
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	568
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	569 return deletionfromparent
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	570
edd08aa193fb files: extract code for extra filtering of the `removed` entry into copies Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44981 diff changeset	571
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	572 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	573 """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	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 removed = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	576 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	577 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	578 removed.append(f)
44983 25512a65cefd metadata: filter the `removed` set to only contains relevant data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44982 diff changeset	579 if removed:
25512a65cefd metadata: filter the `removed` set to only contains relevant data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44982 diff changeset	580 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: 44982 diff changeset	581 removed = [r for r in removed if not rf(r)]
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	582 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	583
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	584
45616 ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45614 diff changeset	585 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: 45614 diff changeset	586 """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: 45614 diff changeset	587 """
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45614 diff changeset	588 merged = []
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45614 diff changeset	589 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: 45614 diff changeset	590 return merged
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45614 diff changeset	591 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: 45614 diff changeset	592 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: 45614 diff changeset	593 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: 45614 diff changeset	594 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: 45614 diff changeset	595 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: 45614 diff changeset	596 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: 45614 diff changeset	597 return merged
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45614 diff changeset	598
ddcee0b0fd67 changing-files: add a utility to compute the merged files post-commit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45614 diff changeset	599
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	600 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	601 """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	602
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	603 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	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 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	606 """
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	607 p1copies = {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	608 p2copies = {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	609 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	610 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	611 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	612 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	613 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	614 continue
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	615 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	616 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	617 continue
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	618 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	619 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	620 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	621 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	622 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	623 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	624
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 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	627 items = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	628 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	629 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	630 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	631 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	632 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	633 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	634 )
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	635 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	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
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 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	639 try:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	640 copies = {}
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 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	642 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	643 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	644 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	645 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	646 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	647 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	648 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	649 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	650 # 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	651 # 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	652 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	653
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	654
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	655 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	656 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	657 indices = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	658 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	659 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	660 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	661 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	662
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	663
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	664 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	665 try:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	666 subset = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	667 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	668 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	669 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	670 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	671 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	672 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	673 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	674 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	675 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	676 # 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	677 # 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	678 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	679
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	680
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	681 # 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: 45626 diff changeset	682
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	683 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: 45626 diff changeset	684 # 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: 45626 diff changeset	685 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: 45626 diff changeset	686 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: 45626 diff changeset	687 REMOVED_FLAG = int("011" "00", 2)
45669 e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45668 diff changeset	688 SALVAGED_FLAG = int("100" "00", 2)
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	689 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: 45626 diff changeset	690
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	691 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: 45626 diff changeset	692 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: 45626 diff changeset	693 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: 45626 diff changeset	694
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	695 # 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: 45626 diff changeset	696 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: 45626 diff changeset	697 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: 45626 diff changeset	698
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	699
45572 64d18e9e8508 sidedata: rename `encode_copies_sidedata` to `encode_files_sidedata` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45517 diff changeset	700 def encode_files_sidedata(files):
45669 e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45668 diff changeset	701 all_files = set(files.touched)
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	702 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: 45626 diff changeset	703 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: 45626 diff changeset	704 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: 45626 diff changeset	705 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: 45626 diff changeset	706 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: 45626 diff changeset	707
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	708 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: 45626 diff changeset	709
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	710 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: 45626 diff changeset	711 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: 45626 diff changeset	712 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: 45626 diff changeset	713 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: 45626 diff changeset	714 flag = 0
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	715 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: 45626 diff changeset	716 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: 45626 diff changeset	717 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: 45626 diff changeset	718 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: 45626 diff changeset	719 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: 45626 diff changeset	720 flag \|= REMOVED_FLAG
45669 e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45668 diff changeset	721 elif f in files.salvaged:
e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45668 diff changeset	722 flag \|= SALVAGED_FLAG
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	723 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: 45626 diff changeset	724 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: 45626 diff changeset	725
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	726 copy = None
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	727 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: 45626 diff changeset	728 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: 45626 diff changeset	729 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: 45626 diff changeset	730 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: 45626 diff changeset	731 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: 45626 diff changeset	732 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: 45626 diff changeset	733 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: 45626 diff changeset	734 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: 45626 diff changeset	735 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: 45626 diff changeset	736 return {sidedatamod.SD_FILES: b''.join(chunks)}
45346 c6eea5804551 commitctx: extract sidedata encoding inside its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45344 diff changeset	737
c6eea5804551 commitctx: extract sidedata encoding inside its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45344 diff changeset	738
45637 9003e6524f78 changing-files: drop the now useless changelogrevision argument Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45636 diff changeset	739 def decode_files_sidedata(sidedata):
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	740 md = ChangingFiles()
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	741 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: 45626 diff changeset	742
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	743 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: 45626 diff changeset	744 return md
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	745
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	746 copies = []
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	747 all_files = []
45574 7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45572 diff changeset	748
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	749 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: 45626 diff changeset	750 total_files = INDEX_HEADER.unpack_from(raw, 0)[0]
45574 7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45572 diff changeset	751
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	752 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: 45626 diff changeset	753 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: 45626 diff changeset	754 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: 45626 diff changeset	755
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	756 assert len(raw) >= file_offset_base
45574 7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45572 diff changeset	757
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	758 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: 45626 diff changeset	759 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: 45626 diff changeset	760 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: 45626 diff changeset	761 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: 45626 diff changeset	762 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: 45626 diff changeset	763 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: 45626 diff changeset	764 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: 45626 diff changeset	765 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: 45626 diff changeset	766 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: 45626 diff changeset	767 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: 45626 diff changeset	768 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: 45626 diff changeset	769 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: 45626 diff changeset	770 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: 45626 diff changeset	771 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: 45626 diff changeset	772 md.mark_removed(filename)
45669 e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45668 diff changeset	773 elif flag & ACTION_MASK == SALVAGED_FLAG:
e53778ad64bf salvaged: persist the salvaged set on disk Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45668 diff changeset	774 md.mark_salvaged(filename)
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	775 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: 45626 diff changeset	776 md.mark_touched(filename)
45574 7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45572 diff changeset	777
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	778 copied = None
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	779 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: 45626 diff changeset	780 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: 45626 diff changeset	781 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: 45626 diff changeset	782 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: 45626 diff changeset	783
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	784 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: 45626 diff changeset	785 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: 45626 diff changeset	786
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	787 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: 45626 diff changeset	788 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: 45626 diff changeset	789
9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	790 return md
45574 7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45572 diff changeset	791
7543b5072e84 sidedata: add a `decode_files_sidedata` function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45572 diff changeset	792
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	793 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	794 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	795 files = compute_all_files_changes(ctx)
45636 9a6b409b8ebc changing-files: rework the way we store changed files in side-data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45626 diff changeset	796 return encode_files_sidedata(files)
44981 4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	797
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	798
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	799 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	800 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	801 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	802 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	803 else:
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	804 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	805
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	806
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	807 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	808 """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	809
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	810 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	811 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	812
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	813 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	814
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	815 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	816 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	817 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	818 """
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	819 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	820 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	821 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	822 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	823 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	824 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	825 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	826 # 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	827 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	828
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	829
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	830 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	831
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	832
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	833 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	834 """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	835
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	836 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	837 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	838 # 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	839 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	840
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	841 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	842
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	843 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	844 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	845 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	846
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	847 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	848 # 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	849 # 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	850 #
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	851 # 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	852 # 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	853 # 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	854 # cost.
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	855 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	856 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	857 # 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	858 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	859 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	860
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	861 allworkers = []
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	862 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	863 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	864 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	865 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	866 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	867
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	868 # 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	869 # 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	870 # 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	871 staging = {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	872
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	873 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	874 sidedata = {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	875 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	876 # 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	877 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	878 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	879 # 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	880 # 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	881 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	882 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	883 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	884 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	885 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	886 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	887
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	888 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	889
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	890
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	891 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	892 """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	893
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	894 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	895
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	896 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	897 sidedata = {}
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	898 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	899 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	900 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	901
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	902 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	903
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	904
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	905 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	906 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	907 f = ()
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	908 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	909 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	910 f = (
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	911 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	912 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	913 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	914 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	915 )
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	916 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	917
4c1d39215034 metadata: move computation related to files touched in a dedicated module Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	918 return sidedatacompanion

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/metadata.py @ 45669:e53778ad64bf