From df55c9cbc3ea79c51d5f41a628439283e94a87fd Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 2 Dec 2007 06:07:40 +0100 Subject: [PATCH 01/13] git-help: add -i|--info option to display info page. "git help --info subcommand" will now call "info git-subcommand". Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- help.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/help.c b/help.c index 37a9c25db7..0f1cb7172b 100644 --- a/help.c +++ b/help.c @@ -239,24 +239,32 @@ void list_common_cmds_help(void) } } -static void show_man_page(const char *git_cmd) +static const char *cmd_to_page(const char *git_cmd) { - const char *page; - if (!prefixcmp(git_cmd, "git")) - page = git_cmd; + return git_cmd; else { int page_len = strlen(git_cmd) + 4; char *p = xmalloc(page_len + 1); strcpy(p, "git-"); strcpy(p + 4, git_cmd); p[page_len] = 0; - page = p; + return p; } +} +static void show_man_page(const char *git_cmd) +{ + const char *page = cmd_to_page(git_cmd); execlp("man", "man", page, NULL); } +static void show_info_page(const char *git_cmd) +{ + const char *page = cmd_to_page(git_cmd); + execlp("info", "info", page, NULL); +} + void help_unknown_cmd(const char *cmd) { fprintf(stderr, "git: '%s' is not a git-command. See 'git --help'.\n", cmd); @@ -269,10 +277,8 @@ int cmd_version(int argc, const char **argv, const char *prefix) return 0; } -int cmd_help(int argc, const char **argv, const char *prefix) +static void check_help_cmd(const char *help_cmd) { - const char *help_cmd = argc > 1 ? argv[1] : NULL; - if (!help_cmd) { printf("usage: %s\n\n", git_usage_string); list_common_cmds_help(); @@ -284,6 +290,19 @@ int cmd_help(int argc, const char **argv, const char *prefix) list_commands(); exit(0); } +} + +int cmd_help(int argc, const char **argv, const char *prefix) +{ + const char *help_cmd = argc > 1 ? argv[1] : NULL; + check_help_cmd(help_cmd); + + if (!strcmp(help_cmd, "--info") || !strcmp(help_cmd, "-i")) { + help_cmd = argc > 2 ? argv[2] : NULL; + check_help_cmd(help_cmd); + + show_info_page(help_cmd); + } else show_man_page(help_cmd); From 45533d2694d480be86112f2da36d555e7373ba24 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 4 Dec 2007 06:44:29 +0100 Subject: [PATCH 02/13] Documentation: describe -i/--info option to "git-help" Option -i|--info for "git-help" is documented only in the new "git-help.txt" man page, but this new man page is referenced from the "--help" option documentation in the "git.txt" man page. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/git-help.txt | 9 +++++++-- Documentation/git.txt | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index a2255bc55a..232daae0d9 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -7,7 +7,7 @@ git-help - display help information about git SYNOPSIS -------- -'git help' [-a|--all] [COMMAND] +'git help' [-a|--all|-i|--info] [COMMAND] DESCRIPTION ----------- @@ -20,7 +20,8 @@ If the option '--all' or '-a' is given, then all available commands are printed on the standard output. If a git command is named, a manual page for that command is brought -up. The 'man' program is used by default for this purpose. +up. The 'man' program is used by default for this purpose, but this +can be overriden by other options. Note that 'git --help ...' is identical as 'git help ...' because the former is internally converted into the latter. @@ -32,6 +33,10 @@ OPTIONS Prints all the available commands on the standard output. This option superseeds any other option. +-i|--info:: + Use the 'info' program to display the manual page, instead of + the 'man' program that is used by default. + Author ------ Written by Junio C Hamano and the git-list diff --git a/Documentation/git.txt b/Documentation/git.txt index c4e6fc6494..c4e4d24ea4 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -104,6 +104,11 @@ OPTIONS commands. If the option '--all' or '-a' is given then all available commands are printed. If a git command is named this option will bring up the manual page for that command. ++ +Other options are available to control how the manual page is +displayed. See gitlink:git-help[1] for more information, +because 'git --help ...' is converted internally into 'git +help ...'. --exec-path:: Path to wherever your core git programs are installed. From 5d6491c7c7536ab930a6e9ce2ec3b5249d4c283f Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 2 Dec 2007 06:07:55 +0100 Subject: [PATCH 03/13] git-help: add -w|--web option to display html man page in a browser. Now when using "git help -w cmd", we will try to show the HTML man page "git-cmd.html" in your prefered web browser. To do that "help.c" code will call a new shell script "git-browse-help". This currently works only if the HTML versions of the man page have been installed in $(htmldir) (typically "/usr/share/doc/git-doc"), so new target to do that is added to "Documentation/Makefile". The browser to use can be configured using the "web.browser" config variable. We try to open a new tab in an existing web browser, if possible. The code in "git-browse-help" is heavily stolen from "git-mergetool" by Theodore Y. Ts'o. Thanks. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/Makefile | 4 ++ Makefile | 8 ++- git-browse-help.sh | 142 +++++++++++++++++++++++++++++++++++++++++ help.c | 34 +++++----- 4 files changed, 171 insertions(+), 17 deletions(-) create mode 100755 git-browse-help.sh diff --git a/Documentation/Makefile b/Documentation/Makefile index de11ee0192..f0df0b0d28 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -29,6 +29,7 @@ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT)) prefix?=$(HOME) bindir?=$(prefix)/bin +htmldir?=$(prefix)/share/doc/git-doc mandir?=$(prefix)/share/man man1dir=$(mandir)/man1 man5dir=$(mandir)/man5 @@ -95,6 +96,9 @@ install-info: info echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \ fi +install-html: html + sh ./install-webdoc.sh $(DESTDIR)$(htmldir) + ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE $(MAKE) -C ../ GIT-VERSION-FILE diff --git a/Makefile b/Makefile index 4b418bf76e..932b0d4346 100644 --- a/Makefile +++ b/Makefile @@ -157,6 +157,7 @@ bindir = $(prefix)/bin gitexecdir = $(bindir) sharedir = $(prefix)/share template_dir = $(sharedir)/git-core/templates +htmldir=$(sharedir)/doc/git-doc ifeq ($(prefix),/usr) sysconfdir = /etc else @@ -183,7 +184,7 @@ GITWEB_FAVICON = git-favicon.png GITWEB_SITE_HEADER = GITWEB_SITE_FOOTER = -export prefix bindir gitexecdir sharedir template_dir sysconfdir +export prefix bindir gitexecdir sharedir template_dir htmldir sysconfdir CC = gcc AR = ar @@ -223,7 +224,8 @@ SCRIPT_SH = \ git-merge-resolve.sh \ git-lost-found.sh git-quiltimport.sh git-submodule.sh \ git-filter-branch.sh \ - git-stash.sh + git-stash.sh \ + git-browse-help.sh SCRIPT_PERL = \ git-add--interactive.perl \ @@ -745,6 +747,7 @@ DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) bindir_SQ = $(subst ','\'',$(bindir)) gitexecdir_SQ = $(subst ','\'',$(gitexecdir)) template_dir_SQ = $(subst ','\'',$(template_dir)) +htmldir_SQ = $(subst ','\'',$(htmldir)) prefix_SQ = $(subst ','\'',$(prefix)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) @@ -808,6 +811,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ -e 's/@@NO_CURL@@/$(NO_CURL)/g' \ + -e 's|@@HTMLDIR@@|$(htmldir_SQ)|g' \ $@.sh >$@+ && \ chmod +x $@+ && \ mv $@+ $@ diff --git a/git-browse-help.sh b/git-browse-help.sh new file mode 100755 index 0000000000..76eff01bab --- /dev/null +++ b/git-browse-help.sh @@ -0,0 +1,142 @@ +#!/bin/sh +# +# This program launch a web browser on the html page +# describing a git command. +# +# Copyright (c) 2007 Christian Couder +# Copyright (c) 2006 Theodore Y. Ts'o +# +# This file is heavily stolen from git-mergetool.sh, by +# Theodore Y. Ts'o (thanks) that is: +# +# Copyright (c) 2006 Theodore Y. Ts'o +# +# This file is licensed under the GPL v2, or a later version +# at the discretion of Junio C Hamano or any other official +# git maintainer. +# + +USAGE='[--browser=browser|--tool=browser] [cmd to display] ...' +SUBDIRECTORY_OK=Yes +OPTIONS_SPEC= +. git-sh-setup + +# Install data. +html_dir="@@HTMLDIR@@" + +test -f "$html_dir/git.html" || die "No documentation directory found." + +valid_tool() { + case "$1" in + firefox | iceweasel | konqueror | w3m | links | lynx | dillo) + ;; # happy + *) + return 1 + ;; + esac +} + +init_browser_path() { + browser_path=`git config browser.$1.path` + test -z "$browser_path" && browser_path=$1 +} + +while test $# != 0 +do + case "$1" in + -b|--browser*|-t|--tool*) + case "$#,$1" in + *,*=*) + browser=`expr "z$1" : 'z-[^=]*=\(.*\)'` + ;; + 1,*) + usage ;; + *) + browser="$2" + shift ;; + esac + ;; + --) + break + ;; + -*) + usage + ;; + *) + break + ;; + esac + shift +done + +if test -z "$browser"; then + browser=`git config web.browser` + if test -n "$browser" && ! valid_tool "$browser"; then + echo >&2 "git config option web.browser set to unknown browser: $browser" + echo >&2 "Resetting to default..." + unset browser + fi +fi + +if test -z "$browser" ; then + if test -n "$DISPLAY"; then + browser_candidates="firefox iceweasel konqueror w3m links lynx dillo" + if test "$KDE_FULL_SESSION" = "true"; then + browser_candidates="konqueror $browser_candidates" + fi + else + browser_candidates="w3m links lynx" + fi + echo "browser candidates: $browser_candidates" + for i in $browser_candidates; do + init_browser_path $i + if type "$browser_path" > /dev/null 2>&1; then + browser=$i + break + fi + done + test -z "$browser" && die "No known browser available." +else + valid_tool "$browser" || die "Unknown browser '$browser'." + + init_browser_path "$browser" + + if ! type "$browser_path" > /dev/null 2>&1; then + die "The browser $browser is not available as '$browser_path'." + fi +fi + +pages=$(for p in "$@"; do echo "$html_dir/$p.html" ; done) +test -z "$pages" && pages="$html_dir/git.html" + +case "$browser" in + firefox|iceweasel) + # Check version because firefox < 2.0 does not support "-new-tab". + vers=$(expr "$($browser_path -version)" : '.* \([0-9][0-9]*\)\..*') + NEWTAB='-new-tab' + test "$vers" -lt 2 && NEWTAB='' + nohup "$browser_path" $NEWTAB $pages & + ;; + konqueror) + case "$(basename "$browser_path")" in + konqueror) + # It's simpler to use kfmclient to open a new tab in konqueror. + browser_path="$(echo "$browser_path" | sed -e 's/konqueror$/kfmclient/')" + type "$browser_path" > /dev/null 2>&1 || die "No '$browser_path' found." + eval "$browser_path" newTab $pages + ;; + kfmclient) + eval "$browser_path" newTab $pages + ;; + *) + nohup "$browser_path" $pages & + ;; + esac + ;; + w3m|links|lynx) + eval "$browser_path" $pages + ;; + dillo) + nohup "$browser_path" $pages & + ;; +esac diff --git a/help.c b/help.c index 0f1cb7172b..ec0d0155ac 100644 --- a/help.c +++ b/help.c @@ -241,7 +241,9 @@ void list_common_cmds_help(void) static const char *cmd_to_page(const char *git_cmd) { - if (!prefixcmp(git_cmd, "git")) + if (!git_cmd) + return "git"; + else if (!prefixcmp(git_cmd, "git")) return git_cmd; else { int page_len = strlen(git_cmd) + 4; @@ -265,6 +267,12 @@ static void show_info_page(const char *git_cmd) execlp("info", "info", page, NULL); } +static void show_html_page(const char *git_cmd) +{ + const char *page = cmd_to_page(git_cmd); + execl_git_cmd("browse-help", page, NULL); +} + void help_unknown_cmd(const char *cmd) { fprintf(stderr, "git: '%s' is not a git-command. See 'git --help'.\n", cmd); @@ -277,31 +285,27 @@ int cmd_version(int argc, const char **argv, const char *prefix) return 0; } -static void check_help_cmd(const char *help_cmd) +int cmd_help(int argc, const char **argv, const char *prefix) { - if (!help_cmd) { + const char *help_cmd = argv[1]; + + if (argc < 2) { printf("usage: %s\n\n", git_usage_string); list_common_cmds_help(); exit(0); } - else if (!strcmp(help_cmd, "--all") || !strcmp(help_cmd, "-a")) { + if (!strcmp(help_cmd, "--all") || !strcmp(help_cmd, "-a")) { printf("usage: %s\n\n", git_usage_string); list_commands(); - exit(0); } -} -int cmd_help(int argc, const char **argv, const char *prefix) -{ - const char *help_cmd = argc > 1 ? argv[1] : NULL; - check_help_cmd(help_cmd); + else if (!strcmp(help_cmd, "--web") || !strcmp(help_cmd, "-w")) { + show_html_page(argc > 2 ? argv[2] : NULL); + } - if (!strcmp(help_cmd, "--info") || !strcmp(help_cmd, "-i")) { - help_cmd = argc > 2 ? argv[2] : NULL; - check_help_cmd(help_cmd); - - show_info_page(help_cmd); + else if (!strcmp(help_cmd, "--info") || !strcmp(help_cmd, "-i")) { + show_info_page(argc > 2 ? argv[2] : NULL); } else From d3a866bc8b5604d31638648d671e524cc84fbb26 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 2 Dec 2007 06:08:00 +0100 Subject: [PATCH 04/13] Use {web,instaweb,help}.browser config options. Now "git-instaweb" will try to use the browser configured as "web.browser", if "instaweb.browser" is not set. "git-browse-help" will check first "help.browser" and then "web.browser". Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- git-browse-help.sh | 8 ++++++-- git-instaweb.sh | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/git-browse-help.sh b/git-browse-help.sh index 76eff01bab..817b3792c8 100755 --- a/git-browse-help.sh +++ b/git-browse-help.sh @@ -70,9 +70,13 @@ do done if test -z "$browser"; then - browser=`git config web.browser` + for opt in "help.browser" "web.browser" + do + browser="`git config $opt`" + test -z "$browser" || break + done if test -n "$browser" && ! valid_tool "$browser"; then - echo >&2 "git config option web.browser set to unknown browser: $browser" + echo >&2 "git config option $opt set to unknown browser: $browser" echo >&2 "Resetting to default..." unset browser fi diff --git a/git-instaweb.sh b/git-instaweb.sh index 8503ae4030..42d8d7fc6e 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -24,6 +24,7 @@ fqgitdir="$GIT_DIR" local="`git config --bool --get instaweb.local`" httpd="`git config --get instaweb.httpd`" browser="`git config --get instaweb.browser`" +test -z "$browser" && browser="`git config --get web.browser`" port=`git config --get instaweb.port` module_path="`git config --get instaweb.modulepath`" From c07a07c588fea82c2426d795a75324b3035c0a71 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 5 Dec 2007 06:09:40 +0100 Subject: [PATCH 05/13] Documentation: describe -w/--web option to "git-help". Also explain that "git instaweb" may use "web.browser" config variable. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/git-help.txt | 21 +++++++++++++++++++-- Documentation/git-instaweb.txt | 3 +++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index 232daae0d9..0e873fde28 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -7,7 +7,7 @@ git-help - display help information about git SYNOPSIS -------- -'git help' [-a|--all|-i|--info] [COMMAND] +'git help' [-a|--all|-i|--info|-w|--web] [COMMAND] DESCRIPTION ----------- @@ -29,7 +29,6 @@ former is internally converted into the latter. OPTIONS ------- -a|--all:: - Prints all the available commands on the standard output. This option superseeds any other option. @@ -37,6 +36,24 @@ OPTIONS Use the 'info' program to display the manual page, instead of the 'man' program that is used by default. +-w|--web:: + Use a web browser to display the HTML manual page, instead of + the 'man' program that is used by default. ++ +The web browser can be specified using the configuration variable +'help.browser', or 'web.browser' if the former is not set. If none of +these config variables is set, the 'git-browse-help' script (called by +'git-help') will pick a suitable default. ++ +You can explicitly provide a full path to your prefered browser by +setting the configuration variable 'browser..path'. For example, +you can configure the absolute path to firefox by setting +'browser.firefox.path'. Otherwise, 'git-browse-help' assumes the tool +is available in PATH. ++ +Note that the script tries, as much as possible, to display the HTML +page in a new tab on an already opened browser. + Author ------ Written by Junio C Hamano and the git-list diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt index 735008c1ab..d2ce7790e6 100644 --- a/Documentation/git-instaweb.txt +++ b/Documentation/git-instaweb.txt @@ -71,6 +71,9 @@ You may specify configuration in your .git/config ----------------------------------------------------------------------- +If the configuration variable 'instaweb.browser' is not set, +'web.browser' will be used instead if it is defined. + Author ------ Written by Eric Wong From 5cefc33bffd3580d07ca548bc8e2ff38c945c78c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 10 Dec 2007 01:15:57 -0800 Subject: [PATCH 06/13] Documentation: add gitman.info target Signed-off-by: Junio C Hamano --- Documentation/Makefile | 36 +++++++++++++++++++++++++++-------- Documentation/cat-texi.perl | 38 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 8 deletions(-) create mode 100755 Documentation/cat-texi.perl diff --git a/Documentation/Makefile b/Documentation/Makefile index 9f0f9d70f6..37ec355ba4 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -5,7 +5,11 @@ MAN1_TXT= \ MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt MAN7_TXT=git.txt -DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)) +MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT) +MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT)) +MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT)) + +DOC_HTML=$(MAN_HTML) ARTICLES = tutorial ARTICLES += tutorial-2 @@ -80,7 +84,7 @@ man1: $(DOC_MAN1) man5: $(DOC_MAN5) man7: $(DOC_MAN7) -info: git.info +info: git.info gitman.info install: man $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) @@ -92,9 +96,10 @@ install: man install-info: info $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) - $(INSTALL) -m 644 git.info $(DESTDIR)$(infodir) + $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir) if test -r $(DESTDIR)$(infodir)/dir; then \ $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\ + $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\ else \ echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \ fi @@ -165,12 +170,27 @@ XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css user-manual.html: user-manual.xml xsltproc $(XSLTOPTS) -o $@ $(XSLT) $< -git.info: user-manual.xml - $(RM) $@ $*.texi $*.texi+ - $(DOCBOOK2X_TEXI) user-manual.xml --to-stdout >$*.texi+ - $(PERL_PATH) fix-texi.perl <$*.texi+ >$*.texi +git.info: git.texi $(MAKEINFO) --no-split $*.texi - $(RM) $*.texi $*.texi+ + +git.texi: user-manual.xml + $(RM) $@+ $@ + $(DOCBOOK2X_TEXI) user-manual.xml --to-stdout | $(PERL_PATH) fix-texi.perl >$@+ + mv $@+ $@ + +gitman.texi: $(MAN_XML) cat-texi.perl + $(RM) $@+ $@ + ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --to-stdout $(xml);)) | \ + $(PERL_PATH) cat-texi.perl $@ >$@+ + mv $@+ $@ + +gitman.info: gitman.texi + $(MAKEINFO) --no-split $*.texi + +$(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml + $(RM) $@+ $@ + $(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ + mv $@+ $@ howto-index.txt: howto-index.sh $(wildcard howto/*.txt) $(RM) $@+ $@ diff --git a/Documentation/cat-texi.perl b/Documentation/cat-texi.perl new file mode 100755 index 0000000000..e3d8e9faa8 --- /dev/null +++ b/Documentation/cat-texi.perl @@ -0,0 +1,38 @@ +#!/usr/bin/perl -w + +my @menu = (); +my $output = $ARGV[0]; + +open TMP, '>', "$output.tmp"; + +while () { + next if (/^\\input texinfo/../\@node Top/); + next if (/^\@bye/ || /^\.ft/); + if (s/^\@top (.*)/\@node $1,,,Top/) { + push @menu, $1; + } + s/\(\@pxref{\[URLS\]}\)//; + print TMP; +} +close TMP; + +printf '\input texinfo +@setfilename gitman.info +@documentencoding us-ascii +@node Top,,%s +@top Git Manual Pages +@documentlanguage en +@menu +', $menu[0]; + +for (@menu) { + print "* ${_}::\n"; +} +print "\@end menu\n"; +open TMP, '<', "$output.tmp"; +while () { + print; +} +close TMP; +print "\@bye\n"; +unlink "$output.tmp"; From 78d39f98f3135bc9f7cbef897aeb4a279ca4130e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 10 Dec 2007 01:19:31 -0800 Subject: [PATCH 07/13] git-help -i: invoke info with document and node name Signed-off-by: Junio C Hamano --- help.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/help.c b/help.c index 56477f4506..9d7ad6f319 100644 --- a/help.c +++ b/help.c @@ -286,7 +286,7 @@ static void show_man_page(const char *git_cmd) static void show_info_page(const char *git_cmd) { const char *page = cmd_to_page(git_cmd); - execlp("info", "info", page, NULL); + execlp("info", "info", "gitman", page, NULL); } static void show_html_page(const char *git_cmd) From a149a1a44af45352b63e2dadd790616966c220be Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 10 Dec 2007 01:35:29 -0800 Subject: [PATCH 08/13] git-help -i: show info documentation from matching version of git Signed-off-by: Junio C Hamano --- Makefile | 6 +++++- help.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 429bc1ddb5..f20b8c0092 100644 --- a/Makefile +++ b/Makefile @@ -155,6 +155,7 @@ STRIP ?= strip prefix = $(HOME) bindir = $(prefix)/bin mandir = $(prefix)/share/man +infodir = $(prefix)/share/info gitexecdir = $(bindir) sharedir = $(prefix)/share template_dir = $(sharedir)/git-core/templates @@ -750,6 +751,7 @@ ETC_GITCONFIG_SQ = $(subst ','\'',$(ETC_GITCONFIG)) DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) bindir_SQ = $(subst ','\'',$(bindir)) mandir_SQ = $(subst ','\'',$(mandir)) +infodir_SQ = $(subst ','\'',$(infodir)) gitexecdir_SQ = $(subst ','\'',$(gitexecdir)) template_dir_SQ = $(subst ','\'',$(template_dir)) htmldir_SQ = $(subst ','\'',$(htmldir)) @@ -798,7 +800,9 @@ git$X: git.o $(BUILTIN_OBJS) $(GITLIBS) $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS) help.o: help.c common-cmds.h GIT-CFLAGS - $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) '-DGIT_MAN_PATH="$(mandir_SQ)"' $< + $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \ + '-DGIT_MAN_PATH="$(mandir_SQ)"' \ + '-DGIT_INFO_PATH="$(infodir_SQ)"' $< git-merge-subtree$X: git-merge-recursive$X $(QUIET_BUILT_IN)$(RM) $@ && ln git-merge-recursive$X $@ diff --git a/help.c b/help.c index 9d7ad6f319..c96b1670f3 100644 --- a/help.c +++ b/help.c @@ -286,6 +286,7 @@ static void show_man_page(const char *git_cmd) static void show_info_page(const char *git_cmd) { const char *page = cmd_to_page(git_cmd); + setenv("INFOPATH", GIT_INFO_PATH, 1); execlp("info", "info", "gitman", page, NULL); } From bf79caffbc5a3587af2360dde67d8d5c3a3a4196 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 10 Dec 2007 05:29:18 -0500 Subject: [PATCH 09/13] Add git-browse-help to .gitignore Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index bac60ce31a..5eaba41995 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ git-archive git-bisect git-blame git-branch +git-browse-help git-bundle git-cat-file git-check-attr From 50b3555c48db08a4b4e8fe047a4fb550bdca75c5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 12 Dec 2007 13:31:02 -0800 Subject: [PATCH 10/13] Documentation: rename git.texi to user-manual.texi Signed-off-by: Junio C Hamano --- Documentation/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 37ec355ba4..1fd48ab367 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -170,10 +170,10 @@ XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css user-manual.html: user-manual.xml xsltproc $(XSLTOPTS) -o $@ $(XSLT) $< -git.info: git.texi - $(MAKEINFO) --no-split $*.texi +git.info: user-manual.texi + $(MAKEINFO) --no-split -o $@ user-manual.texi -git.texi: user-manual.xml +user-manual.texi: user-manual.xml $(RM) $@+ $@ $(DOCBOOK2X_TEXI) user-manual.xml --to-stdout | $(PERL_PATH) fix-texi.perl >$@+ mv $@+ $@ From c49d3c8a88916554c5db838c0346b6cf05d60104 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 12 Dec 2007 13:42:12 -0800 Subject: [PATCH 11/13] git.spec.in: remove python_path We do not depend on python nor customize scripts for it anymore. Signed-off-by: Junio C Hamano --- git.spec.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/git.spec.in b/git.spec.in index bdb293d990..d94bf6ad9e 100644 --- a/git.spec.in +++ b/git.spec.in @@ -1,7 +1,5 @@ # Pass --without docs to rpmbuild if you don't want the documentation -%define python_path /usr/bin/python - Name: git Version: @@VERSION@@ Release: 1%{?dist} @@ -98,7 +96,6 @@ rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ prefix=%{_prefix} mandir=%{_mandir} \ ETC_GITCONFIG=/etc/gitconfig \ - PYTHON_PATH=%{python_path} \ INSTALLDIRS=vendor install %{!?_without_docs: install-doc} find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' From 22c9071728cdc4c5b39e4fc6a33036d967d3a3a5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 12 Dec 2007 17:34:30 -0800 Subject: [PATCH 12/13] git-help -w: do not require to be in git repository The users used to be able to say "git help cat-file" from anywhere, but the browse-help script insisted to be in a git repository, which caused "git help -w cat-file" to barf outside. Correct it. While at it, remove leftover debugging "echo". Signed-off-by: Junio C Hamano --- git-browse-help.sh | 13 ++++++++----- git-sh-setup.sh | 45 ++++++++++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/git-browse-help.sh b/git-browse-help.sh index 817b3792c8..b465911c9a 100755 --- a/git-browse-help.sh +++ b/git-browse-help.sh @@ -17,8 +17,10 @@ # USAGE='[--browser=browser|--tool=browser] [cmd to display] ...' -SUBDIRECTORY_OK=Yes -OPTIONS_SPEC= + +# This must be capable of running outside of git directory, so +# the vanilla git-sh-setup should not be used. +NONGIT_OK=Yes . git-sh-setup # Install data. @@ -37,7 +39,7 @@ valid_tool() { } init_browser_path() { - browser_path=`git config browser.$1.path` + test -z "$GIT_DIR" || browser_path=`git config browser.$1.path` test -z "$browser_path" && browser_path=$1 } @@ -69,7 +71,8 @@ do shift done -if test -z "$browser"; then +if test -z "$browser" && test -n "$GIT_DIR" +then for opt in "help.browser" "web.browser" do browser="`git config $opt`" @@ -91,7 +94,7 @@ if test -z "$browser" ; then else browser_candidates="w3m links lynx" fi - echo "browser candidates: $browser_candidates" + for i in $browser_candidates; do init_browser_path $i if type "$browser_path" > /dev/null 2>&1; then diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 5aa62dda15..b366761b97 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -122,26 +122,33 @@ get_author_ident_from_commit () { LANG=C LC_ALL=C sed -ne "$pick_author_script" } -# Make sure we are in a valid repository of a vintage we understand. -if [ -z "$SUBDIRECTORY_OK" ] +# Make sure we are in a valid repository of a vintage we understand, +# if we require to be in a git repository. +if test -n "$NONGIT_OK" then - : ${GIT_DIR=.git} - test -z "$(git rev-parse --show-cdup)" || { - exit=$? - echo >&2 "You need to run this command from the toplevel of the working tree." - exit $exit - } + if git rev-parse --git-dir >/dev/null 2>&1 + then + : ${GIT_DIR=.git} + fi else - GIT_DIR=$(git rev-parse --git-dir) || { - exit=$? - echo >&2 "Failed to find a valid git directory." - exit $exit + if [ -z "$SUBDIRECTORY_OK" ] + then + : ${GIT_DIR=.git} + test -z "$(git rev-parse --show-cdup)" || { + exit=$? + echo >&2 "You need to run this command from the toplevel of the working tree." + exit $exit + } + else + GIT_DIR=$(git rev-parse --git-dir) || { + exit=$? + echo >&2 "Failed to find a valid git directory." + exit $exit + } + fi + test -n "$GIT_DIR" && GIT_DIR=$(cd "$GIT_DIR" && pwd) || { + echo >&2 "Unable to determine absolute path of git directory" + exit 1 } + : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"} fi - -test -n "$GIT_DIR" && GIT_DIR=$(cd "$GIT_DIR" && pwd) || { - echo >&2 "Unable to determine absolute path of git directory" - exit 1 -} - -: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"} From 39bf13f2d6aaec6ff34bf367f2497fc9247c721f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 12 Dec 2007 14:00:24 -0800 Subject: [PATCH 13/13] RPM spec: Adjust htmldir git help -w needs to know the right location of installed pages. Signed-off-by: Junio C Hamano --- git.spec.in | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/git.spec.in b/git.spec.in index d94bf6ad9e..3e5bebba05 100644 --- a/git.spec.in +++ b/git.spec.in @@ -83,19 +83,20 @@ BuildRequires: perl(Error) %description -n perl-Git Perl interface to Git +%define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-core-%{version} + %prep %setup -q %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ - ETC_GITCONFIG=/etc/gitconfig \ - prefix=%{_prefix} all %{!?_without_docs: doc} + %{path_settings} \ + all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ - prefix=%{_prefix} mandir=%{_mandir} \ - ETC_GITCONFIG=/etc/gitconfig \ + %{path_settings} \ INSTALLDIRS=vendor install %{!?_without_docs: install-doc} find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' @@ -171,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %doc Documentation/technical} %changelog +* Wed Dec 12 2007 Junio C Hamano +- Adjust htmldir to point at /usr/share/doc/git-core-$version/ + * Sun Jul 15 2007 Sean Estabrooks - Removed p4import.