Patchwork [1,of,5] help: use a single paragraph to describe full and abbreviated nodeids

login
register
mail settings
Submitter via Mercurial-devel
Date Jan. 12, 2017, 7:24 a.m.
Message ID <b75ebd3e375f85852b81.1484205870@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/18189/
State Accepted
Headers show

Comments

via Mercurial-devel - Jan. 12, 2017, 7:24 a.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1484162934 28800
#      Wed Jan 11 11:28:54 2017 -0800
# Node ID b75ebd3e375f85852b81aabc64639457ff796328
# Parent  493935e0327a2dca0987a702bf06fa89b62e6a5c
help: use a single paragraph to describe full and abbreviated nodeids

The texts describing 40-digit strings and the abbreviated form are
closely related, so make it a single paragraph.

Patch

diff -r 493935e0327a -r b75ebd3e375f mercurial/help/revisions.txt
--- a/mercurial/help/revisions.txt	Tue Jan 10 06:59:31 2017 +0800
+++ b/mercurial/help/revisions.txt	Wed Jan 11 11:28:54 2017 -0800
@@ -4,9 +4,7 @@ 
 treated as sequential offsets from the tip, with -1 denoting the tip,
 -2 denoting the revision prior to the tip, and so forth.
 
-A 40-digit hexadecimal string is treated as a unique revision
-identifier.
-
+A 40-digit hexadecimal string is treated as a unique revision identifier.
 A hexadecimal string less than 40 characters long is treated as a
 unique revision identifier and is referred to as a short-form
 identifier. A short-form identifier is only valid if it is the prefix
diff -r 493935e0327a -r b75ebd3e375f tests/test-help.t
--- a/tests/test-help.t	Tue Jan 10 06:59:31 2017 +0800
+++ b/tests/test-help.t	Wed Jan 11 11:28:54 2017 -0800
@@ -1165,7 +1165,6 @@ 
       denoting the revision prior to the tip, and so forth.
   
       A 40-digit hexadecimal string is treated as a unique revision identifier.
-  
       A hexadecimal string less than 40 characters long is treated as a unique
       revision identifier and is referred to as a short-form identifier. A
       short-form identifier is only valid if it is the prefix of exactly one
@@ -2784,10 +2783,7 @@ 
   -2 denoting the revision prior to the tip, and so forth.
   </p>
   <p>
-  A 40-digit hexadecimal string is treated as a unique revision
-  identifier.
-  </p>
-  <p>
+  A 40-digit hexadecimal string is treated as a unique revision identifier.
   A hexadecimal string less than 40 characters long is treated as a
   unique revision identifier and is referred to as a short-form
   identifier. A short-form identifier is only valid if it is the prefix