コミット: 880e599024339bdd06e71903341b0a0b35d0fb02 - git-mq (git)

Mercurial Queues Emulation for Git

コミットメタ情報

• リビジョン: 880e599024339bdd06e71903341b0a0b35d0fb02 (tree)
• 日時: 2022-02-13 02:32:33
• 作者: Keith Marshall <keith@user...>
• コミッター: Keith Marshall

ログメッセージ

Install aliases for "git qdelete" and "git qrename".

* Makefile.in (install_alias): New functional macro; use it...
(install-bin-scripts): ...here, to create $bindir aliases for...
(git-qremove, git-qrm): ...each of these, both linked to...
(git-qdelete): ...this.
(git-qmv): Create a further $bindir alias, linking it to...
(git-qrename): ...this.
(install-man-pages): Likewise, create $man1dir aliases for...
(git-qremove.1, git-qrm.1): ...each of these, linked to...
(git-qdelete.1): ...this, and likewise...
(git-qmv.1): ...this, linked to...
(git-qremove.1): ...this.

* git-qdelete.1.man (git qremove, git qrm)
* git-qrename.1.man (git qmv): Document aliases.

変更サマリ

• modified: Makefile.in
• modified: man/git-qdelete.1.man
• modified: man/git-qrename.1.man

差分

--- a/Makefile.in
+++ b/Makefile.in
@@ -8,7 +8,7 @@ PACKAGE_TARNAME := @PACKAGE_TARNAME@
 PACKAGE_VERSION := @PACKAGE_VERSION@
 #
 # Written by Keith Marshall <[e-mail]>
-# Copyright (C) 2018, 2019, Keith Marshall
+# Copyright (C) 2018, 2019, 2022, Keith Marshall
 #
 # ------------------------------------------------------------------------------
 #
@@ -164,6 +164,11 @@ DO_INSTALL = echo $(INSTALL) $1 $2; $(INSTALL) $1 $2
 
 install-bin-scripts: $(addprefix git-,$(mq_supported))
 	@$(call INSTALL_SCRIPTS,$^,-m 755,${bindir})
+	$(call install_alias,qmv,qrename,bindir)
+	$(call install_alias,qremove,qdelete,bindir)
+	$(call install_alias,qrm,qdelete,bindir)
+
+install_alias = ln -f $(addprefix ${$3}/git-,$2 $1)
 
 vpath %.sh ${srcdir}
 vpath %.awk ${srcdir}
@@ -223,6 +228,9 @@ install-man: ${man1dir} install-man-pages
 install-man-pages: $(wildcard ${srcdir}/man/*.man)
 	cd ${man1dir}; rm -f $(notdir $(^:.man=))
 	$(QUIET_MAKE) $(addprefix ${man1dir}/,$(notdir $(^:.man=)))
+	$(call install_alias,qmv.1,qrename.1,man1dir)
+	$(call install_alias,qremove.1,qdelete.1,man1dir)
+	$(call install_alias,qrm.1,qdelete.1,man1dir)
 
 ${man1dir}/%: %.man
 	$(call manpage_installer_script,$<) > $@

--- a/man/git-qdelete.1.man
+++ b/man/git-qdelete.1.man
@@ -5,7 +5,7 @@
 .\" $Id$
 .\"
 .\" Written by Keith Marshall <[e-mail]>
-.\" Copyright (C) 2019, Keith Marshall
+.\" Copyright (C) 2019, 2022, Keith Marshall
 .\"
 .\"
 .\" This man page file is part of the Git-MQ program suite.
@@ -27,6 +27,10 @@ git\-qdelete \- remove patches from a Git\-MQ series
 .
 .SH SYNOPSIS
 .BR git\ qdelete \ [ \-k \ |\  \-\-keep ]\ < \fIpatch >\  ...
+.br
+.BR git\ qremove \ [ \-k \ |\  \-\-keep ]\ < \fIpatch >\  ...
+.br
+.BR git\ qrm \ [ \-k \ |\  \-\-keep ]\ < \fIpatch >\  ...
 .
 .
 .ad b
@@ -43,6 +47,15 @@ the associated patch files are also deleted
 from the Git-MQ patch directory.
 .
 .LP
+The
+.B git\ qremove
+and
+.B git\ qrm
+forms are simple aliases for
+.BR git\ qdelete ;
+all three behave identically.
+.
+.LP
 Patches which are to be removed must be individually specified,
 by name.
 If the
@@ -92,7 +105,7 @@ counterpart.
 .
 .
 .SH AUTHOR
-Copyright (C) 2019, by Keith Marshall
+Copyright (C) 2019, 2022, by Keith Marshall
 .
 .LP
 This man page was written by

--- a/man/git-qrename.1.man
+++ b/man/git-qrename.1.man
@@ -5,7 +5,7 @@
 .\" $Id$
 .\"
 .\" Written by Keith Marshall <[e-mail]>
-.\" Copyright (C) 2019, Keith Marshall
+.\" Copyright (C) 2019, 2022, Keith Marshall
 .\"
 .\"
 .\" This man page file is part of the Git-MQ program suite.
@@ -28,6 +28,9 @@ git\-qrename \- rename the current, or any specified patch
 .SH SYNOPSIS
 .BR git\ qrename \ \c
 .RI [< old\-name >]\ < new\-name >
+.br
+.BR git\ qmv \ \c
+.RI [< old\-name >]\ < new\-name >
 .
 .
 .ad b
@@ -50,6 +53,13 @@ Patches may be renamed,
 irrespective of the state of any guards to which they may be subject.
 .
 .LP
+The
+.B git\ qmv
+form is a simple alias for
+.BR git\ rename ;
+both behave identically.
+.
+.LP
 When both
 .RI < old\-name >
 and
@@ -90,7 +100,7 @@ counterpart.
 .
 .
 .SH AUTHOR
-Copyright (C) 2019, by Keith Marshall
+Copyright (C) 2019, 2022, by Keith Marshall
 .
 .LP
 This man page was written by