This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1093

scmutil: add capability to cleanupnodes to take obsmarker metadata
ClosedPublic

Authored by pulkit on Oct 15 2017, 10:28 AM.

Details

Reviewers
dlax
durin42
Group Reviewers
hg-reviewers
Commits
rHG3df59451cdec: scmutil: add capability to cleanupnodes to take obsmarker metadata
rHG162e8807abad: scmutil: add capability to cleanupnodes to take obsmarker metadata
Summary

This patch adds a metadata argument to cleanupnodes() which will be dict and can
be passed to obsmarker.createmarkers() and can be stored on the obsmarker.
In cases when obsolescence is not enabled, the metadata argument is useless.

This is a step towards storing a note in amend.

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

pulkit created this revision.Oct 15 2017, 10:28 AM
dlax accepted this revision.Oct 16 2017, 4:27 AM
durin42 accepted this revision.Oct 16 2017, 9:36 PM
This revision is now accepted and ready to land.Oct 16 2017, 9:36 PM
Closed by commit rHG162e8807abad: scmutil: add capability to cleanupnodes to take obsmarker metadata (authored by pulkit). · Explain WhyOct 16 2017, 9:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (8 lines)

Diff 2873

mercurial/scmutil.py

def __init__(self, repo, revcontainer): def __init__(self, repo, revcontainer):
self._torev = repo.changelog.rev self._torev = repo.changelog.rev
self._revcontains = revcontainer.__contains__ self._revcontains = revcontainer.__contains__
def __contains__(self, node): def __contains__(self, node):
return self._revcontains(self._torev(node)) return self._revcontains(self._torev(node))
def cleanupnodes(repo, replacements, operation, moves=None): def cleanupnodes(repo, replacements, operation, moves=None, metadata=None):
"""do common cleanups when old nodes are replaced by new nodes """do common cleanups when old nodes are replaced by new nodes
That includes writing obsmarkers or stripping nodes, and moving bookmarks. That includes writing obsmarkers or stripping nodes, and moving bookmarks.
(we might also want to move working directory parent in the future) (we might also want to move working directory parent in the future)
By default, bookmark moves are calculated automatically from 'replacements', By default, bookmark moves are calculated automatically from 'replacements',
but 'moves' can be used to override that. Also, 'moves' may include but 'moves' can be used to override that. Also, 'moves' may include
additional bookmark moves that should not have associated obsmarkers. additional bookmark moves that should not have associated obsmarkers.
replacements is {oldnode: [newnode]} or a iterable of nodes if they do not replacements is {oldnode: [newnode]} or a iterable of nodes if they do not
have replacements. operation is a string, like "rebase". have replacements. operation is a string, like "rebase".
metadata is dictionary containing metadata to be stored in obsmarker if
obsolescence is enabled.
""" """
if not replacements and not moves: if not replacements and not moves:
return return
# translate mapping's other forms # translate mapping's other forms
if not util.safehasattr(replacements, 'items'): if not util.safehasattr(replacements, 'items'):
replacements = {n: () for n in replacements} replacements = {n: () for n in replacements}
# NOTE: the filtering and sorting might belong to createmarkers. # NOTE: the filtering and sorting might belong to createmarkers.
isobs = unfi.obsstore.successors.__contains__ isobs = unfi.obsstore.successors.__contains__
torev = unfi.changelog.rev torev = unfi.changelog.rev
sortfunc = lambda ns: torev(ns[0]) sortfunc = lambda ns: torev(ns[0])
rels = [(unfi[n], tuple(unfi[m] for m in s)) rels = [(unfi[n], tuple(unfi[m] for m in s))
for n, s in sorted(replacements.items(), key=sortfunc) for n, s in sorted(replacements.items(), key=sortfunc)
if s or not isobs(n)] if s or not isobs(n)]
if rels: if rels:
obsolete.createmarkers(repo, rels, operation=operation) obsolete.createmarkers(repo, rels, operation=operation,
metadata=metadata)
else: else:
from . import repair # avoid import cycle from . import repair # avoid import cycle
tostrip = list(replacements) tostrip = list(replacements)
if tostrip: if tostrip:
repair.delayedstrip(repo.ui, repo, tostrip, operation) repair.delayedstrip(repo.ui, repo, tostrip, operation)
def addremove(repo, matcher, prefix, opts=None, dry_run=None, similarity=None): def addremove(repo, matcher, prefix, opts=None, dry_run=None, similarity=None):
if opts is None: if opts is None: