Commits

Yujie Wu  committed 6871ba2

Adjusted the help message: Sorted the options based on the alphalet order.

  • Participants
  • Parent commits 9c7622b
  • Branches hotfix/0.9.5

Comments (0)

Files changed (1)

File src/hgflow.py

 
 examples:
 {{{> hg flow develop promote -t v0.2.0}}}
-# Immediately release <develop> trunk's tip into <master>, bypassing <release>. What this command exactly does is to promote
-# the <develop> trunk into <master> (<master> is <develop>'s default promotion destination, so you don't have to spell it out
-# in the command), and then label the <master> snapshot with "v0.2.0".
+# Immediately release <develop> trunk's tip into <master>, bypassing <release>.
+# What this command exactly does is to promote the <develop> trunk into
+# <master> (<master> is <develop>'s default promotion destination, so you don't
+# have to spell it out in the command), and then label the <master> snapshot
+# with "v0.2.0".
 """,
         
 "@rebase" : """
     (flow_cmd,
      [("",  "history",   False, _("Print history of hg commands used in this workflow."),                          ),
       ("",  "dry-run",   None,  _("Do not perform actions, just print history."),                                  ),
-      ("f", "force",     False, _("Force reinitializing flow. [init]"),                                            ),
-      ("r", "rev",       '',    _("Revision to start a new branch from. [start]"),                       _('REV'), ),
       ("",  "dirty",     False, _("Start a new branch from a dirty workspace, and move all"
                                   " uncommitted changes to the new branch. [start]"),                              ),
+      ("c", "closed",    False, _("Show normal and closed branches in stream. [list, log]"),                       ),
       ("c", "commit",    False, _("Commit changes before closing the branch. [finish]"),                           ),
+      ("d", "date",      '',    _("Record the specified date as commit date. [start, finish, promote]"), _('DATE'),),
+      ("d", "date",      '',    _("Show revisions matching date spec. [log]"),                           _('DATE'),),
+      ("d", "dest",      '',    _("Destination changeset of rebasing. [rebase]"),                        _('REV' ),),
       ("e", "erase",     False, _("Erase branch after it is merged successfully or aborted. [finish, abort]"),     ),
-      ("d", "date",      '',    _("Record the specified date as commit date. [start, finish, promote]"), _('DATE'),),
-      ("u", "user",      '',    _("Use specified user. [init, start, finish, log, promote]"),            _('USER'),),
+      ("F", "file",      [],    _("File to show history of. [log]"),                                     _('FILE'),),
+      ("f", "force",     False, _("Force reinitializing flow. [init]"),                                            ),
+      ("g", "git",       False, _("Use git extended diff format to show patch. [log]"),                            ),
+      ("k", "keyword",   '',    _("Do case-insensitive search for a given text. [log]"),                 _('TEXT'),),
+      ("l", "limit",     '',    _("Limit number of changesets displayed. [log]"),                                  ),
       ("m", "message",   '',    _("Record TEXT as commit message. [start, finish, promote, abort]"),     _('TEXT'),),
+      ("p", "patch",     False, _("Show patch. [log]"),                                                            ),
+      ("r", "rev",       '',    _("Revision to start a new branch from. [start]"),                       _('REV'), ),
+      ("r", "rev",       '',    _("Revision to promote to other branches. [promote]"),                   _('REV'), ),
+      ("s", "onstream",  False, _("Act on stream. [finish, rebase, log, abort]"),                                  ),
       ("t", "tag",       '',    _("Tag the merging changeset with NAME. [promote]"),                     _('NAME'),),
-      ("c", "closed",    False, _("Show normal and closed branches in stream. [list, log]"),                       ),
-      ("F", "file",      [],    _("File to show history of. [log]"),                                     _('FILE'),),
-      ("d", "date",      '',    _("Show revisions matching date spec. [log]"),                           _('DATE'),),
-      ("k", "keyword",   '',    _("Do case-insensitive search for a given text. [log]"),                 _('TEXT'),),
-      ("p", "patch",     False, _("Show patch. [log]"),                                                            ),
-      ("g", "git",       False, _("Use git extended diff format to show patch. [log]"),                            ),
-      ("l", "limit",     '',    _("Limit number of changesets displayed. [log]"),                                  ),
-      ("r", "rev",       '',    _("Revision to promote to other branches. [promote]"),                   _('REV'), ),
-      ("d", "dest",      '',    _("Destination changeset of rebasing. [rebase]"),                        _('REV' ),),
-      ("s", "onstream",  False, _("Act on stream. [finish, rebase, log, abort]"),                                  ),
+      ("u", "user",      '',    _("Use specified user as committer. [init, start, finish, promote]"),    _('USER'),),
+      ("u", "user",      '',    _("Show revisions committed by specified user. [log]"),                  _('USER'),),
      ],
      "hg flow {<stream> [<action> [<arg>]] | <command>} [<option>...]",
      ),