Patchwork context: use new names for unstable changesets in docstrings

login
register
mail settings
Submitter Anton Shestakov
Date Aug. 27, 2018, 4:34 p.m.
Message ID <3e3b9ae9771f96561163.1535387676@neuro>
Download mbox | patch
Permalink /patch/34101/
State Accepted
Headers show

Comments

Anton Shestakov - Aug. 27, 2018, 4:34 p.m.
# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1535387530 -28800
#      Tue Aug 28 00:32:10 2018 +0800
# Node ID 3e3b9ae9771f965611633ff21b168ac0f7b4bb06
# Parent  bb2b462f81daae07d5400aee7db794857959979c
context: use new names for unstable changesets in docstrings

Plus slight corrections.
Yuya Nishihara - Aug. 28, 2018, 11:38 a.m.
On Tue, 28 Aug 2018 00:34:36 +0800, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov <av6@dwimlabs.net>
> # Date 1535387530 -28800
> #      Tue Aug 28 00:32:10 2018 +0800
> # Node ID 3e3b9ae9771f965611633ff21b168ac0f7b4bb06
> # Parent  bb2b462f81daae07d5400aee7db794857959979c
> context: use new names for unstable changesets in docstrings

Queued, thanks.

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -193,25 +193,26 @@  class basectx(object):
         return self.rev() in obsmod.getrevs(self._repo, 'extinct')
 
     def orphan(self):
-        """True if the changeset is not obsolete but it's ancestor are"""
+        """True if the changeset is not obsolete, but its ancestor is"""
         return self.rev() in obsmod.getrevs(self._repo, 'orphan')
 
     def phasedivergent(self):
-        """True if the changeset try to be a successor of a public changeset
+        """True if the changeset tries to be a successor of a public changeset
 
-        Only non-public and non-obsolete changesets may be bumped.
+        Only non-public and non-obsolete changesets may be phase-divergent.
         """
         return self.rev() in obsmod.getrevs(self._repo, 'phasedivergent')
 
     def contentdivergent(self):
-        """Is a successors of a changeset with multiple possible successors set
+        """Is a successor of a changeset with multiple possible successor sets
 
-        Only non-public and non-obsolete changesets may be divergent.
+        Only non-public and non-obsolete changesets may be content-divergent.
         """
         return self.rev() in obsmod.getrevs(self._repo, 'contentdivergent')
 
     def isunstable(self):
-        """True if the changeset is either unstable, bumped or divergent"""
+        """True if the changeset is either orphan, phase-divergent or
+        content-divergent"""
         return self.orphan() or self.phasedivergent() or self.contentdivergent()
 
     def instabilities(self):