From: Junio C Hamano Date: Wed, 21 Feb 2007 19:09:57 +0000 (-0800) Subject: Merge branch 'master' of git://repo.or.cz/git-gui into maint X-Git-Tag: v1.5.0.2~19 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5bac4a671907604b5fb4e24ff682d5b0e8431931;p=git.git Merge branch 'master' of git://repo.or.cz/git-gui into maint * 'master' of git://repo.or.cz/git-gui: git-gui: Don't crash in citool mode on initial commit. git-gui: Remove TODO list. git-gui: Include browser in our usage message. git-gui: Change summary of git-gui. git-gui: Display all authors of git-gui. git-gui: Use mixed path for docs on Cygwin. git-gui: Correct crash when saving options in blame mode. git-gui: Expose the browser as a subcommand. git-gui: Create new branches from a tag. git-gui: Prefer version file over git-describe. git-gui: Print version on the console. git-gui: More consistently display the application name. git-gui: Permit merging tags into the current branch. git-gui: Basic version check to ensure git 1.5.0 or later is used. git-gui: Refactor 'exec git subcmd' idiom. --- 5bac4a671907604b5fb4e24ff682d5b0e8431931 diff --cc git-gui/.gitignore index c714d382e,000000000..805ca2e1c mode 100644,000000..100644 --- a/git-gui/.gitignore +++ b/git-gui/.gitignore @@@ -1,3 -1,0 +1,4 @@@ ++CREDITS-FILE +GIT-VERSION-FILE +git-citool +git-gui diff --cc git-gui/CREDITS-GEN index 000000000,da2c07629..da2c07629 mode 000000,100755..100755 --- a/git-gui/CREDITS-GEN +++ b/git-gui/CREDITS-GEN diff --cc git-gui/GIT-VERSION-GEN index 9966126da,000000000..2741c1e14 mode 100755,000000..100755 --- a/git-gui/GIT-VERSION-GEN +++ b/git-gui/GIT-VERSION-GEN @@@ -1,77 -1,0 +1,82 @@@ +#!/bin/sh + +GVF=GIT-VERSION-FILE +DEF_VER=0.6.GITGUI + +LF=' +' + +tree_search () +{ + head=$1 + tree=$2 + for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null) + do + test $tree = $(git rev-parse $p^{tree} 2>/dev/null) && + vn=$(git describe --abbrev=4 $p 2>/dev/null) && + case "$vn" in + gitgui-[0-9]*) echo $vn; break;; + esac + done +} + ++# Always use the tarball version file if found, just ++# in case we are somehow contained in a larger git ++# repository that doesn't actually track our state. ++# (At least one package manager is doing this.) ++# +# We may be a subproject, so try looking for the merge +# commit that supplied this directory content if we are +# not at the toplevel. We probably will always be the +# second parent in the commit, but we shouldn't rely on +# that fact. +# +# If we are at the toplevel or the merge assumption fails - # try looking for a gitgui-* tag, or fallback onto the - # distributed version file. ++# try looking for a gitgui-* tag. + - if prefix="$(git rev-parse --show-prefix 2>/dev/null)" ++if test -f version && ++ VN=$(cat version) ++then ++ : happy ++elif prefix="$(git rev-parse --show-prefix 2>/dev/null)" + test -n "$prefix" && + head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) && + tree=$(git rev-parse --verify "HEAD:$prefix" 2>/dev/null) && + VN=$(tree_search $head $tree) + case "$VN" in + gitgui-[0-9]*) : happy ;; + *) (exit 1) ;; + esac +then + VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g'); +elif VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && + case "$VN" in + gitgui-[0-9]*) : happy ;; + *) (exit 1) ;; + esac +then + VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g'); - elif test -f version - then - VN=$(cat version) || VN="$DEF_VER" +else + VN="$DEF_VER" +fi + +dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty= +case "$dirty" in +'') + ;; +*) + VN="$VN-dirty" ;; +esac + +if test -r $GVF +then + VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF) +else + VC=unset +fi +test "$VN" = "$VC" || { + echo >&2 "GITGUI_VERSION = $VN" + echo "GITGUI_VERSION = $VN" >$GVF +} + + diff --cc git-gui/Makefile index fd82d9d16,000000000..66538ba1a mode 100644,000000..100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@@ -1,56 -1,0 +1,61 @@@ +all:: + +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE + @$(SHELL_PATH) ./GIT-VERSION-GEN +-include GIT-VERSION-FILE + - SCRIPT_SH = git-gui.sh +GITGUI_BUILT_INS = git-citool - ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH)) ++ALL_PROGRAMS = git-gui $(GITGUI_BUILT_INS) + +ifndef SHELL_PATH + SHELL_PATH = /bin/sh +endif + +ifndef gitexecdir + gitexecdir := $(shell git --exec-path) +endif + +ifndef INSTALL + INSTALL = install +endif + +DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) +gitexecdir_SQ = $(subst ','\'',$(gitexecdir)) +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) + - $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh ++git-gui: git-gui.sh GIT-VERSION-FILE CREDITS-FILE + rm -f $@ $@+ - sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ ++ sed -n \ ++ -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \ ++ -e '1,/^set gitgui_credits /p' \ + $@.sh >$@+ ++ cat CREDITS-FILE >>$@+ ++ sed -e '1,/^set gitgui_credits /d' $@.sh >>$@+ + chmod +x $@+ + mv $@+ $@ + ++CREDITS-FILE: CREDITS-GEN .FORCE-CREDITS-FILE ++ $(SHELL_PATH) ./CREDITS-GEN ++ +$(GITGUI_BUILT_INS): git-gui + rm -f $@ && ln git-gui $@ + - # These can record GITGUI_VERSION - $(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE - +all:: $(ALL_PROGRAMS) + +install: all + $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)' + $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)' + $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) + - dist-version: ++dist-version: CREDITS-FILE + @mkdir -p $(TARDIR) + @echo $(GITGUI_VERSION) > $(TARDIR)/version ++ @cat CREDITS-FILE > $(TARDIR)/credits + +clean:: - rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE ++ rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE CREDITS-FILE + +.PHONY: all install dist-version clean +.PHONY: .FORCE-GIT-VERSION-FILE ++.PHONY: .FORCE-CREDITS-FILE