Patchwork [STABLE] log: update documentation about --follow with/without --rev (issue6459)

login
register
mail settings
Submitter Yuya Nishihara
Date Dec. 24, 2020, 9:51 a.m.
Message ID <6ad7f9653fef0cba2d3a.1608803480@lemosa>
Download mbox | patch
Permalink /patch/47968/
State Accepted
Headers show

Comments

Yuya Nishihara - Dec. 24, 2020, 9:51 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1608793088 -32400
#      Thu Dec 24 15:58:08 2020 +0900
# Branch stable
# Node ID 6ad7f9653fef0cba2d3a6858c4ac83aeb50f577f
# Parent  734d051d0efb8122e1680895b214b1d143895273
log: update documentation about --follow with/without --rev (issue6459)
Pulkit Goyal - Dec. 28, 2020, 7:55 a.m.
On Thu, Dec 24, 2020 at 3:21 PM Yuya Nishihara <yuya@tcha.org> wrote:
>
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1608793088 -32400
> #      Thu Dec 24 15:58:08 2020 +0900
> # Branch stable
> # Node ID 6ad7f9653fef0cba2d3a6858c4ac83aeb50f577f
> # Parent  734d051d0efb8122e1680895b214b1d143895273
> log: update documentation about --follow with/without --rev (issue6459)

Queued for stable, many thanks!

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4386,7 +4386,7 @@  def locate(ui, repo, *pats, **opts):
             b'r',
             b'rev',
             [],
-            _(b'show the specified revision or revset'),
+            _(b'revisions to select or follow from'),
             _(b'REV'),
         ),
         (
@@ -4448,13 +4448,13 @@  def log(ui, repo, *pats, **opts):
     project.
 
     If no revision range is specified, the default is ``tip:0`` unless
-    --follow is set, in which case the working directory parent is
-    used as the starting revision.
+    --follow is set.
 
     File history is shown without following rename or copy history of
     files. Use -f/--follow with a filename to follow history across
     renames and copies. --follow without a filename will only show
-    ancestors of the starting revision.
+    ancestors of the starting revisions. The starting revisions can be
+    specified by -r/--rev, which default to the working directory parent.
 
     By default this command prints revision number and changeset id,
     tags, non-trivial parents, user, date and time, and a summary for