This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9197

changing-files: add a shorthand property to check for copy relevant info
ClosedPublic

Authored by marmoute on Oct 13 2020, 6:40 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG232c88dd89e3: changing-files: add a shorthand property to check for copy relevant info
Summary

We are going to reuse this change in more place, so we factor it out first.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Oct 13 2020, 6:40 AM
pulkit added a subscriber: pulkit.Oct 14 2020, 3:23 AM
pulkit added inline comments.
mercurial/changelog.py
94

unrelated change.

mercurial/metadata.py
257

unrelated change here and 4 other similar ones in the file.

marmoute added a comment.Oct 14 2020, 4:39 AM

Looks like my black version change and it started doing this kind of thing. Thanks for pointing it out.

marmoute updated this revision to Diff 23214.Oct 14 2020, 7:47 PM
marmoute marked 2 inline comments as done.Oct 14 2020, 7:50 PM

the black issue should be fixed now.

pulkit accepted this revision.Oct 15 2020, 8:16 AM
This revision is now accepted and ready to land.Oct 15 2020, 8:16 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/changelog.py (12 lines)
Mmercurial/metadata.py (25 lines)

Diff 23185

mercurial/changelog.py

def stripdesc(desc): def stripdesc(desc):
"""strip trailing whitespace and leading and trailing empty lines""" """strip trailing whitespace and leading and trailing empty lines"""
return b'\n'.join([l.rstrip() for l in desc.splitlines()]).strip(b'\n') return b'\n'.join([l.rstrip() for l in desc.splitlines()]).strip(b'\n')
class appender(object): class appender(object):
'''the changelog index must be updated last on disk, so we use this class """the changelog index must be updated last on disk, so we use this class
pulkitUnsubmitted
Done

unrelated change.

pulkit: unrelated change.
to delay writes to it''' to delay writes to it"""
def __init__(self, vfs, name, mode, buf): def __init__(self, vfs, name, mode, buf):
self.data = buf self.data = buf
fp = vfs(name, mode) fp = vfs(name, mode)
self.fp = fp self.fp = fp
self.offset = fp.tell() self.offset = fp.tell()
self.size = vfs.fstat(fp).st_size self.size = vfs.fstat(fp).st_size
self._end = self.size self._end = self.size
elif branch in (b".", b"null", b"tip"): elif branch in (b".", b"null", b"tip"):
raise error.StorageError( raise error.StorageError(
_(b'the name \'%s\' is reserved') % branch _(b'the name \'%s\' is reserved') % branch
) )
sortedfiles = sorted(files.touched) sortedfiles = sorted(files.touched)
flags = 0 flags = 0
sidedata = None sidedata = None
if self._copiesstorage == b'changeset-sidedata': if self._copiesstorage == b'changeset-sidedata':
if ( if files.has_copies_info:
files.removed
or files.merged
or files.salvaged
or files.copied_from_p1
or files.copied_from_p2
):
flags |= flagutil.REVIDX_HASCOPIESINFO flags |= flagutil.REVIDX_HASCOPIESINFO
sidedata = metadata.encode_files_sidedata(files) sidedata = metadata.encode_files_sidedata(files)
if extra: if extra:
extra = encodeextra(extra) extra = encodeextra(extra)
parseddate = b"%s %s" % (parseddate, extra) parseddate = b"%s %s" % (parseddate, extra)
l = [hex(manifest), user, parseddate] + sortedfiles + [b"", desc] l = [hex(manifest), user, parseddate] + sortedfiles + [b"", desc]
text = b"\n".join(l) text = b"\n".join(l)

mercurial/metadata.py

and self.merged == other.merged and self.merged == other.merged
and self.removed == other.removed and self.removed == other.removed
and self.salvaged == other.salvaged and self.salvaged == other.salvaged
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
def has_copies_info(self):
return bool(
self.removed
or self.merged
or self.salvaged
or self.copied_from_p1
or self.copied_from_p2
)
@util.propertycache @util.propertycache
def added(self): def added(self):
"""files actively added in the changeset """files actively added in the changeset
Any file present in that revision that was absent in all the changeset's Any file present in that revision that was absent in all the changeset's
parents. parents.
In case of merge, this means a file absent in one of the parents but In case of merge, this means a file absent in one of the parents but
elif p1.rev() == p2.rev(): elif p1.rev() == p2.rev():
# In the wild, one can encounter such "non-merge" # In the wild, one can encounter such "non-merge"
return _process_linear(p1, ctx) return _process_linear(p1, ctx)
else: else:
return _process_merge(p1, p2, ctx) return _process_merge(p1, p2, ctx)
def _process_root(ctx): def _process_root(ctx):
"""compute the appropriate changed files for a changeset with no parents """compute the appropriate changed files for a changeset with no parents"""
pulkitUnsubmitted
Done

unrelated change here and 4 other similar ones in the file.

pulkit: unrelated change here and 4 other similar ones in the file.
"""
# Simple, there was nothing before it, so everything is added. # Simple, there was nothing before it, so everything is added.
md = ChangingFiles() md = ChangingFiles()
manifest = ctx.manifest() manifest = ctx.manifest()
for filename in manifest: for filename in manifest:
md.mark_added(filename) md.mark_added(filename)
return md return md
def _process_linear(parent_ctx, children_ctx, parent=1): def _process_linear(parent_ctx, children_ctx, parent=1):
"""compute the appropriate changed files for a changeset with a single parent """compute the appropriate changed files for a changeset with a single parent"""
"""
md = ChangingFiles() md = ChangingFiles()
parent_manifest = parent_ctx.manifest() parent_manifest = parent_ctx.manifest()
children_manifest = children_ctx.manifest() children_manifest = children_ctx.manifest()
copies_candidate = [] copies_candidate = []
for filename, d in parent_manifest.diff(children_manifest).items(): for filename, d in parent_manifest.diff(children_manifest).items():
if d[1][0] is None: if d[1][0] is None:
assert False, "unreachable" assert False, "unreachable"
def _missing_from_all_ancestors(mas, filename): def _missing_from_all_ancestors(mas, filename):
return all(_find(ma, filename) is None for ma in mas) return all(_find(ma, filename) is None for ma in mas)
def computechangesetfilesadded(ctx): def computechangesetfilesadded(ctx):
"""return the list of files added in a changeset """return the list of files added in a changeset"""
"""
added = [] added = []
for f in ctx.files(): for f in ctx.files():
if not any(f in p for p in ctx.parents()): if not any(f in p for p in ctx.parents()):
added.append(f) added.append(f)
return added return added
def get_removal_filter(ctx, x=None): def get_removal_filter(ctx, x=None):
return all(f in ma and ma.find(f) == m2.find(f) for ma in mas()) return all(f in ma and ma.find(f) == m2.find(f) for ma in mas())
else: else:
return True return True
return deletionfromparent return deletionfromparent
def computechangesetfilesremoved(ctx): def computechangesetfilesremoved(ctx):
"""return the list of files removed in a changeset """return the list of files removed in a changeset"""
"""
removed = [] removed = []
for f in ctx.files(): for f in ctx.files():
if f not in ctx: if f not in ctx:
removed.append(f) removed.append(f)
if removed: if removed:
rf = get_removal_filter(ctx) rf = get_removal_filter(ctx)
removed = [r for r in removed if not rf(r)] removed = [r for r in removed if not rf(r)]
return removed return removed
def computechangesetfilesmerged(ctx): def computechangesetfilesmerged(ctx):
"""return the list of files merged in a changeset """return the list of files merged in a changeset"""
"""
merged = [] merged = []
if len(ctx.parents()) < 2: if len(ctx.parents()) < 2:
return merged return merged
for f in ctx.files(): for f in ctx.files():
if f in ctx: if f in ctx:
fctx = ctx[f] fctx = ctx[f]
parents = fctx._filelog.parents(fctx._filenode) parents = fctx._filelog.parents(fctx._filenode)
if parents[1] != node.nullid: if parents[1] != node.nullid: