Patchwork [2,of,7] obsstore: add a `parents` argument to obsstore.create

login
register
mail settings
Submitter Pierre-Yves David
Date Aug. 19, 2014, 12:49 a.m.
Message ID <e76cbc618247482edd7c.1408409372@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/5498/
State Superseded
Commit adb3798dce492b25be5c1ee7ec273267467a7531
Headers show

Comments

Pierre-Yves David - Aug. 19, 2014, 12:49 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1408403549 25200
#      Mon Aug 18 16:12:29 2014 -0700
# Node ID e76cbc618247482edd7cf4f3ea986256b7e5a31b
# Parent  d5fefc953f30affb41ce59289d6791b116169708
obsstore: add a `parents` argument to obsstore.create

We needs a way to pass the information to the function. Some guru told me that
what's arguments are made for.

Patch

diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py
--- a/mercurial/obsolete.py
+++ b/mercurial/obsolete.py
@@ -260,12 +260,12 @@  class obsstore(object):
         return len(self._all)
 
     def __nonzero__(self):
         return bool(self._all)
 
-    def create(self, transaction, prec, succs=(), flag=0, date=None,
-               metadata=None):
+    def create(self, transaction, prec, succs=(), flag=0, parents=None,
+               date=None, metadata=None):
         """obsolete: add a new obsolete marker
 
         * ensuring it is hashable
         * check mandatory metadata
         * encode metadata
@@ -290,11 +290,11 @@  class obsstore(object):
             if len(succ) != 20:
                 raise ValueError(succ)
         if prec in succs:
             raise ValueError(_('in-marker cycle with %s') % node.hex(prec))
         marker = (str(prec), tuple(succs), int(flag), encodemeta(metadata),
-                  date, None)
+                  date, parents)
         return bool(self.add(transaction, [marker]))
 
     def add(self, transaction, markers):
         """Add new markers to the store