Patchwork D243: obsmarker: rename precnode into prednode

login
register
mail settings
Submitter phabricator
Date Aug. 7, 2017, 10:08 a.m.
Message ID <differential-rev-PHID-DREV-tbo6be4reru2pkhyehqm-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/22706/
State Superseded
Headers show

Comments

phabricator - Aug. 7, 2017, 10:08 a.m.
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Rename prednode (predecessors node) into precnode (precursors node) in markers
  class. Use util.nouideprecwarn because markers doesn't have easy access to an
  ui object.
  
  The renaming is done according to
  https://www.mercurial-scm.org/wiki/CEDVocabulary.

REPOSITORY
  rHG Mercurial

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

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

CHANGE DETAILS




To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
phabricator - Aug. 13, 2017, 5:05 a.m.
yuja added inline comments.

INLINE COMMENTS

> cmdutil.py:1916
>          fm.write('index', '%i ', index)
> -    fm.write('precnode', '%s ', hex(marker.precnode()))
> +    fm.write('precnode', '%s ', hex(marker.prednode()))
>      succs = marker.succnodes()

The template keyword should be updated as well. Please send a follow-up.

REPOSITORY
  rHG Mercurial

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

To: lothiraldan, #hg-reviewers, dsp
Cc: yuja, mercurial-devel
phabricator - Aug. 14, 2017, 9:24 a.m.
lothiraldan added inline comments.

INLINE COMMENTS

> yuja wrote in cmdutil.py:1916
> The template keyword should be updated as well. Please send a follow-up.

I'm not sure to see which template keyword you are talking about.

REPOSITORY
  rHG Mercurial

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

To: lothiraldan, #hg-reviewers, dsp
Cc: yuja, mercurial-devel
phabricator - Aug. 15, 2017, 1:15 a.m.
yuja added inline comments.

INLINE COMMENTS

> lothiraldan wrote in cmdutil.py:1916
> I'm not sure to see which template keyword you are talking about.

`fm.write('prednode', ...)`

REPOSITORY
  rHG Mercurial

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

To: lothiraldan, #hg-reviewers, dsp
Cc: yuja, mercurial-devel
phabricator - Aug. 16, 2017, 8:29 a.m.
lothiraldan marked 3 inline comments as done.
lothiraldan added inline comments.

INLINE COMMENTS

> yuja wrote in cmdutil.py:1916
> `fm.write('prednode', ...)`

I've send a follow-up: https://phab.mercurial-scm.org/D414

REPOSITORY
  rHG Mercurial

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

To: lothiraldan, #hg-reviewers, dsp
Cc: yuja, 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'))