Patchwork D243: obsmarker: rename precnode into prednode

login
register
mail settings
Submitter phabricator
Date Aug. 9, 2017, 5:19 p.m.
Message ID <7357cea24dbcbf30ed46ae109b4a4ef9@localhost.localdomain>
Download mbox | patch
Permalink /patch/22821/
State Not Applicable
Headers show

Comments

phabricator - Aug. 9, 2017, 5:19 p.m.
lothiraldan updated this revision to Diff 705.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D243?vs=699&id=705

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

AFFECTED FILES
  mercurial/cmdutil.py
  mercurial/obsutil.py

CHANGE DETAILS




To: lothiraldan, #hg-reviewers, dsp
Cc: mercurial-devel
Gábor Stefanik - Aug. 14, 2017, 11:50 a.m.
> -----Original Message-----

> From: Mercurial-devel [mailto:mercurial-devel-bounces@mercurial-scm.org]

> On Behalf Of lothiraldan (Boris Feld)

> Sent: Wednesday, August 9, 2017 7:20 PM

> To: mercurial-devel@mercurial-scm.org

> Subject: D243: obsmarker: rename precnode into prednode

>

> lothiraldan updated this revision to Diff 705.

>

> REPOSITORY

>   rHG Mercurial

>

> CHANGES SINCE LAST UPDATE

>   https://phab.mercurial-scm.org/D243?vs=699&id=705

>

> REVISION DETAIL

>   https://phab.mercurial-scm.org/D243

>

> AFFECTED FILES

>   mercurial/cmdutil.py

>   mercurial/obsutil.py

>

> CHANGE DETAILS

>

> diff --git a/mercurial/obsutil.py b/mercurial/obsutil.py

> --- a/mercurial/obsutil.py

> +++ b/mercurial/obsutil.py

> @@ -9,6 +9,7 @@

>

>  from . import (

>      phases,

> +    util

>  )

>

>  class marker(object):

> @@ -29,15 +30,21 @@

>          return self._data == other._data

>

>      def precnode(self):

> -        """Precursor changeset node identifier"""

> +        msg = ("'marker.precnode' is deprecated, "

> +               "use 'marker.precnode'")


precnode is deprecated, use precnode instead? is that a typo?

> +        util.nouideprecwarn(msg, '4.4')

> +        return self.prednode()

> +

> +    def prednode(self):

> +        """Predecessor changeset node identifier"""

>          return self._data[0]

>

>      def succnodes(self):

>          """List of successor changesets node identifiers"""

>          return self._data[1]

>

>      def parentnodes(self):

> -        """Parents of the precursors (None if not recorded)"""

> +        """Parents of the predecessors (None if not recorded)"""

>          return self._data[5]

>

>      def metadata(self):

> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py

> --- a/mercurial/cmdutil.py

> +++ b/mercurial/cmdutil.py

> @@ -1913,7 +1913,7 @@

>      To be used by debug function."""

>      if index is not None:

>          fm.write('index', '%i ', index)

> -    fm.write('precnode', '%s ', hex(marker.precnode()))

> +    fm.write('precnode', '%s ', hex(marker.prednode()))

>      succs = marker.succnodes()

>      fm.condwrite(succs, 'succnodes', '%s ',

>                   fm.formatlist(map(hex, succs), name='node'))

>

>

>

> To: lothiraldan, #hg-reviewers, dsp

> Cc: mercurial-devel

> _______________________________________________

> Mercurial-devel mailing list

> Mercurial-devel@mercurial-scm.org

> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

________________________________
 This message, including its attachments, is confidential and the property of NNG Llc. For more information please read NNG's email policy here:
http://www.nng.com/emailpolicy/
By responding to this email you accept the email policy.
Boris Feld - Aug. 16, 2017, 8:12 a.m.
On Mon, 2017-08-14 at 11:50 +0000, Gábor STEFANIK wrote:
> > -----Original Message-----
> > From: Mercurial-devel [mailto:mercurial-devel-bounces@mercurial-scm
> > .org]
> > On Behalf Of lothiraldan (Boris Feld)
> > Sent: Wednesday, August 9, 2017 7:20 PM
> > To: mercurial-devel@mercurial-scm.org
> > Subject: D243: obsmarker: rename precnode into prednode
> > 
> > lothiraldan updated this revision to Diff 705.
> > 
> > REPOSITORY
> >   rHG Mercurial
> > 
> > CHANGES SINCE LAST UPDATE
> >   https://phab.mercurial-scm.org/D243?vs=699&id=705
> > 
> > REVISION DETAIL
> >   https://phab.mercurial-scm.org/D243
> > 
> > AFFECTED FILES
> >   mercurial/cmdutil.py
> >   mercurial/obsutil.py
> > 
> > CHANGE DETAILS
> > 
> > diff --git a/mercurial/obsutil.py b/mercurial/obsutil.py
> > --- a/mercurial/obsutil.py
> > +++ b/mercurial/obsutil.py
> > @@ -9,6 +9,7 @@
> > 
> >  from . import (
> >      phases,
> > +    util
> >  )
> > 
> >  class marker(object):
> > @@ -29,15 +30,21 @@
> >          return self._data == other._data
> > 
> >      def precnode(self):
> > -        """Precursor changeset node identifier"""
> > +        msg = ("'marker.precnode' is deprecated, "
> > +               "use 'marker.precnode'")
> 
> precnode is deprecated, use precnode instead? is that a typo?

Good catch! I will send a follow-up.

> 
> > +        util.nouideprecwarn(msg, '4.4')
> > +        return self.prednode()
> > +
> > +    def prednode(self):
> > +        """Predecessor changeset node identifier"""
> >          return self._data[0]
> > 
> >      def succnodes(self):
> >          """List of successor changesets node identifiers"""
> >          return self._data[1]
> > 
> >      def parentnodes(self):
> > -        """Parents of the precursors (None if not recorded)"""
> > +        """Parents of the predecessors (None if not recorded)"""
> >          return self._data[5]
> > 
> >      def metadata(self):
> > diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> > --- a/mercurial/cmdutil.py
> > +++ b/mercurial/cmdutil.py
> > @@ -1913,7 +1913,7 @@
> >      To be used by debug function."""
> >      if index is not None:
> >          fm.write('index', '%i ', index)
> > -    fm.write('precnode', '%s ', hex(marker.precnode()))
> > +    fm.write('precnode', '%s ', hex(marker.prednode()))
> >      succs = marker.succnodes()
> >      fm.condwrite(succs, 'succnodes', '%s ',
> >                   fm.formatlist(map(hex, succs), name='node'))
> > 
> > 
> > 
> > To: lothiraldan, #hg-reviewers, dsp
> > Cc: mercurial-devel
> > _______________________________________________
> > Mercurial-devel mailing list
> > Mercurial-devel@mercurial-scm.org
> > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> 
> ________________________________
>  This message, including its attachments, is confidential and the
> property of NNG Llc. For more information please read NNG's email
> policy here:
> http://www.nng.com/emailpolicy/
> By responding to this email you accept the email policy.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/obsutil.py b/mercurial/obsutil.py
--- a/mercurial/obsutil.py
+++ b/mercurial/obsutil.py
@@ -9,6 +9,7 @@ 
 
 from . import (
     phases,
+    util
 )
 
 class marker(object):
@@ -29,15 +30,21 @@ 
         return self._data == other._data
 
     def precnode(self):
-        """Precursor changeset node identifier"""
+        msg = ("'marker.precnode' is deprecated, "
+               "use 'marker.precnode'")
+        util.nouideprecwarn(msg, '4.4')
+        return self.prednode()
+
+    def prednode(self):
+        """Predecessor changeset node identifier"""
         return self._data[0]
 
     def succnodes(self):
         """List of successor changesets node identifiers"""
         return self._data[1]
 
     def parentnodes(self):
-        """Parents of the precursors (None if not recorded)"""
+        """Parents of the predecessors (None if not recorded)"""
         return self._data[5]
 
     def metadata(self):
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1913,7 +1913,7 @@ 
     To be used by debug function."""
     if index is not None:
         fm.write('index', '%i ', index)
-    fm.write('precnode', '%s ', hex(marker.precnode()))
+    fm.write('precnode', '%s ', hex(marker.prednode()))
     succs = marker.succnodes()
     fm.condwrite(succs, 'succnodes', '%s ',
                  fm.formatlist(map(hex, succs), name='node'))