Mercurial Queues Emulation for Git
| 修訂 | 078d06b101c4ac829af8ac3d8c2187b88f03b0d3 (tree) |
|---|---|
| 時間 | 2020-01-07 07:20:58 |
| 作者 |  Keith Marshall <keith@user...> |
| Commiter | Keith Marshall |
Avoid duplicate option definitions in git-rev-parse.
* git-mq-setup.shar.in (OPTIONS_SPEC)
[OPTION_VERBOSE_DEFINED] (--verbose): Do not add duplicate definition.
(--color): Associate short name alias with only one abbreviation.
* git-qapplied.shar git-qseries.shar
* git-qtop.shar (OPTION_VERBOSE_DEFINED): Assert it.
git-mq-setup.shar.in (diff)
git-qapplied.shar (diff) git-qseries.shar (diff) git-qtop.shar (diff)| @@ -14,7 +14,7 @@ cat <<\ETX | ||
| 14 | 14 | # $Id$ |
| 15 | 15 | # |
| 16 | 16 | # Written by Keith Marshall <keith@users.osdn.me> |
| 17 | -# Copyright (C) 2018, 2019, Keith Marshall | |
| 17 | +# Copyright (C) 2018-2020, Keith Marshall | |
| 18 | 18 | # |
| 19 | 19 | # |
| 20 | 20 | # This file is part of the Git-MQ program suite. |
| @@ -39,8 +39,9 @@ cat <<\ETX | ||
| 39 | 39 | # colour control options; ensure that they are declared: |
| 40 | 40 | # |
| 41 | 41 | OPTIONS_SPEC="$OPTIONS_SPEC |
| 42 | -v,verbose!* generic verbosity selector -- may have no effect | |
| 43 | 42 | colour?* generic output colour control -- may have no effect" |
| 43 | +${OPTION_VERBOSE_DEFINED-false} || OPTIONS_SPEC="$OPTIONS_SPEC | |
| 44 | +v,verbose!* generic verbosity selector -- may have no effect" | |
| 44 | 45 | |
| 45 | 46 | # For Git-MQ options, such as "--colour", we prefer a spelling convention |
| 46 | 47 | # which conforms to "World English" standards; however, git itself adopts |
| @@ -49,10 +50,10 @@ colour?* generic output colour control -- may have no effect" | ||
| 49 | 50 | # ambiguous, we must also explicitly declare those abbreviations: |
| 50 | 51 | # |
| 51 | 52 | OPTIONS_SPEC="$OPTIONS_SPEC |
| 52 | -],color?* hidden alias for --colour | |
| 53 | -],colo?* hidden alias for --colour | |
| 54 | -],col?* hidden alias for --colour | |
| 55 | -],co?* hidden alias for --colour | |
| 53 | +color?* hidden alias for --colour | |
| 54 | +colo?* hidden alias for --colour | |
| 55 | +col?* hidden alias for --colour | |
| 56 | +co?* hidden alias for --colour | |
| 56 | 57 | ],c?* hidden alias for --colour" |
| 57 | 58 | |
| 58 | 59 | SUBDIRECTORY_OK=true . "`git --exec-path`/git-sh-setup" && require_work_tree |
| @@ -9,7 +9,7 @@ | ||
| 9 | 9 | # $Id$ |
| 10 | 10 | # |
| 11 | 11 | # Written by Keith Marshall <keith@users.osdn.me> |
| 12 | -# Copyright (C) 2018, 2019, Keith Marshall | |
| 12 | +# Copyright (C) 2018-2020, Keith Marshall | |
| 13 | 13 | # |
| 14 | 14 | # |
| 15 | 15 | # This file is part of the Git-MQ program suite. |
| @@ -52,7 +52,7 @@ cat <<ETX | ||
| 52 | 52 | # git-sh-setup script requires the much less appropriate name "OPTIONS_SPEC", |
| 53 | 53 | # (which describes only a small subset of its actual content). |
| 54 | 54 | # |
| 55 | -OPTIONS_SPEC="\\ | |
| 55 | +OPTION_VERBOSE_DEFINED=true OPTIONS_SPEC="\\ | |
| 56 | 56 | git $1 [-v | --verbose] [-s | --summary] [-1 | --` |
| 57 | 57 | case $1 in qapplied) echo last ;; qunapplied) echo first ;; esac`] |
| 58 | 58 |
| @@ -6,7 +6,7 @@ | ||
| 6 | 6 | # $Id$ |
| 7 | 7 | # |
| 8 | 8 | # Written by Keith Marshall <keith@users.osdn.me> |
| 9 | -# Copyright (C) 2018, 2019, Keith Marshall | |
| 9 | +# Copyright (C) 2018-2020, Keith Marshall | |
| 10 | 10 | # |
| 11 | 11 | # |
| 12 | 12 | # This file is part of the Git-MQ program suite. |
| @@ -46,7 +46,7 @@ cat <<\ETX | ||
| 46 | 46 | # git-sh-setup script requires the much less appropriate name "OPTIONS_SPEC", |
| 47 | 47 | # (which describes only a small subset of its actual content). |
| 48 | 48 | # |
| 49 | -OPTIONS_SPEC="\ | |
| 49 | +OPTION_VERBOSE_DEFINED=true OPTIONS_SPEC="\ | |
| 50 | 50 | git qseries [-v | --verbose] [-s | --summary] [-m | --missing] |
| 51 | 51 | |
| 52 | 52 | List entries from the patch queue series file. |
| @@ -9,7 +9,7 @@ | ||
| 9 | 9 | # $Id$ |
| 10 | 10 | # |
| 11 | 11 | # Written by Keith Marshall <keith@users.osdn.me> |
| 12 | -# Copyright (C) 2018, 2019, Keith Marshall | |
| 12 | +# Copyright (C) 2018-2020, Keith Marshall | |
| 13 | 13 | # |
| 14 | 14 | # |
| 15 | 15 | # This file is part of the Git-MQ program suite. |
| @@ -52,7 +52,7 @@ cat <<ETX | ||
| 52 | 52 | # git-sh-setup script requires the much less appropriate name "OPTIONS_SPEC", |
| 53 | 53 | # (which describes only a small subset of its actual content). |
| 54 | 54 | # |
| 55 | -OPTIONS_SPEC="\\ | |
| 55 | +OPTION_VERBOSE_DEFINED=true OPTIONS_SPEC="\\ | |
| 56 | 56 | git $1 [-v | --verbose] [-s | --summary] |
| 57 | 57 | |
| 58 | 58 | `case $1 in |
Fork