Mercurial Queues Emulation for Git
Revision | 9e42d9209fd67d54b805fbad7ef71808393952f2 (tree) |
---|---|
Time | 2019-06-06 21:12:41 |
Author | Keith Marshall <keith@user...> |
Commiter | Keith Marshall |
Consistently capitalize package name references.
* configure.ac git-mq-cache-check.sh git-mq-integrity-check.sh
* git-mq-setup.shar.in git-qapplied.shar git-qdelete.shar
* git-qdiff.shar git-qfinish-all.sh git-qfinish-named.sh
* git-qfinish.shar git-qgoto-init.sh git-qgoto.shar git-qguard.shar
* git-qheader.shar git-qimport.shar git-qpop-backend.sh
* git-qpush-backend.sh git-qselect.shar git-qseries.shar git-qtop.shar
* git-rev-import.sh: s/git-mq/Git-MQ/ in comments, and message text,
when referring to the Git-MQ package, or concept.
@@ -1,23 +1,23 @@ | ||
1 | 1 | # configure.ac |
2 | 2 | # ------------------------------------------------------------------------------ |
3 | 3 | # |
4 | -# A minimal configure script generator template, for the git-mq package. | |
4 | +# A minimal configure script generator template, for the Git-MQ package. | |
5 | 5 | # |
6 | 6 | # $Id$ |
7 | 7 | # |
8 | 8 | # Written by Keith Marshall <keith@users.osdn.me> |
9 | -# Copyright (C) 2018, MinGW.org Project | |
9 | +# Copyright (C) 2018, 2019, MinGW.org Project | |
10 | 10 | # |
11 | 11 | # ------------------------------------------------------------------------------ |
12 | 12 | # |
13 | -# This file is part of the git-mq program suite. | |
13 | +# This file is part of the Git-MQ program suite. | |
14 | 14 | # |
15 | -# The git-mq program suite is free software: you can redistribute it | |
15 | +# The Git-MQ program suite is free software: you can redistribute it | |
16 | 16 | # and/or modify it under the terms of the GNU General Public Licence |
17 | 17 | # as published by the Free Software Foundation, either version 3 of |
18 | 18 | # the Licence, or (at your option) any later version. |
19 | 19 | # |
20 | -# The git-mq program suite is distributed in the hope that it will be | |
20 | +# The Git-MQ program suite is distributed in the hope that it will be | |
21 | 21 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
22 | 22 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
23 | 23 | # GNU General Public Licence for more details. |
@@ -12,14 +12,14 @@ | ||
12 | 12 | # Copyright (C) 2019, Keith Marshall |
13 | 13 | # |
14 | 14 | # |
15 | -# This file is part of the git-mq program suite. | |
15 | +# This file is part of the Git-MQ program suite. | |
16 | 16 | # |
17 | -# The git-mq program suite is free software: you can redistribute it | |
17 | +# The Git-MQ program suite is free software: you can redistribute it | |
18 | 18 | # and/or modify it under the terms of the GNU General Public Licence |
19 | 19 | # as published by the Free Software Foundation, either version 3 of |
20 | 20 | # the Licence, or (at your option) any later version. |
21 | 21 | # |
22 | -# The git-mq program suite is distributed in the hope that it will be | |
22 | +# The Git-MQ program suite is distributed in the hope that it will be | |
23 | 23 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
24 | 24 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
25 | 25 | # GNU General Public Licence for more details. |
@@ -13,14 +13,14 @@ | ||
13 | 13 | # Copyright (C) 2019, Keith Marshall |
14 | 14 | # |
15 | 15 | # |
16 | -# This file is part of the git-mq program suite. | |
16 | +# This file is part of the Git-MQ program suite. | |
17 | 17 | # |
18 | -# The git-mq program suite is free software: you can redistribute it | |
18 | +# The Git-MQ program suite is free software: you can redistribute it | |
19 | 19 | # and/or modify it under the terms of the GNU General Public Licence |
20 | 20 | # as published by the Free Software Foundation, either version 3 of |
21 | 21 | # the Licence, or (at your option) any later version. |
22 | 22 | # |
23 | -# The git-mq program suite is distributed in the hope that it will be | |
23 | +# The Git-MQ program suite is distributed in the hope that it will be | |
24 | 24 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
25 | 25 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
26 | 26 | # GNU General Public Licence for more details. |
@@ -2,7 +2,7 @@ | ||
2 | 2 | # ------------------------------------------------------------------------------ |
3 | 3 | # |
4 | 4 | # Shell archive overlay for injection of the common set-up code, which is |
5 | -# required by all git-mq commands, into each individual generated command | |
5 | +# required by all Git-MQ commands, into each individual generated command | |
6 | 6 | # source code data stream, at "make" time. |
7 | 7 | # |
8 | 8 | # ------------------------------------------------------------------------------ |
@@ -14,16 +14,17 @@ cat <<\ETX | ||
14 | 14 | # $Id$ |
15 | 15 | # |
16 | 16 | # Written by Keith Marshall <keith@users.osdn.me> |
17 | -# Copyright (C) 2018, Keith Marshall | |
17 | +# Copyright (C) 2018, 2019, Keith Marshall | |
18 | 18 | # |
19 | -# This file is part of the git-mq program suite. | |
20 | 19 | # |
21 | -# The git-mq program suite is free software: you can redistribute it | |
20 | +# This file is part of the Git-MQ program suite. | |
21 | +# | |
22 | +# The Git-MQ program suite is free software: you can redistribute it | |
22 | 23 | # and/or modify it under the terms of the GNU General Public Licence |
23 | 24 | # as published by the Free Software Foundation, either version 3 of |
24 | 25 | # the Licence, or (at your option) any later version. |
25 | 26 | # |
26 | -# The git-mq program suite is distributed in the hope that it will be | |
27 | +# The Git-MQ program suite is distributed in the hope that it will be | |
27 | 28 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
28 | 29 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
29 | 30 | # GNU General Public Licence for more details. |
@@ -33,7 +34,7 @@ cat <<\ETX | ||
33 | 34 | # |
34 | 35 | # ------------------------------------------------------------------------------ |
35 | 36 | # |
36 | -# Although they may not always have any effect, all git-mq commands, like | |
37 | +# Although they may not always have any effect, all Git-MQ commands, like | |
37 | 38 | # their hg counterparts, are expected to accept the global verbosity, and |
38 | 39 | # colour control options; ensure that they are declared: |
39 | 40 | # |
@@ -41,7 +42,7 @@ OPTIONS_SPEC="$OPTIONS_SPEC | ||
41 | 42 | v,verbose!* generic verbosity selector -- may have no effect |
42 | 43 | colour?* generic output colour control -- may have no effect" |
43 | 44 | |
44 | -# For git-mq options, such as "--colour", we prefer a spelling convention | |
45 | +# For Git-MQ options, such as "--colour", we prefer a spelling convention | |
45 | 46 | # which conforms to "World English" standards; however, git itself adopts |
46 | 47 | # "US English" convention. Thus, we must also declare "--color" as alias |
47 | 48 | # for "--colour", and since this makes most of the possible abbreviations |
@@ -9,16 +9,17 @@ | ||
9 | 9 | # $Id$ |
10 | 10 | # |
11 | 11 | # Written by Keith Marshall <keith@users.osdn.me> |
12 | -# Copyright (C) 2018, Keith Marshall | |
12 | +# Copyright (C) 2018, 2019, Keith Marshall | |
13 | 13 | # |
14 | -# This file is part of the git-mq program suite. | |
15 | 14 | # |
16 | -# The git-mq program suite is free software: you can redistribute it | |
15 | +# This file is part of the Git-MQ program suite. | |
16 | +# | |
17 | +# The Git-MQ program suite is free software: you can redistribute it | |
17 | 18 | # and/or modify it under the terms of the GNU General Public Licence |
18 | 19 | # as published by the Free Software Foundation, either version 3 of |
19 | 20 | # the Licence, or (at your option) any later version. |
20 | 21 | # |
21 | -# The git-mq program suite is distributed in the hope that it will be | |
22 | +# The Git-MQ program suite is distributed in the hope that it will be | |
22 | 23 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
23 | 24 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
24 | 25 | # GNU General Public Licence for more details. |
@@ -32,7 +33,7 @@ cat <<ETX | ||
32 | 33 | #!/bin/sh |
33 | 34 | # ------------------------------------------------------------------------------ |
34 | 35 | # |
35 | -# git-$1.sh: Implement the git-mq "git $1" extension command. | |
36 | +# git-$1.sh: Implement the Git-MQ "git $1" extension command. | |
36 | 37 | # |
37 | 38 | ETX |
38 | 39 | cat <<\ETX |
@@ -68,7 +69,7 @@ v,verbose! show patch sequence numbers and status flags" | ||
68 | 69 | ETX |
69 | 70 | |
70 | 71 | # Incorporate the universal set-up code, which is common to all of the |
71 | -# git-mq command implementations. | |
72 | +# Git-MQ command implementations. | |
72 | 73 | # |
73 | 74 | . ./git-mq-setup.shar |
74 | 75 |
@@ -1,8 +1,6 @@ | ||
1 | 1 | # git-qdelete.shar |
2 | 2 | # ------------------------------------------------------------------------------ |
3 | -# | |
4 | 3 | # Shell archive to deliver the implementation for the "git qdelete" command. |
5 | -# | |
6 | 4 | # ------------------------------------------------------------------------------ |
7 | 5 | # |
8 | 6 | # $Id$ |
@@ -11,14 +9,14 @@ | ||
11 | 9 | # Copyright (C) 2019, Keith Marshall |
12 | 10 | # |
13 | 11 | # |
14 | -# This file is part of the git-mq program suite. | |
12 | +# This file is part of the Git-MQ program suite. | |
15 | 13 | # |
16 | -# The git-mq program suite is free software: you can redistribute it | |
14 | +# The Git-MQ program suite is free software: you can redistribute it | |
17 | 15 | # and/or modify it under the terms of the GNU General Public Licence |
18 | 16 | # as published by the Free Software Foundation, either version 3 of |
19 | 17 | # the Licence, or (at your option) any later version. |
20 | 18 | # |
21 | -# The git-mq program suite is distributed in the hope that it will be | |
19 | +# The Git-MQ program suite is distributed in the hope that it will be | |
22 | 20 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
23 | 21 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
24 | 22 | # GNU General Public Licence for more details. |
@@ -32,10 +30,10 @@ cat <<\ETX | ||
32 | 30 | #!/bin/sh |
33 | 31 | # ------------------------------------------------------------------------------ |
34 | 32 | # |
35 | -# git-qdelete.sh: Implement the git-mq "git qdelete" extension command. | |
33 | +# git-qdelete.sh: Implement the Git-MQ "git qdelete" extension command. | |
36 | 34 | # |
37 | -# Remove patches from the git-mq patch series, and optionally delete the | |
38 | -# associated patch files from the git-mq patch directory. Applied patches | |
35 | +# Remove patches from the Git-MQ patch series, and optionally delete the | |
36 | +# associated patch files from the Git-MQ patch directory. Applied patches | |
39 | 37 | # cannot be deleted. |
40 | 38 | # |
41 | 39 | # $Id$ |
@@ -51,21 +49,21 @@ mq_facility="git qdelete" | ||
51 | 49 | OPTIONS_SPEC="\ |
52 | 50 | git qdelete [-k | --keep] <patch> ... |
53 | 51 | |
54 | -Remove patches from the git-mq patch series, and from project history; | |
55 | -by default, also delete the associated patch files from the git-mq patch | |
52 | +Remove patches from the Git-MQ patch series, and from project history; | |
53 | +by default, also delete the associated patch files from the Git-MQ patch | |
56 | 54 | directory. Patches which have been applied cannot be removed. |
57 | 55 | -- |
58 | 56 | k,keep! retain the patch file(s) in the patch directory" |
59 | 57 | ETX |
60 | 58 | |
61 | 59 | # Incorporate the universal set-up code, which is common to all of |
62 | -# the git-mq command implementations. | |
60 | +# the Git-MQ command implementations. | |
63 | 61 | # |
64 | 62 | . ./git-mq-setup.shar |
65 | 63 | |
66 | 64 | cat <<\ETX |
67 | 65 | # Check if the "--keep" option has been specified; ignore any of |
68 | -# the standard git-mq options, which may have been specified on the | |
66 | +# the standard Git-MQ options, which may have been specified on the | |
69 | 67 | # command line. |
70 | 68 | # |
71 | 69 | while git_mq_getopt "$@" |
@@ -1,8 +1,6 @@ | ||
1 | 1 | # git-qdiff.shar |
2 | 2 | # ------------------------------------------------------------------------------ |
3 | -# | |
4 | 3 | # Shell archive to deliver the implementation for the "git qdiff" command. |
5 | -# | |
6 | 4 | # ------------------------------------------------------------------------------ |
7 | 5 | # |
8 | 6 | # $Id$ |
@@ -11,14 +9,14 @@ | ||
11 | 9 | # Copyright (C) 2019, Keith Marshall |
12 | 10 | # |
13 | 11 | # |
14 | -# This file is part of the git-mq program suite. | |
12 | +# This file is part of the Git-MQ program suite. | |
15 | 13 | # |
16 | -# The git-mq program suite is free software: you can redistribute it | |
14 | +# The Git-MQ program suite is free software: you can redistribute it | |
17 | 15 | # and/or modify it under the terms of the GNU General Public Licence |
18 | 16 | # as published by the Free Software Foundation, either version 3 of |
19 | 17 | # the Licence, or (at your option) any later version. |
20 | 18 | # |
21 | -# The git-mq program suite is distributed in the hope that it will be | |
19 | +# The Git-MQ program suite is distributed in the hope that it will be | |
22 | 20 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
23 | 21 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
24 | 22 | # GNU General Public Licence for more details. |
@@ -32,7 +30,7 @@ cat <<\ETX | ||
32 | 30 | #!/bin/sh |
33 | 31 | # ------------------------------------------------------------------------------ |
34 | 32 | # |
35 | -# git-qdiff.sh: Implement the git-mq "git qdiff" extension command. | |
33 | +# git-qdiff.sh: Implement the Git-MQ "git qdiff" extension command. | |
36 | 34 | # |
37 | 35 | # Display a diff representing the content of the current topmost patch, |
38 | 36 | # augmented by any working directory changes made since the last refresh |
@@ -66,7 +64,7 @@ stat! display a diffstat summary of changes" | ||
66 | 64 | ETX |
67 | 65 | |
68 | 66 | # Incorporate the universal set-up code, which is common to all of the |
69 | -# git-mq command implementations. | |
67 | +# Git-MQ command implementations. | |
70 | 68 | # |
71 | 69 | . ./git-mq-setup.shar |
72 | 70 |
@@ -121,7 +119,7 @@ mq_fatal="mq_abort 2 fatal:" | ||
121 | 119 | # In addition to the preceding integrity check, we also require that |
122 | 120 | # at least one patch, from within the queue, has been applied. |
123 | 121 | # |
124 | -mq_top=`git qtop` || $mq_fatal "no git-mq managed patches have been applied" | |
122 | +mq_top=`git qtop` || $mq_fatal "no Git-MQ managed patches have been applied" | |
125 | 123 | |
126 | 124 | # The required "git qdiff" patch is simply the difference in state |
127 | 125 | # between the immediate parent commit of the topmost patch, when any |
@@ -2,9 +2,9 @@ | ||
2 | 2 | # ------------------------------------------------------------------------------ |
3 | 3 | # |
4 | 4 | # Supplementary shell script fragment; invoked via "mq_require", it performs |
5 | -# the clean up actions required when all currently applied git-mq patches are | |
6 | -# converted from managed patches to regular commits, removed from the git-mq | |
7 | -# patch series, and released from git-mq control. | |
5 | +# the clean up actions required when all currently applied Git-MQ patches are | |
6 | +# converted from managed patches to regular commits, removed from the Git-MQ | |
7 | +# patch series, and released from Git-MQ control. | |
8 | 8 | # |
9 | 9 | # ------------------------------------------------------------------------------ |
10 | 10 | # |
@@ -14,14 +14,14 @@ | ||
14 | 14 | # Copyright (C) 2019, Keith Marshall |
15 | 15 | # |
16 | 16 | # |
17 | -# This file is part of the git-mq program suite. | |
17 | +# This file is part of the Git-MQ program suite. | |
18 | 18 | # |
19 | -# The git-mq program suite is free software: you can redistribute it | |
19 | +# The Git-MQ program suite is free software: you can redistribute it | |
20 | 20 | # and/or modify it under the terms of the GNU General Public Licence |
21 | 21 | # as published by the Free Software Foundation, either version 3 of |
22 | 22 | # the Licence, or (at your option) any later version. |
23 | 23 | # |
24 | -# The git-mq program suite is distributed in the hope that it will be | |
24 | +# The Git-MQ program suite is distributed in the hope that it will be | |
25 | 25 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
26 | 26 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
27 | 27 | # GNU General Public Licence for more details. |
@@ -3,8 +3,8 @@ | ||
3 | 3 | # |
4 | 4 | # Supplementary shell script fragment; invoked via "mq_require", it performs |
5 | 5 | # the clean up actions required when an explicitly named sequence of currently |
6 | -# applied git-mq patches are converted from managed patches to regular commits, | |
7 | -# removed from the git-mq patch series, and released from git-mq control. | |
6 | +# applied Git-MQ patches are converted from managed patches to regular commits, | |
7 | +# removed from the Git-MQ patch series, and released from Git-MQ control. | |
8 | 8 | # |
9 | 9 | # ------------------------------------------------------------------------------ |
10 | 10 | # |
@@ -14,14 +14,14 @@ | ||
14 | 14 | # Copyright (C) 2019, Keith Marshall |
15 | 15 | # |
16 | 16 | # |
17 | -# This file is part of the git-mq program suite. | |
17 | +# This file is part of the Git-MQ program suite. | |
18 | 18 | # |
19 | -# The git-mq program suite is free software: you can redistribute it | |
19 | +# The Git-MQ program suite is free software: you can redistribute it | |
20 | 20 | # and/or modify it under the terms of the GNU General Public Licence |
21 | 21 | # as published by the Free Software Foundation, either version 3 of |
22 | 22 | # the Licence, or (at your option) any later version. |
23 | 23 | # |
24 | -# The git-mq program suite is distributed in the hope that it will be | |
24 | +# The Git-MQ program suite is distributed in the hope that it will be | |
25 | 25 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
26 | 26 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
27 | 27 | # GNU General Public Licence for more details. |
@@ -1,8 +1,6 @@ | ||
1 | 1 | # git-qfinish.shar |
2 | 2 | # ------------------------------------------------------------------------------ |
3 | -# | |
4 | 3 | # Shell archive to deliver the implementation for the "git qfinish" command. |
5 | -# | |
6 | 4 | # ------------------------------------------------------------------------------ |
7 | 5 | # |
8 | 6 | # $Id$ |
@@ -11,14 +9,14 @@ | ||
11 | 9 | # Copyright (C) 2019, Keith Marshall |
12 | 10 | # |
13 | 11 | # |
14 | -# This file is part of the git-mq program suite. | |
12 | +# This file is part of the Git-MQ program suite. | |
15 | 13 | # |
16 | -# The git-mq program suite is free software: you can redistribute it | |
14 | +# The Git-MQ program suite is free software: you can redistribute it | |
17 | 15 | # and/or modify it under the terms of the GNU General Public Licence |
18 | 16 | # as published by the Free Software Foundation, either version 3 of |
19 | 17 | # the Licence, or (at your option) any later version. |
20 | 18 | # |
21 | -# The git-mq program suite is distributed in the hope that it will be | |
19 | +# The Git-MQ program suite is distributed in the hope that it will be | |
22 | 20 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
23 | 21 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
24 | 22 | # GNU General Public Licence for more details. |
@@ -32,9 +30,9 @@ cat <<\ETX | ||
32 | 30 | #!/bin/sh |
33 | 31 | # ------------------------------------------------------------------------------ |
34 | 32 | # |
35 | -# git-qfinish.sh: Implement the git-mq "git qfinish" extension command. | |
33 | +# git-qfinish.sh: Implement the Git-MQ "git qfinish" extension command. | |
36 | 34 | # |
37 | -# Move a specified sequence of applied git-mq patches out of git-mq control, | |
35 | +# Move a specified sequence of applied Git-MQ patches out of Git-MQ control, | |
38 | 36 | # delete the associated patch tags, and patch files, leaving the associated |
39 | 37 | # commit objects in place; the specified patch sequence must be contiguous, |
40 | 38 | # and must extend from the base of the patch stack. |
@@ -55,7 +53,7 @@ git qfinish <patch-range> ... [<patch> [<patch-range>]] ... | ||
55 | 53 | git qfinish --applied |
56 | 54 | |
57 | 55 | Release a specified patch, sequence of patches, or all applied |
58 | -patches from git-mq control, leaving each as a regular commit; | |
56 | +patches from Git-MQ control, leaving each as a regular commit; | |
59 | 57 | any explicitly specified patches must represent a contiguous |
60 | 58 | sequence at the base of the patch series stack. |
61 | 59 | -- |
@@ -63,13 +61,13 @@ a,applied! release all currently applied patches" | ||
63 | 61 | ETX |
64 | 62 | |
65 | 63 | # Incorporate the universal set-up code, which is common to all of |
66 | -# the git-mq command implementations. | |
64 | +# the Git-MQ command implementations. | |
67 | 65 | # |
68 | 66 | . ./git-mq-setup.shar |
69 | 67 | |
70 | 68 | cat <<\ETX |
71 | 69 | # Check if the "--applied" option has been specified; ignore any of |
72 | -# the standard git-mq options, which may have been specified on the | |
70 | +# the standard Git-MQ options, which may have been specified on the | |
73 | 71 | # command line. |
74 | 72 | # |
75 | 73 | while git_mq_getopt "$@" |
@@ -11,14 +11,15 @@ | ||
11 | 11 | # Written by Keith Marshall <keith@users.osdn.me> |
12 | 12 | # Copyright (C) 2019, Keith Marshall |
13 | 13 | # |
14 | -# This file is part of the git-mq program suite. | |
15 | 14 | # |
16 | -# The git-mq program suite is free software: you can redistribute it | |
15 | +# This file is part of the Git-MQ program suite. | |
16 | +# | |
17 | +# The Git-MQ program suite is free software: you can redistribute it | |
17 | 18 | # and/or modify it under the terms of the GNU General Public Licence |
18 | 19 | # as published by the Free Software Foundation, either version 3 of |
19 | 20 | # the Licence, or (at your option) any later version. |
20 | 21 | # |
21 | -# The git-mq program suite is distributed in the hope that it will be | |
22 | +# The Git-MQ program suite is distributed in the hope that it will be | |
22 | 23 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
23 | 24 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
24 | 25 | # GNU General Public Licence for more details. |
@@ -11,14 +11,15 @@ | ||
11 | 11 | # Written by Keith Marshall <keith@users.osdn.me> |
12 | 12 | # Copyright (C) 2019, Keith Marshall |
13 | 13 | # |
14 | -# This file is part of the git-mq program suite. | |
15 | 14 | # |
16 | -# The git-mq program suite is free software: you can redistribute it | |
15 | +# This file is part of the Git-MQ program suite. | |
16 | +# | |
17 | +# The Git-MQ program suite is free software: you can redistribute it | |
17 | 18 | # and/or modify it under the terms of the GNU General Public Licence |
18 | 19 | # as published by the Free Software Foundation, either version 3 of |
19 | 20 | # the Licence, or (at your option) any later version. |
20 | 21 | # |
21 | -# The git-mq program suite is distributed in the hope that it will be | |
22 | +# The Git-MQ program suite is distributed in the hope that it will be | |
22 | 23 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
23 | 24 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
24 | 25 | # GNU General Public Licence for more details. |
@@ -96,7 +97,7 @@ move! reorder sequence, and push the nominated patch" | ||
96 | 97 | ETX |
97 | 98 | |
98 | 99 | # Incorporate the universal set-up code, which is common to all of the |
99 | -# git-mq command implementations. | |
100 | +# Git-MQ command implementations. | |
100 | 101 | # |
101 | 102 | . ./git-mq-setup.shar |
102 | 103 |
@@ -9,14 +9,14 @@ | ||
9 | 9 | # Copyright (C) 2019, Keith Marshall |
10 | 10 | # |
11 | 11 | # |
12 | -# This file is part of the git-mq program suite. | |
12 | +# This file is part of the Git-MQ program suite. | |
13 | 13 | # |
14 | -# The git-mq program suite is free software: you can redistribute it | |
14 | +# The Git-MQ program suite is free software: you can redistribute it | |
15 | 15 | # and/or modify it under the terms of the GNU General Public Licence |
16 | 16 | # as published by the Free Software Foundation, either version 3 of |
17 | 17 | # the Licence, or (at your option) any later version. |
18 | 18 | # |
19 | -# The git-mq program suite is distributed in the hope that it will be | |
19 | +# The Git-MQ program suite is distributed in the hope that it will be | |
20 | 20 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
21 | 21 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
22 | 22 | # GNU General Public Licence for more details. |
@@ -30,9 +30,9 @@ cat <<\ETX | ||
30 | 30 | #!/bin/sh |
31 | 31 | # ------------------------------------------------------------------------------ |
32 | 32 | # |
33 | -# git-qguard.sh: Implement the git-mq "git qguard" extension command. | |
33 | +# git-qguard.sh: Implement the Git-MQ "git qguard" extension command. | |
34 | 34 | # |
35 | -# Set, reset (clear), or display guards on any one git-mq patch, or display | |
35 | +# Set, reset (clear), or display guards on any one Git-MQ patch, or display | |
36 | 36 | # guards on all patches in the series. |
37 | 37 | # |
38 | 38 | # $Id$ |
@@ -57,7 +57,7 @@ n,none! reset (clear) all guards on specified patch" | ||
57 | 57 | ETX |
58 | 58 | |
59 | 59 | # Incorporate the universal set-up code, which is common to all of the |
60 | -# git-mq command implementations. | |
60 | +# Git-MQ command implementations. | |
61 | 61 | # |
62 | 62 | . ./git-mq-setup.shar |
63 | 63 |
@@ -1,8 +1,6 @@ | ||
1 | 1 | # git-qheader.shar |
2 | 2 | # ------------------------------------------------------------------------------ |
3 | -# | |
4 | 3 | # Shell archive to deliver the implementations for the "git qheader" command. |
5 | -# | |
6 | 4 | # ------------------------------------------------------------------------------ |
7 | 5 | # |
8 | 6 | # $Id$ |
@@ -10,14 +8,15 @@ | ||
10 | 8 | # Written by Keith Marshall <keith@users.osdn.me> |
11 | 9 | # Copyright (C) 2019, Keith Marshall |
12 | 10 | # |
13 | -# This file is part of the git-mq program suite. | |
14 | 11 | # |
15 | -# The git-mq program suite is free software: you can redistribute it | |
12 | +# This file is part of the Git-MQ program suite. | |
13 | +# | |
14 | +# The Git-MQ program suite is free software: you can redistribute it | |
16 | 15 | # and/or modify it under the terms of the GNU General Public Licence |
17 | 16 | # as published by the Free Software Foundation, either version 3 of |
18 | 17 | # the Licence, or (at your option) any later version. |
19 | 18 | # |
20 | -# The git-mq program suite is distributed in the hope that it will be | |
19 | +# The Git-MQ program suite is distributed in the hope that it will be | |
21 | 20 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
22 | 21 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
23 | 22 | # GNU General Public Licence for more details. |
@@ -31,7 +30,7 @@ cat <<\ETX | ||
31 | 30 | #!/bin/sh |
32 | 31 | # ------------------------------------------------------------------------------ |
33 | 32 | # |
34 | -# git-qheader.sh: Implement the git-mq "git qheader" extension command. | |
33 | +# git-qheader.sh: Implement the Git-MQ "git qheader" extension command. | |
35 | 34 | # |
36 | 35 | # Extracts and displays the log message text, as recorded in the header of |
37 | 36 | # the topmost applied, or any other nominated patch file. Although it would |
@@ -57,7 +56,7 @@ within the currently registered series of patches. | ||
57 | 56 | ETX |
58 | 57 | |
59 | 58 | # Incorporate the universal set-up code, which is common to all of the |
60 | -# git-mq command implementations. | |
59 | +# Git-MQ command implementations. | |
61 | 60 | # |
62 | 61 | . ./git-mq-setup.shar |
63 | 62 |
@@ -1,8 +1,6 @@ | ||
1 | 1 | # git-qimport.shar |
2 | 2 | # ------------------------------------------------------------------------------ |
3 | -# | |
4 | 3 | # Shell archive to deliver the implementation for the "git qimport" command. |
5 | -# | |
6 | 4 | # ------------------------------------------------------------------------------ |
7 | 5 | # |
8 | 6 | # $Id$ |
@@ -10,14 +8,15 @@ | ||
10 | 8 | # Written by Keith Marshall <keith@users.osdn.me> |
11 | 9 | # Copyright (C) 2019, Keith Marshall |
12 | 10 | # |
13 | -# This file is part of the git-mq program suite. | |
14 | 11 | # |
15 | -# The git-mq program suite is free software: you can redistribute it | |
12 | +# This file is part of the Git-MQ program suite. | |
13 | +# | |
14 | +# The Git-MQ program suite is free software: you can redistribute it | |
16 | 15 | # and/or modify it under the terms of the GNU General Public Licence |
17 | 16 | # as published by the Free Software Foundation, either version 3 of |
18 | 17 | # the Licence, or (at your option) any later version. |
19 | 18 | # |
20 | -# The git-mq program suite is distributed in the hope that it will be | |
19 | +# The Git-MQ program suite is distributed in the hope that it will be | |
21 | 20 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
22 | 21 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
23 | 22 | # GNU General Public Licence for more details. |
@@ -31,7 +30,7 @@ cat <<\ETX | ||
31 | 30 | #!/bin/sh |
32 | 31 | # ------------------------------------------------------------------------------ |
33 | 32 | # |
34 | -# git-qimport.sh: Implement the git-mq "git qimport" extension command. | |
33 | +# git-qimport.sh: Implement the Git-MQ "git qimport" extension command. | |
35 | 34 | # |
36 | 35 | # Import third party patches, reinstate previously deleted patches, (for |
37 | 36 | # which a patch file remains available), or create patches from existing |
@@ -65,7 +64,7 @@ P,push! apply new patch(es), after import" | ||
65 | 64 | ETX |
66 | 65 | |
67 | 66 | # Incorporate the universal set-up code, which is common to all of the |
68 | -# git-mq command implementations. | |
67 | +# Git-MQ command implementations. | |
69 | 68 | # |
70 | 69 | . ./git-mq-setup.shar |
71 | 70 |
@@ -104,7 +103,7 @@ mq_map_control_file_refs "$mq_patchdir" series status | ||
104 | 103 | |
105 | 104 | # Before processing any residual command arguments, we must handle |
106 | 105 | # any specified conversions of existing non-patch commit objects, to |
107 | -# manage them as git-mq patches; in common with subsequent argument | |
106 | +# manage them as Git-MQ patches; in common with subsequent argument | |
108 | 107 | # processing, this requires the use of temporary files. |
109 | 108 | # |
110 | 109 | mq_require mq-tmpfile |
@@ -11,14 +11,15 @@ | ||
11 | 11 | # Written by Keith Marshall <keith@users.osdn.me> |
12 | 12 | # Copyright (C) 2019, Keith Marshall |
13 | 13 | # |
14 | -# This file is part of the git-mq program suite. | |
15 | 14 | # |
16 | -# The git-mq program suite is free software: you can redistribute it | |
15 | +# This file is part of the Git-MQ program suite. | |
16 | +# | |
17 | +# The Git-MQ program suite is free software: you can redistribute it | |
17 | 18 | # and/or modify it under the terms of the GNU General Public Licence |
18 | 19 | # as published by the Free Software Foundation, either version 3 of |
19 | 20 | # the Licence, or (at your option) any later version. |
20 | 21 | # |
21 | -# The git-mq program suite is distributed in the hope that it will be | |
22 | +# The Git-MQ program suite is distributed in the hope that it will be | |
22 | 23 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
23 | 24 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
24 | 25 | # GNU General Public Licence for more details. |
@@ -11,14 +11,15 @@ | ||
11 | 11 | # Written by Keith Marshall <keith@users.osdn.me> |
12 | 12 | # Copyright (C) 2019, Keith Marshall |
13 | 13 | # |
14 | -# This file is part of the git-mq program suite. | |
15 | 14 | # |
16 | -# The git-mq program suite is free software: you can redistribute it | |
15 | +# This file is part of the Git-MQ program suite. | |
16 | +# | |
17 | +# The Git-MQ program suite is free software: you can redistribute it | |
17 | 18 | # and/or modify it under the terms of the GNU General Public Licence |
18 | 19 | # as published by the Free Software Foundation, either version 3 of |
19 | 20 | # the Licence, or (at your option) any later version. |
20 | 21 | # |
21 | -# The git-mq program suite is distributed in the hope that it will be | |
22 | +# The Git-MQ program suite is distributed in the hope that it will be | |
22 | 23 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
23 | 24 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
24 | 25 | # GNU General Public Licence for more details. |
@@ -80,7 +81,7 @@ | ||
80 | 81 | { $0 = series[++idx]; if( state[$1] == "U" ) |
81 | 82 | { print "'"$mq_facility"': applying patch \47" $1 "\47"; |
82 | 83 | system( git_apply $1 "\47 '"$mq_filter"'" ); |
83 | - git_qheader = "echo \47[git-mq]: " $1 "\47"; | |
84 | + git_qheader = "echo \47[Git-MQ]: " $1 "\47"; | |
84 | 85 | git_qheader_validator = "git qheader \47" $1 "\47"; |
85 | 86 | while( (git_qheader_validator | getline) > 0 ) |
86 | 87 | if( NF > 0 ) { git_qheader = git_qheader_validator; break; } |
@@ -9,14 +9,14 @@ | ||
9 | 9 | # Copyright (C) 2019, Keith Marshall |
10 | 10 | # |
11 | 11 | # |
12 | -# This file is part of the git-mq program suite. | |
12 | +# This file is part of the Git-MQ program suite. | |
13 | 13 | # |
14 | -# The git-mq program suite is free software: you can redistribute it | |
14 | +# The Git-MQ program suite is free software: you can redistribute it | |
15 | 15 | # and/or modify it under the terms of the GNU General Public Licence |
16 | 16 | # as published by the Free Software Foundation, either version 3 of |
17 | 17 | # the Licence, or (at your option) any later version. |
18 | 18 | # |
19 | -# The git-mq program suite is distributed in the hope that it will be | |
19 | +# The Git-MQ program suite is distributed in the hope that it will be | |
20 | 20 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
21 | 21 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
22 | 22 | # GNU General Public Licence for more details. |
@@ -30,9 +30,9 @@ cat <<\ETX | ||
30 | 30 | #!/bin/sh |
31 | 31 | # ------------------------------------------------------------------------------ |
32 | 32 | # |
33 | -# git-qselect.sh: Implement the git-mq "git qselect" extension command. | |
33 | +# git-qselect.sh: Implement the Git-MQ "git qselect" extension command. | |
34 | 34 | # |
35 | -# Set, reset (clear), or display guards on any one git-mq patch, or display | |
35 | +# Set, reset (clear), or display guards on any one Git-MQ patch, or display | |
36 | 36 | # guards on all patches in the series. |
37 | 37 | # |
38 | 38 | # $Id$ |
@@ -50,7 +50,7 @@ git qguard [-s | --series] [-v | --verbose] | ||
50 | 50 | git qselect [--pop | --reapply] [-n | --none | <guard> ...] |
51 | 51 | |
52 | 52 | Activate, deactivate, or display the active guards, controlling the |
53 | -selection of git-mq patches which may be applied. | |
53 | +selection of Git-MQ patches which may be applied. | |
54 | 54 | -- |
55 | 55 | pop! pop back to predecessor of first guarded patch |
56 | 56 | reapply! pop, then reapply unguarded patches to current topmost |
@@ -59,7 +59,7 @@ n,none! deactivate all guards" | ||
59 | 59 | ETX |
60 | 60 | |
61 | 61 | # Incorporate the universal set-up code, which is common to all of the |
62 | -# git-mq command implementations. | |
62 | +# Git-MQ command implementations. | |
63 | 63 | # |
64 | 64 | . ./git-mq-setup.shar |
65 | 65 |
@@ -1,23 +1,22 @@ | ||
1 | 1 | # git-qseries.shar |
2 | 2 | # ------------------------------------------------------------------------------ |
3 | -# | |
4 | 3 | # Shell archive to deliver the implementation for the "git qseries" command. |
5 | -# | |
6 | 4 | # ------------------------------------------------------------------------------ |
7 | 5 | # |
8 | 6 | # $Id$ |
9 | 7 | # |
10 | 8 | # Written by Keith Marshall <keith@users.osdn.me> |
11 | -# Copyright (C) 2018, Keith Marshall | |
9 | +# Copyright (C) 2018, 2019, Keith Marshall | |
10 | +# | |
12 | 11 | # |
13 | -# This file is part of the git-mq program suite. | |
12 | +# This file is part of the Git-MQ program suite. | |
14 | 13 | # |
15 | -# The git-mq program suite is free software: you can redistribute it | |
14 | +# The Git-MQ program suite is free software: you can redistribute it | |
16 | 15 | # and/or modify it under the terms of the GNU General Public Licence |
17 | 16 | # as published by the Free Software Foundation, either version 3 of |
18 | 17 | # the Licence, or (at your option) any later version. |
19 | 18 | # |
20 | -# The git-mq program suite is distributed in the hope that it will be | |
19 | +# The Git-MQ program suite is distributed in the hope that it will be | |
21 | 20 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
22 | 21 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
23 | 22 | # GNU General Public Licence for more details. |
@@ -58,7 +57,7 @@ v,verbose! show sequence numbers and status flag" | ||
58 | 57 | ETX |
59 | 58 | |
60 | 59 | # Incorporate the universal set-up code, which is common to all of the |
61 | -# git-mq command implementations. | |
60 | +# Git-MQ command implementations. | |
62 | 61 | # |
63 | 62 | . ./git-mq-setup.shar |
64 | 63 |
@@ -11,14 +11,15 @@ | ||
11 | 11 | # Written by Keith Marshall <keith@users.osdn.me> |
12 | 12 | # Copyright (C) 2018, 2019, Keith Marshall |
13 | 13 | # |
14 | -# This file is part of the git-mq program suite. | |
15 | 14 | # |
16 | -# The git-mq program suite is free software: you can redistribute it | |
15 | +# This file is part of the Git-MQ program suite. | |
16 | +# | |
17 | +# The Git-MQ program suite is free software: you can redistribute it | |
17 | 18 | # and/or modify it under the terms of the GNU General Public Licence |
18 | 19 | # as published by the Free Software Foundation, either version 3 of |
19 | 20 | # the Licence, or (at your option) any later version. |
20 | 21 | # |
21 | -# The git-mq program suite is distributed in the hope that it will be | |
22 | +# The Git-MQ program suite is distributed in the hope that it will be | |
22 | 23 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
23 | 24 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
24 | 25 | # GNU General Public Licence for more details. |
@@ -65,7 +66,7 @@ v,verbose! provide more detailed identification" | ||
65 | 66 | ETX |
66 | 67 | |
67 | 68 | # Incorporate the universal set-up code, which is common to all of the |
68 | -# git-mq command implementations. | |
69 | +# Git-MQ command implementations. | |
69 | 70 | # |
70 | 71 | . ./git-mq-setup.shar |
71 | 72 |
@@ -2,7 +2,7 @@ | ||
2 | 2 | # ------------------------------------------------------------------------------ |
3 | 3 | # |
4 | 4 | # Script to handle the "git qimport" operation, when moving existing commit |
5 | -# objects under git-mq patch queue control; module to be invoked exclusively | |
5 | +# objects under Git-MQ patch queue control; module to be invoked exclusively | |
6 | 6 | # within the scope of an "mq_require" function call. |
7 | 7 | # |
8 | 8 | # ------------------------------------------------------------------------------ |
@@ -12,14 +12,15 @@ | ||
12 | 12 | # Written by Keith Marshall <keith@users.osdn.me> |
13 | 13 | # Copyright (C) 2019, Keith Marshall |
14 | 14 | # |
15 | -# This file is part of the git-mq program suite. | |
16 | 15 | # |
17 | -# The git-mq program suite is free software: you can redistribute it | |
16 | +# This file is part of the Git-MQ program suite. | |
17 | +# | |
18 | +# The Git-MQ program suite is free software: you can redistribute it | |
18 | 19 | # and/or modify it under the terms of the GNU General Public Licence |
19 | 20 | # as published by the Free Software Foundation, either version 3 of |
20 | 21 | # the Licence, or (at your option) any later version. |
21 | 22 | # |
22 | -# The git-mq program suite is distributed in the hope that it will be | |
23 | +# The Git-MQ program suite is distributed in the hope that it will be | |
23 | 24 | # useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
24 | 25 | # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
25 | 26 | # GNU General Public Licence for more details. |
@@ -45,7 +46,7 @@ | ||
45 | 46 | |
46 | 47 | # When invoked, via mq_require, this module is passed an over-quoted list of |
47 | 48 | # commit object and/or rev-list specifications for the prior commit objects, |
48 | -# which are to be brought under git-mq control; reduce it to a normal vector | |
49 | +# which are to be brought under Git-MQ control; reduce it to a normal vector | |
49 | 50 | # of arguments, for later iterative processing. |
50 | 51 | # |
51 | 52 | eval set -- $@ |
@@ -93,7 +94,7 @@ | ||
93 | 94 | |
94 | 95 | # Having generated this sequence of three lists, we filter and analyse |
95 | 96 | # them, verifying their consistency, and reducing them to the updated |
96 | -# content for insertion into the git-mq series and status files. | |
97 | +# content for insertion into the Git-MQ series and status files. | |
97 | 98 | # |
98 | 99 | } | awk >&2 'BEGIN { phase = avail = req = 0; } |
99 | 100 | $1 == "abort" { exit 2 } phase == 0 { patch[$1] = 1; } |
@@ -104,7 +105,7 @@ | ||
104 | 105 | phase == 1 { if( patch[$1] ) |
105 | 106 | { ref = substr( $1, 1, 7 ); $1 = ""; spec = trim($0); |
106 | 107 | complain( "\47" spec "\47 refers to commit \47" ref "\47" ); |
107 | - errout( "this commit represents an existing git-mq patch" ); | |
108 | + errout( "this commit represents an existing Git-MQ patch" ); | |
108 | 109 | } |
109 | 110 | sched[req++] = $1; |
110 | 111 | } |
@@ -141,7 +142,7 @@ | ||
141 | 142 | # Before proceeding further, check that no proposed name for any new |
142 | 143 | # patch conflicts with any already registered patch, or, unless the |
143 | 144 | # "--force" option is in effect, with any file which already exists |
144 | -# in the git-mq patch directory. | |
145 | +# in the Git-MQ patch directory. | |
145 | 146 | # |
146 | 147 | for mq_destname in ${mq_patchname-`cat $mq_series_file_tmp`} |
147 | 148 | do test -f "$mq_series_file" && { |
@@ -173,13 +174,13 @@ | ||
173 | 174 | |
174 | 175 | # Since the preceding step did not update the "qparent" tag, we do |
175 | 176 | # this now, or delete it if all available commits are now represented |
176 | -# by git-mq patches. | |
177 | +# by Git-MQ patches. | |
177 | 178 | # |
178 | 179 | { git tag --force qparent qbase~1 2>&1 || git tag --delete qparent |
179 | 180 | } > /dev/null |
180 | 181 | |
181 | 182 | # Finally, we fold the captured update records into the heads of the |
182 | -# git-mq series and status files, creating these if necessary. | |
183 | +# Git-MQ series and status files, creating these if necessary. | |
183 | 184 | # |
184 | 185 | mq_series_file="$mq_patchdir/series" mq_status_file="$mq_patchdir/status" |
185 | 186 | test -f "$mq_series_file" && cat "$mq_series_file" >> "$mq_series_file_tmp" |