[PATCH 2 of 3 V4] update: treat the verbose parts in help as verbose

Adrian Buehlmann adrian at cadifra.com
Tue Jul 10 14:34:23 CDT 2012


# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1341948352 -7200
# Node ID d26dfa2182de1293781f91a0dee1836e764e9a32
# Parent  bbfbdd2517018c3d0f3e6e923f835ab611bce141
update: treat the verbose parts in help as verbose

Now requires 'hg help update -v' to see these parts.

Plain 'hg help update' now shows:

  $ hg help update
  hg update [-c] [-C] [-d DATE] [[-r] REV]

  aliases: up, checkout, co

  update working directory (or switch revisions)

      Update the repository's working directory to the specified changeset. If
      no changeset is specified, update to the tip of the current named branch
      and move the current bookmark (see "hg help bookmarks").

      Update sets the working directory's parent revison to the specified
      changeset (see "hg help parents").

      Use null as the changeset to remove the working directory (like "hg clone
      -U").

      If you want to revert just one file to an older revision, use "hg revert
      [-r REV] NAME".

      See "hg help dates" for a list of formats valid for -d/--date.

      Returns 0 on success, 1 if there are unresolved files.

  options:

   -C --clean     discard uncommitted changes (no backup)
   -c --check     update across branches if no uncommitted changes
   -d --date DATE tipmost revision matching date
   -r --rev REV   revision
      --mq        operate on patch repository

  use "hg -v help update" to show more info

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5693,29 +5693,31 @@
     Update sets the working directory's parent revison to the specified
     changeset (see :hg:`help parents`).
 
-    If the changeset is not a descendant or ancestor of the working
-    directory's parent, the update is aborted. With the -c/--check
-    option, the working directory is checked for uncommitted changes; if
-    none are found, the working directory is updated to the specified
-    changeset.
-
-    The following rules apply when the working directory contains
-    uncommitted changes:
-
-    1. If neither -c/--check nor -C/--clean is specified, and if
-       the requested changeset is an ancestor or descendant of
-       the working directory's parent, the uncommitted changes
-       are merged into the requested changeset and the merged
-       result is left uncommitted. If the requested changeset is
-       not an ancestor or descendant (that is, it is on another
-       branch), the update is aborted and the uncommitted changes
-       are preserved.
-
-    2. With the -c/--check option, the update is aborted and the
-       uncommitted changes are preserved.
-
-    3. With the -C/--clean option, uncommitted changes are discarded and
-       the working directory is updated to the requested changeset.
+    .. container:: verbose
+
+      If the changeset is not a descendant or ancestor of the working
+      directory's parent, the update is aborted. With the -c/--check
+      option, the working directory is checked for uncommitted changes; if
+      none are found, the working directory is updated to the specified
+      changeset.
+
+      The following rules apply when the working directory contains
+      uncommitted changes:
+
+      1. If neither -c/--check nor -C/--clean is specified, and if
+         the requested changeset is an ancestor or descendant of
+         the working directory's parent, the uncommitted changes
+         are merged into the requested changeset and the merged
+         result is left uncommitted. If the requested changeset is
+         not an ancestor or descendant (that is, it is on another
+         branch), the update is aborted and the uncommitted changes
+         are preserved.
+
+      2. With the -c/--check option, the update is aborted and the
+         uncommitted changes are preserved.
+
+      3. With the -C/--clean option, uncommitted changes are discarded and
+         the working directory is updated to the requested changeset.
 
     Use null as the changeset to remove the working directory (like
     :hg:`clone -U`).


More information about the Mercurial-devel mailing list