This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9087

changing-files: add the ability to track merged files too
ClosedPublic

Authored by marmoute on Sep 26 2020, 8:10 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe5578dbe36cb: changing-files: add the ability to track merged files too
Summary

The set of merged files is used when doing changeset centric copy tracing (cf
is_merged in mercurial/copies.py. So tracking (and persisting) this set will
be useful. We start with adding the attribute on the new object.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Sep 26 2020, 8:10 AM
pulkit accepted this revision.Oct 1 2020, 5:17 AM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
mercurial/metadata.py
26

This description seems misleading. It says recording changes made to a file by a cset, however, we are recording all file changes made by a changeset. If you agree, kindly send a followup.

97

s/size/side in flight

This revision is now accepted and ready to land.Oct 1 2020, 5:17 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/metadata.py (23 lines)

Diff 22966

mercurial/metadata.py

from .revlogutils import ( from .revlogutils import (
flagutil as sidedataflag, flagutil as sidedataflag,
sidedata as sidedatamod, sidedata as sidedatamod,
) )
class ChangingFiles(object): class ChangingFiles(object):
"""A class recording the changes made to a file by a changeset """A class recording the changes made to a file by a changeset
pulkitUnsubmitted
Not Done

This description seems misleading. It says recording changes made to a file by a cset, however, we are recording all file changes made by a changeset. If you agree, kindly send a followup.

pulkit: This description seems misleading. It says `recording changes made to a file by a cset`…
Actions performed on files are gathered into 3 sets: Actions performed on files are gathered into 3 sets:
- added: files actively added in the changeset. - added: files actively added in the changeset.
- merged: files whose history got merged
- removed: files removed in the revision - removed: files removed in the revision
- touched: files affected by the merge - touched: files affected by the merge
and copies information is held by 2 mappings and copies information is held by 2 mappings
- copied_from_p1: {"<new-name>": "<source-name-in-p1>"} mapping for copies - copied_from_p1: {"<new-name>": "<source-name-in-p1>"} mapping for copies
- copied_from_p2: {"<new-name>": "<source-name-in-p2>"} mapping for copies - copied_from_p2: {"<new-name>": "<source-name-in-p2>"} mapping for copies
See their inline help for details. See their inline help for details.
""" """
def __init__( def __init__(
self, self,
touched=None, touched=None,
added=None, added=None,
removed=None, removed=None,
merged=None,
p1_copies=None, p1_copies=None,
p2_copies=None, p2_copies=None,
): ):
self._added = set(() if added is None else added) self._added = set(() if added is None else added)
self._merged = set(() if merged is None else merged)
self._removed = set(() if removed is None else removed) self._removed = set(() if removed is None else removed)
self._touched = set(() if touched is None else touched) self._touched = set(() if touched is None else touched)
self._touched.update(self._added) self._touched.update(self._added)
self._touched.update(self._merged)
self._touched.update(self._removed) self._touched.update(self._removed)
self._p1_copies = dict(() if p1_copies is None else p1_copies) self._p1_copies = dict(() if p1_copies is None else p1_copies)
self._p2_copies = dict(() if p2_copies is None else p2_copies) self._p2_copies = dict(() if p2_copies is None else p2_copies)
def __eq__(self, other): def __eq__(self, other):
return ( return (
self.added == other.added self.added == other.added
and self.merged == other.merged
and self.removed == other.removed and self.removed == other.removed
and self.touched == other.touched and self.touched == other.touched
and self.copied_from_p1 == other.copied_from_p1 and self.copied_from_p1 == other.copied_from_p1
and self.copied_from_p2 == other.copied_from_p2 and self.copied_from_p2 == other.copied_from_p2
) )
@property @property
def added(self): def added(self):
self._added.add(filename) self._added.add(filename)
self._touched.add(filename) self._touched.add(filename)
def update_added(self, filenames): def update_added(self, filenames):
for f in filenames: for f in filenames:
self.mark_added(f) self.mark_added(f)
@property @property
def merged(self):
"""files actively merged during a merge
Any modified files which had modification on both size that needed merging.
pulkitUnsubmitted
Not Done

s/size/side in flight

pulkit: s/size/side in flight
In this case a new filenode was created and it has two parents.
"""
return frozenset(self._merged)
def mark_merged(self, filename):
self._merged.add(filename)
self._touched.add(filename)
def update_merged(self, filenames):
for f in filenames:
self.mark_merged(f)
@property
def removed(self): def removed(self):
"""files actively removed by the changeset """files actively removed by the changeset
In case of merge this will only contain the set of files removing "new" In case of merge this will only contain the set of files removing "new"
content. For any file absent in the current changeset: content. For any file absent in the current changeset:
a) If the file exists in both parents, it is clearly "actively" removed a) If the file exists in both parents, it is clearly "actively" removed
by this changeset. by this changeset.