Patchwork D1093: scmutil: add capability to cleanupnodes to take obsmarker metadata

login
register
mail settings
Submitter phabricator
Date Oct. 17, 2017, 1:47 a.m.
Message ID <67bff12a0560639f9ead5b4edfe657cd@localhost.localdomain>
Download mbox | patch
Permalink /patch/25060/
State Not Applicable
Headers show

Comments

phabricator - Oct. 17, 2017, 1:47 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG162e8807abad: scmutil: add capability to cleanupnodes to take obsmarker metadata (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1093?vs=2783&id=2873

REVISION DETAIL
  https://phab.mercurial-scm.org/D1093

AFFECTED FILES
  mercurial/scmutil.py

CHANGE DETAILS




To: pulkit, #hg-reviewers, dlax, durin42
Cc: mercurial-devel

Patch

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -613,7 +613,7 @@ 
     def __contains__(self, 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
 
     That includes writing obsmarkers or stripping nodes, and moving bookmarks.
@@ -625,6 +625,9 @@ 
 
     replacements is {oldnode: [newnode]} or a iterable of nodes if they do not
     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:
         return
@@ -695,7 +698,8 @@ 
                     for n, s in sorted(replacements.items(), key=sortfunc)
                     if s or not isobs(n)]
             if rels:
-                obsolete.createmarkers(repo, rels, operation=operation)
+                obsolete.createmarkers(repo, rels, operation=operation,
+                                       metadata=metadata)
         else:
             from . import repair # avoid import cycle
             tostrip = list(replacements)