* Re: kompare won't parse git diffs
From: Linus Torvalds @ 2006-08-02 20:51 UTC (permalink / raw)
To: Jakub Narebski; +Cc: git
In-Reply-To: <ear19d$j9p$1@sea.gmane.org>
On Wed, 2 Aug 2006, Jakub Narebski wrote:
>
> What about putting e.g. sha1 (or abbreviated sha1) of blob if file exist
> in repository, "(in index)" or "(working area)" in two other cases, instead
> of date or file version?
Quite frankly, it will just break the current git header standard, and
make diffs look uglier.
Just get kompare fixed instead. If you want to use it with git, you would
really want it to know about all the other git diff extensions too anyway,
and right now it's _buggy_ for requiring a tab where none needs to be.
If "patch" doesn't want the tab, then dammit, neither should kompare.
Linus
^ permalink raw reply
* Re: [PATCH] gitweb: optionally read config from GITWEB_CONFIG
From: Jeff King @ 2006-08-02 20:56 UTC (permalink / raw)
To: Luben Tuikov; +Cc: Junio C Hamano, git
In-Reply-To: <20060802205120.84032.qmail@web31808.mail.mud.yahoo.com>
On Wed, Aug 02, 2006 at 01:51:20PM -0700, Luben Tuikov wrote:
> I don't think users should even edit the Makefile. Makefiles are normally
> edited when the _build_ environment differs, not when the deployment
> environment differs.
I don't either; I should have stated more clearly: users can edit
config.mak or use command line parameters to make (the same way they do
for prefix or other variables).
You don't even have to do that if the default config-file path is fine
for you. And even if you don't, you should be able to set GITWEB_CONF
with Matthias' patch.
-Peff
^ permalink raw reply
* Re: [PATCH] gitweb: use single quotes for values replaced by the Makefile
From: Matthias Lederhofer @ 2006-08-02 20:57 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Jeff King, git
In-Reply-To: <7vmzamuaj6.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> wrote:
> I understand that (1) "@@FOO@@" is problematic, (2) being able
> to run gitweb/gitweb.perl while coming up with improvements is
> nice, but (3) not being able to say "/etc/foo/$ENV{SITE_NAME}"
> is quite a drawback on the deployment side.
>
> So why don't we use something other than @@, perhaps "++FOO++"?
That's the other way to solve this. If there is no typical character
for filenames which is handled different in double quotes this is fine
for me too.
> I'm inclined to take these two patches:
>
> gitweb: optionally read config from GITWEB_CONFIG (Jeff King)
> gitweb: require $ENV{'GITWEB_CONFIG'} (Matthias Lederhofer)
The suggestion by Jeff King to use
our $GITWEB_CONFIG = $ENV{GITWEB_CONFIG} || '@@GITWEB_CONFIG@@';
sounds reasonable too.
> so on top of them something like this?
[patch replacing @@ with ++]
Ack.
^ permalink raw reply
* Re: [PATCH] gitweb: require $ENV{'GITWEB_CONFIG'}
From: Junio C Hamano @ 2006-08-02 20:58 UTC (permalink / raw)
To: Jeff King; +Cc: git
In-Reply-To: <20060802205033.GB15678@sigio.intra.peff.net>
Jeff King <peff@peff.net> writes:
> I think this patch is a good idea, but it seems confusing to have two
> Maybe the environment should trump the built-in
> default:
> our $GITWEB_CONFIG = $ENV{GITWEB_CONFIG} || '@@GITWEB_CONFIG@@';
> which actually might be a reasonable thing for all of the config
> directives (so people can use a config file, apache environment munging,
> or the built-in defaults).
Sounds very sane. So Matthias's patch now becomes something
like this:
-- >8 --
diff --git a/gitweb/README b/gitweb/README
index b91d42a..dc4b850 100644
--- a/gitweb/README
+++ b/gitweb/README
@@ -23,6 +23,11 @@ You can specify the following configurat
Points to the location where you put gitweb.css on your web server.
* GITWEB_LOGO
Points to the location where you put git-logo.png on your web server.
+ * GITWEB_CONFIG
+ This file will be loaded using 'require'. If the environment
+ $GITWEB_CONFIG is set when gitweb.cgi is executed the file in the
+ environment variable will be loaded instead of the file
+ specified when gitweb.cgi was created.
Originally written by:
Kay Sievers <kay.sievers@vrfy.org>
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index d5b2de8..c7f13e7 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -63,6 +63,6 @@ our $mimetypes_file = undef;
-our $GITWEB_CONFIG = "@@GITWEB_CONFIG@@";
+our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "@@GITWEB_CONFIG@@";
require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
# version of the core git binary
our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
^ permalink raw reply related
* Re: [PATCH] gitweb: use single quotes for values replaced by the Makefile
From: Jeff King @ 2006-08-02 20:58 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vmzamuaj6.fsf@assigned-by-dhcp.cox.net>
On Wed, Aug 02, 2006 at 01:50:53PM -0700, Junio C Hamano wrote:
> So why don't we use something other than @@, perhaps "++FOO++"?
Acked-by: Jeff King <peff@peff.net>
^ permalink raw reply
* Re: [PATCH] gitweb: require $ENV{'GITWEB_CONFIG'}
From: Jeff King @ 2006-08-02 20:59 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vhd0uua6e.fsf@assigned-by-dhcp.cox.net>
On Wed, Aug 02, 2006 at 01:58:33PM -0700, Junio C Hamano wrote:
> Sounds very sane. So Matthias's patch now becomes something
> like this:
Acked-by: Jeff King <peff@peff.net>
^ permalink raw reply
* [PATCH] Make git-repo-config a builtin
From: Matthias Kestenholz @ 2006-08-02 21:51 UTC (permalink / raw)
To: junkio; +Cc: git, Matthias Kestenholz
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
---
Makefile | 7 ++++---
repo-config.c => builtin-repo-config.c | 3 ++-
builtin.h | 1 +
git.c | 1 +
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 704101d..8d38f1c 100644
--- a/Makefile
+++ b/Makefile
@@ -204,7 +204,7 @@ PROGRAMS = \
git-unpack-objects$X git-update-server-info$X \
git-upload-pack$X git-verify-pack$X \
git-symbolic-ref$X \
- git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
+ git-name-rev$X git-pack-redundant$X git-var$X \
git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \
git-merge-recur$X
@@ -217,7 +217,8 @@ BUILT_INS = git-log$X git-whatchanged$X
git-read-tree$X git-commit-tree$X git-write-tree$X \
git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
- git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X
+ git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X \
+ git-repo-config$X
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -274,7 +275,7 @@ BUILTIN_OBJS = \
builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \
builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
- builtin-mv.o builtin-prune-packed.o
+ builtin-mv.o builtin-prune-packed.o builtin-repo-config.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
EXTLIBS = -lz
diff --git a/repo-config.c b/builtin-repo-config.c
similarity index 98%
rename from repo-config.c
rename to builtin-repo-config.c
index c7ed0ac..1d93739 100644
--- a/repo-config.c
+++ b/builtin-repo-config.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include <regex.h>
@@ -128,7 +129,7 @@ free_strings:
return ret;
}
-int main(int argc, const char **argv)
+int cmd_repo_config(int argc, const char **argv, const char *prefix)
{
int nongit = 0;
setup_git_directory_gently(&nongit);
diff --git a/builtin.h b/builtin.h
index 7ddfe28..26ebcaf 100644
--- a/builtin.h
+++ b/builtin.h
@@ -48,6 +48,7 @@ extern int cmd_update_index(int argc, co
extern int cmd_update_ref(int argc, const char **argv, const char *prefix);
extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
extern int cmd_mv(int argc, const char **argv, const char *prefix);
+extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
diff --git a/git.c b/git.c
index 5b50762..6e72a89 100644
--- a/git.c
+++ b/git.c
@@ -264,6 +264,7 @@ static void handle_internal_command(int
{ "prune", cmd_prune, NEEDS_PREFIX },
{ "mv", cmd_mv, NEEDS_PREFIX },
{ "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
+ { "repo-config", cmd_repo_config },
};
int i;
--
1.4.2.rc2.g93b2c
^ permalink raw reply related
* [PATCH] use declarations from builtin.h for builtin commands
From: Matthias Kestenholz @ 2006-08-02 21:52 UTC (permalink / raw)
To: junkio; +Cc: git, Matthias Kestenholz
In-Reply-To: <11545555203975-git-send-email-matthias@spinlock.ch>
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
---
builtin-fmt-merge-msg.c | 3 ++-
builtin-prune-packed.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index c84224e..485ede7 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "commit.h"
#include "diff.h"
@@ -242,7 +243,7 @@ static void shortlog(const char *name, u
free_list(&subjects);
}
-int cmd_fmt_merge_msg(int argc, char **argv, const char *prefix)
+int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
{
int limit = 20, i = 0;
char line[1024];
diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index d0ff336..d3dd94d 100644
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
static const char prune_packed_usage[] =
@@ -54,7 +55,7 @@ static void prune_packed_objects(void)
}
}
-int cmd_prune_packed(int argc, char **argv, const char *prefix)
+int cmd_prune_packed(int argc, const char **argv, const char *prefix)
{
int i;
--
1.4.2.rc2.g93b2c
^ permalink raw reply related
* [PATCH] git-grep: document --and, --or, --not, ( and )
From: Matthias Lederhofer @ 2006-08-02 22:04 UTC (permalink / raw)
To: git
Signed-off-by: Matthias Lederhofer <matled@gmx.net>
---
The synopsis looks a bit strange, perhaps someone else has an idea for
this.
---
Documentation/git-grep.txt | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 62a8e7f..544ad24 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -16,7 +16,7 @@ SYNOPSIS
[-n] [-l | --files-with-matches] [-L | --files-without-match]
[-c | --count]
[-A <post-context>] [-B <pre-context>] [-C <context>]
- [-f <file>] [-e] <pattern>
+ [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...]
[<tree>...]
[--] [<path>...]
@@ -74,7 +74,14 @@ OPTIONS
-e::
The next parameter is the pattern. This option has to be
used for patterns starting with - and should be used in
- scripts passing user input to grep.
+ scripts passing user input to grep. Multiple patterns are
+ combined by 'or'.
+
+--and | --or | --not | ( | )::
+ Specify how multiple patterns are combined using boolean
+ expressions. `--or` is the default operator. `--and` has
+ higher precedence than `--or`. `-e` has to be used for all
+ patterns.
`<tree>...`::
Search blobs in the trees for specified patterns.
--
1.4.2.rc2.g4713
^ permalink raw reply related
* [PATCH 0/3] autoconf: Add support for SHELL_PATH, PERL_PATH and PYTHON_PATH
From: Jakub Narebski @ 2006-08-02 22:36 UTC (permalink / raw)
To: git
The following series of patches adds support for setting SHELL_PATH,
PERL_PATH and PYTHON_PATH from autoconf configure script using
--with-FEATURE=PATH option to ./configure invocation
Needs revision by someone better versed in autoconf than me.
1. autoconf: Add support for setting SHELL_PATH and PERL_PATH
2. autoconf: Move site configuration section earlier in configure.ac
3. autoconf: Add support for setting PYTHON_PATH or NO_PYTHON
--
Jakub Narebski
Poland
^ permalink raw reply
* [PATCH 1/3] autoconf: Add support for setting SHELL_PATH and PERL_PATH
From: Jakub Narebski @ 2006-08-02 22:38 UTC (permalink / raw)
To: git
In-Reply-To: <200608030036.56298.jnareb@gmail.com>
This patch adds support for setting SHELL_PATH and PERL_PATH to
autoconf generated ./configure script via --with-shell=PATH and
--with-perl=PATH options.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
configure.ac | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index c1f7751..4688e97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,17 +19,47 @@ # --------------------------
# Append LINE to file ${config_append}
AC_DEFUN([GIT_CONF_APPEND_LINE],
[echo "$1" >> "${config_append}"])# GIT_CONF_APPEND_LINE
+#
+# GIT_ARG_SET_PATH(PROGRAM)
+# -------------------------
+# Provide --with-PROGRAM=PATH option to set PATH to PROGRAM
+AC_DEFUN([GIT_ARG_SET_PATH],
+[AC_ARG_WITH([$1],
+ [AS_HELP_STRING([--with-$1=PATH],
+ [provide PATH to $1])],
+ [GIT_CONF_APPEND_PATH($1)],[])
+])# GIT_ARG_SET_PATH
+#
+# GIT_CONF_APPEND_PATH(PROGRAM)
+# ------------------------------
+# Parse --with-PROGRAM=PATH option to set PROGRAM_PATH=PATH
+# Used by GIT_ARG_SET_PATH(PROGRAM)
+AC_DEFUN([GIT_CONF_APPEND_PATH],
+[PROGRAM=m4_toupper($1); \
+if test "$withval" = "no"; then \
+ AC_MSG_WARN([You cannot use git without $1]); \
+else \
+ if test "$withval" = "yes"; then \
+ AC_MSG_WARN([You should provide path for --with-$1=PATH]); \
+ else \
+ GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=$withval); \
+ fi; \
+fi; \
+]) # GIT_CONF_APPEND_PATH
## Checks for programs.
AC_MSG_NOTICE([CHECKS for programs])
#
+GIT_ARG_SET_PATH(shell)
+GIT_ARG_SET_PATH(perl)
+#
+# Define NO_PYTHON if you want to lose all benefits of the recursive merge.
+# Define PYTHON_PATH to provide path to Python.
AC_PROG_CC
#AC_PROG_INSTALL # needs install-sh or install.sh in sources
AC_CHECK_TOOL(AR, ar, :)
AC_CHECK_PROGS(TAR, [gtar tar])
-#
-# Define NO_PYTHON if you want to lose all benefits of the recursive merge.
## Checks for libraries.
@@ -127,6 +157,7 @@ # a missing newline at the end of the fi
## Site configuration
## --with-PACKAGE[=ARG] and --without-PACKAGE
+#
# Define NO_SVN_TESTS if you want to skip time-consuming SVN interopability
# tests. These tests take up a significant amount of the total test time
# but are not needed unless you plan to talk to SVN repos.
--
1.4.1.1
^ permalink raw reply related
* [PATCH 2/3] autoconf: Move site configuration section earlier in configure.ac
From: Jakub Narebski @ 2006-08-02 22:38 UTC (permalink / raw)
To: git
In-Reply-To: <200608030036.56298.jnareb@gmail.com>
Move site configuration section, i.e. --with-PACKAGE[=ARG] and
--without-PACKAGE, --enable-FEATURE[=ARG] and --disable-FEATURE
options to the beginning of configure.ac file, just after definitions
of macros.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
configure.ac | 100 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4688e97..73e12d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,56 @@ fi; \
]) # GIT_CONF_APPEND_PATH
+## Site configuration
+## --with-PACKAGE[=ARG] and --without-PACKAGE
+#
+# Define NO_SVN_TESTS if you want to skip time-consuming SVN interopability
+# tests. These tests take up a significant amount of the total test time
+# but are not needed unless you plan to talk to SVN repos.
+#
+# Define MOZILLA_SHA1 environment variable when running make to make use of
+# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
+# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
+# choice) has very fast version optimized for i586.
+#
+# Define PPC_SHA1 environment variable when running make to make use of
+# a bundled SHA1 routine optimized for PowerPC.
+#
+# Define ARM_SHA1 environment variable when running make to make use of
+# a bundled SHA1 routine optimized for ARM.
+#
+# Define NO_OPENSSL environment variable if you do not have OpenSSL.
+# This also implies MOZILLA_SHA1.
+#
+# Define NO_CURL if you do not have curl installed. git-http-pull and
+# git-http-push are not built, and you cannot use http:// and https://
+# transports.
+#
+# Define CURLDIR=/foo/bar if your curl header and library files are in
+# /foo/bar/include and /foo/bar/lib directories.
+#
+# Define NO_EXPAT if you do not have expat installed. git-http-push is
+# not built, and you cannot push using http:// and https:// transports.
+#
+# Define NO_MMAP if you want to avoid mmap.
+#
+# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
+#
+## --enable-FEATURE[=ARG] and --disable-FEATURE
+# Define COLLISION_CHECK below if you believe that SHA1's
+# 1461501637330902918203684832716283019655932542976 hashes do not give you
+# sufficient guarantee that no collisions between objects will ever happen.
+#
+# Define USE_NSEC below if you want git to care about sub-second file mtimes
+# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
+# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
+# randomly break unless your underlying filesystem supports those sub-second
+# times (my ext3 doesn't).
+#
+# Define USE_STDEV below if you want git to care about the underlying device
+# change being considered an inode change from the update-cache perspective.
+
+
## Checks for programs.
AC_MSG_NOTICE([CHECKS for programs])
#
@@ -155,56 +205,6 @@ # Define NO_ACCURATE_DIFF if your diff p
# a missing newline at the end of the file.
-## Site configuration
-## --with-PACKAGE[=ARG] and --without-PACKAGE
-#
-# Define NO_SVN_TESTS if you want to skip time-consuming SVN interopability
-# tests. These tests take up a significant amount of the total test time
-# but are not needed unless you plan to talk to SVN repos.
-#
-# Define MOZILLA_SHA1 environment variable when running make to make use of
-# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
-# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
-# choice) has very fast version optimized for i586.
-#
-# Define PPC_SHA1 environment variable when running make to make use of
-# a bundled SHA1 routine optimized for PowerPC.
-#
-# Define ARM_SHA1 environment variable when running make to make use of
-# a bundled SHA1 routine optimized for ARM.
-#
-# Define NO_OPENSSL environment variable if you do not have OpenSSL.
-# This also implies MOZILLA_SHA1.
-#
-# Define NO_CURL if you do not have curl installed. git-http-pull and
-# git-http-push are not built, and you cannot use http:// and https://
-# transports.
-#
-# Define CURLDIR=/foo/bar if your curl header and library files are in
-# /foo/bar/include and /foo/bar/lib directories.
-#
-# Define NO_EXPAT if you do not have expat installed. git-http-push is
-# not built, and you cannot push using http:// and https:// transports.
-#
-# Define NO_MMAP if you want to avoid mmap.
-#
-# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
-#
-## --enable-FEATURE[=ARG] and --disable-FEATURE
-# Define COLLISION_CHECK below if you believe that SHA1's
-# 1461501637330902918203684832716283019655932542976 hashes do not give you
-# sufficient guarantee that no collisions between objects will ever happen.
-#
-# Define USE_NSEC below if you want git to care about sub-second file mtimes
-# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
-# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
-# randomly break unless your underlying filesystem supports those sub-second
-# times (my ext3 doesn't).
-#
-# Define USE_STDEV below if you want git to care about the underlying device
-# change being considered an inode change from the update-cache perspective.
-
-
## Output files
AC_CONFIG_FILES(["${config_file}":"${config_in}":"${config_append}"])
AC_OUTPUT
--
1.4.1.1
^ permalink raw reply related
* [PATCH 3/3] autoconf: Add support for setting PYTHON_PATH or NO_PYTHON
From: Jakub Narebski @ 2006-08-02 22:40 UTC (permalink / raw)
To: git
In-Reply-To: <200608030036.56298.jnareb@gmail.com>
This patch adds support for setting either PYTHON_PATH or NO_PYTHON to
autoconf generated ./configure script via --with-python=PATH (sets
PYTHON_PATH) or --without-python (sets NO_PYTHON). Autodetect
PYTHON_PATH via AC_PATH_PROGS.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
Tweaked a little to remove accidental trailing whitespace.
configure.ac | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+)
diff --git a/configure.ac b/configure.ac
index 73e12d3..0a54b44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,18 @@ AC_MSG_NOTICE([CHECKS for programs])
#
GIT_ARG_SET_PATH(shell)
GIT_ARG_SET_PATH(perl)
+AC_ARG_WITH(python,[AS_HELP_STRING([--with-python=PATH], [provide PATH to python])
+AS_HELP_STRING([--no-python], [don't use python scripts])],
+ [if test "$withval" = "no"; then \
+ NO_PYTHON=YesPlease; \
+ elif test "$withval" != "yes"; then \
+ PYTHON_PATH=$withval; \
+ fi; \
+ ])
+AC_SUBST(NO_PYTHON)
+AC_SUBST(PYTHON_PATH)
+
+
#
# Define NO_PYTHON if you want to lose all benefits of the recursive merge.
# Define PYTHON_PATH to provide path to Python.
@@ -110,6 +122,16 @@ AC_PROG_CC
#AC_PROG_INSTALL # needs install-sh or install.sh in sources
AC_CHECK_TOOL(AR, ar, :)
AC_CHECK_PROGS(TAR, [gtar tar])
+if test -z "$NO_PYTHON"; then
+ AC_PATH_PROGS(PYTHON_PATH, [python2.4 python2.3 python2 python])
+ if test -n "$PYTHON_PATH"; then
+ GIT_CONF_APPEND_LINE([PYTHON_PATH=@PYTHON_PATH@])
+ else
+ GIT_CONF_APPEND_LINE([NO_PYTHON=@NO_PYTHON@])
+ fi
+else
+ GIT_CONF_APPEND_LINE([NO_PYTHON=@NO_PYTHON@])
+fi
## Checks for libraries.
--
1.4.1.1
^ permalink raw reply related
* [RFT] Cygwin needs NO_C99_FORMAT???
From: Junio C Hamano @ 2006-08-02 22:44 UTC (permalink / raw)
To: git
I noticed that t3800 test breaks with git built without this
option.
---
* Tests and feedbacks very much appreciated.
diff --git a/Makefile b/Makefile
index fd45cd1..4f7ae33 100644
--- a/Makefile
+++ b/Makefile
@@ -316,6 +316,7 @@ ifeq ($(uname_O),Cygwin)
NO_STRLCPY = YesPlease
NO_SYMLINK_HEAD = YesPlease
NEEDS_LIBICONV = YesPlease
+ NO_C99_FORMAT = YesPlease
# There are conflicting reports about this.
# On some boxes NO_MMAP is needed, and not so elsewhere.
# Try uncommenting this if you see things break -- YMMV.
^ permalink raw reply related
* It’s not wonder your girlfriend is very angry!
From: Slaughter @ 2006-08-02 22:47 UTC (permalink / raw)
To: git
Dear client. Go and tell her you're not among those who try to combat this for years. You might have tried other products and failed - the last thing you need is Extra-Time, the no-failure solution. Any man wants to last longer and make his partner happy with that. Check up here: http://ymachiton.com/gal/get/ You will never see her face frustrated again. No arguments and no complaints!
^ permalink raw reply
* Re: What's in git.git
From: Junio C Hamano @ 2006-08-03 4:52 UTC (permalink / raw)
To: carbonated beverage; +Cc: git
In-Reply-To: <20060802192922.GA30539@prophet.net-ronin.org>
carbonated beverage <ramune@net-ronin.org> writes:
> Any plans on a fix for:
> http://marc.theaimsgroup.com/?l=git&m=115089393505286&w=2
Unfortunately, plan needs to be drawn by somebody who sees
breakage.
> Commenting out the line mentioned in the reply lets me resize the window and
> see the bottom panel properly -- but I do have to resize it every time so it
> doesn't extend past the bottom of the screen.
>
> FYI, if it's not easy to reproduct, I'm running it on Debian/stable systems,
> i386 and x86_64, both with backports.org X servers, using tcl/tk 8.4
I am running Debian/testing+unstable on i386 and x86_64 with
tcl8.4 (8.4.12-1.1) and tk8.4 (8.4.12-1), displaying on
xserver-xorg (1:7.0.22). I cannot get gitk to misbehave the way
the quoted post describes. Even after resizing it to so short
that the bottom search input and commitdiff area becomes
invisible, moving the middle separator around gives the lower
panes back, and both of the scrollbars on the lower panes seem
to be behaving during that exercise.
The "workaround" to disable ".ctop conf" feels actively wrong;
this makes the command forget the dimension from the last
session, which is not so different from removing ~/.gitk every
time.
Could this be some funny interaction between window manager and
gitk perhaps? I think my machines run metacity and the
environment is minimally Gnome.
^ permalink raw reply
* Re: What's in git.git
From: Junio C Hamano @ 2006-08-03 4:56 UTC (permalink / raw)
To: Alex Riesen; +Cc: git
In-Reply-To: <81b0412b0608020702q2fd4ec83ga43714c15538f7ad@mail.gmail.com>
"Alex Riesen" <raa.lkml@gmail.com> writes:
> On 8/2/06, Junio C Hamano <junkio@cox.net> wrote:
>> - Git.pm by Pasky with help from Pavel Roskin and others.
>>
>> I'd like to merge this immediately after 1.4.2, unless there
>> still are concerns about its portability (in which case
>> please help fixing them up before this hits the "master"
>> branch).
>
> Completely broken on ActiveState Perl and cygwin. Generated Makefile
> contains pathnames with backslashes and the whole file has
> CRLF line endings.
Anything constructive other than "doctor it hurts when I use
activestate", so you can help improve things to be more
ActiveState friendly?
What's the standard workflow/procedure ActiveState users would
use to build and install .xs extensions? Maybe they have their
own $(MAKE) equivalent that groks such a Makefile with
backslashed pathnames and CRLF endings?
^ permalink raw reply
* Re: What's in git.git
From: A Large Angry SCM @ 2006-08-03 5:15 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, carbonated beverage
In-Reply-To: <7virlas9ol.fsf@assigned-by-dhcp.cox.net>
Broken for me also:
Suse 9.3
Ubuntu Hoary
Ubuntu Breezy
No Gnome(s) here.
Junio C Hamano wrote:
> carbonated beverage <ramune@net-ronin.org> writes:
>
>> Any plans on a fix for:
>> http://marc.theaimsgroup.com/?l=git&m=115089393505286&w=2
>
> Unfortunately, plan needs to be drawn by somebody who sees
> breakage.
>
>> Commenting out the line mentioned in the reply lets me resize the window and
>> see the bottom panel properly -- but I do have to resize it every time so it
>> doesn't extend past the bottom of the screen.
>>
>> FYI, if it's not easy to reproduct, I'm running it on Debian/stable systems,
>> i386 and x86_64, both with backports.org X servers, using tcl/tk 8.4
>
> I am running Debian/testing+unstable on i386 and x86_64 with
> tcl8.4 (8.4.12-1.1) and tk8.4 (8.4.12-1), displaying on
> xserver-xorg (1:7.0.22). I cannot get gitk to misbehave the way
> the quoted post describes. Even after resizing it to so short
> that the bottom search input and commitdiff area becomes
> invisible, moving the middle separator around gives the lower
> panes back, and both of the scrollbars on the lower panes seem
> to be behaving during that exercise.
>
> The "workaround" to disable ".ctop conf" feels actively wrong;
> this makes the command forget the dimension from the last
> session, which is not so different from removing ~/.gitk every
> time.
>
> Could this be some funny interaction between window manager and
> gitk perhaps? I think my machines run metacity and the
> environment is minimally Gnome.
>
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: What's in git.git
From: carbonated beverage @ 2006-08-03 5:30 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7virlas9ol.fsf@assigned-by-dhcp.cox.net>
On Wed, Aug 02, 2006 at 09:52:10PM -0700, Junio C Hamano wrote:
> Unfortunately, plan needs to be drawn by somebody who sees
> breakage.
I'm willing to help out with anything needed, but I haven't touched TCL in a
very long time -- and never used Tk.
> Could this be some funny interaction between window manager and
> gitk perhaps? I think my machines run metacity and the
> environment is minimally Gnome.
I'm using Enlightenment from the Debian repo:
barbeque/zarathustra:barbeque: eesh -ewait 'version'
Enlightenment Version : enlightenment-0.16.7.2
code is current to : $Date: 2004/12/14 22:00:25 $
barbeque/zarathustra:barbeque: dpkg -l xserver-xorg|tail -1
ii xserver-xorg 6.9.0.dfsg.1-3 the X.Org X server
I'll start experimenting with other window managers and see what I turn up.
-- DN
Daniel Nobuto
^ permalink raw reply
* Re: What's in git.git
From: carbonated beverage @ 2006-08-03 5:48 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <20060803053004.GA10413@prophet.net-ronin.org>
Looks like it's not window-manager specific.
rm'd ~/.gitk, then launched it twice -- it showed up on:
Enlightenment 0.16.7.2-1
flwm 1.00-7
wm2 4-8
fluxbox 0.9.11-1sarge0
metacity 2.8.8-1
vtwm 5.4.6b-1
ctwm 3.6-2
twm 6.9.0.dfsg.1-3
ion3 20050502-2
If anyone has ideas or requests for more info, let me know.
*starts to read up on Tk*
-- DN
Daniel
^ permalink raw reply
* Re: [PATCH] gitweb.cgi: Customization
From: Martin Waitz @ 2006-08-03 6:58 UTC (permalink / raw)
To: Martin Langhoff; +Cc: Junio C Hamano, Luben Tuikov, git, Matthias Lederhofer
In-Reply-To: <46a038f90608011913t777cf20dh9baaf355b19d18e6@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1219 bytes --]
hoi :)
On Wed, Aug 02, 2006 at 02:13:51PM +1200, Martin Langhoff wrote:
> On 8/2/06, Junio C Hamano <junkio@cox.net> wrote:
> >I do not think there is much difference between any of the
> >customization proposed so far (yours, Martin's and the one from
> >Matthias Lederhofer) from functionality and ease-of-use point of
> >view. They all try to make customization can be done in one
> >place, and the difference is mostly of taste, so I'd just pick
> >one from Martin
>
> I'm a bit lost as to gitweb config. Are we not relying on %ENV for
> this stuff? Apache's facilities to configure CGIs via ENV are really
> powerful. You can do conditionals in apache config files, lock stuff
> down in httpd.conf, override it with files in conf.d, and
> allow/disallow overrides in .htaccess ...
we could make the default use %ENV.
Something like (in Makefile):
GITWEB_SITENAME = $$ENV{GITWEB_SITENAME}
GITWEB_PROJECTROOT = $$ENV{GITWEB_SITENAME} || "/pub/git"
...
and then change gitweb to not put the expanded config values into
quotes. So:
our $projectroot = @@GITWEB_PROJECTROOT@@;
This approach would allow both built-time or run-time configuration of
gitweb.
--
Martin Waitz
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: What's in git.git
From: carbonated beverage @ 2006-08-03 7:36 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <20060803054831.GB10413@prophet.net-ronin.org>
Wheee...
Found it.
Not sure what the "right" way to do this is... generated it with
"git format-patch FETCH_HEAD.." on the master branch, and dropped it
inline to the mail.
Um.... patch included because it's so trivial anyone could have fixed it,
but what's the "proper" way to submit patches?
-- DN
Daniel
>From 1483a6207ffe8bf216ea3258db7b453857c3e1d6 Mon Sep 17 00:00:00 2001
From: Daniel Nobuto <ramune@net-ronin.org>
Date: Thu, 3 Aug 2006 00:32:01 -0700
Subject: [PATCH] Save geometry(ctexth) in ~/.gitk
Not doing so causes subsequent launches of gitk to "lose" the bottom bits
of the window.
Signed-off-by: Daniel Nobuto <ramune@net-ronin.org>
---
gitk | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/gitk b/gitk
index ba4644f..5ae28ef 100755
--- a/gitk
+++ b/gitk
@@ -770,6 +770,9 @@ proc savestuff {w} {
set wid [expr {([winfo width $ctext] - 8) \
/ [font measure $textfont "0"]}]
puts $f "set geometry(ctextw) $wid"
+ set geometry(ctexth) [expr {($texth - 8) /
+ / [font metrics $textfont -linespace]}]
+ puts $f "set geometry(ctexth) $wid"
set wid [expr {([winfo width $cflist] - 11) \
/ [font measure [$cflist cget -font] "0"]}]
puts $f "set geometry(cflistw) $wid"
--
1.4.1.1
^ permalink raw reply related
* Re: What's in git.git
From: carbonated beverage @ 2006-08-03 7:37 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <20060803073636.GA12755@prophet.net-ronin.org>
[-- Attachment #1: Type: text/plain, Size: 85 bytes --]
Of course, and the patch gets munched. Re-trying as an attachment. :(
-- DN
Daniel
[-- Attachment #2: 0001-Save-geometry-ctexth-in-.gitk.txt --]
[-- Type: text/plain, Size: 940 bytes --]
>From 1483a6207ffe8bf216ea3258db7b453857c3e1d6 Mon Sep 17 00:00:00 2001
From: Daniel Nobuto <ramune@net-ronin.org>
Date: Thu, 3 Aug 2006 00:32:01 -0700
Subject: [PATCH] Save geometry(ctexth) in ~/.gitk
Not doing so causes subsequent launches of gitk to "lose" the bottom bits
of the window.
Signed-off-by: Daniel Nobuto <ramune@net-ronin.org>
---
gitk | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/gitk b/gitk
index ba4644f..5ae28ef 100755
--- a/gitk
+++ b/gitk
@@ -770,6 +770,9 @@ proc savestuff {w} {
set wid [expr {([winfo width $ctext] - 8) \
/ [font measure $textfont "0"]}]
puts $f "set geometry(ctextw) $wid"
+ set geometry(ctexth) [expr {($texth - 8) /
+ / [font metrics $textfont -linespace]}]
+ puts $f "set geometry(ctexth) $wid"
set wid [expr {([winfo width $cflist] - 11) \
/ [font measure [$cflist cget -font] "0"]}]
puts $f "set geometry(cflistw) $wid"
--
1.4.1.1
^ permalink raw reply related
* gitweb testing with non-apache web server
From: Marc Singer @ 2006-08-03 7:54 UTC (permalink / raw)
To: git
I would like to use gitweb with the Cherokee web server because the
host that I have on hand has very limited RAM, 32MiB. Neither the
version of gitweb available on Debian (v264) nor the latest in the git
repo works.
I did some debugging on the latest repo version. The lines
our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
if (defined $project) {
...
are being executed even though the url is
http://server/git
I think that the problem is that Cherokee translates the request URL
into
http://server/git/
which means that the $ENV{'PATH_INFO'} is the string "/" insted of
being undefined.
The error I'm seeing is that the request path is forbidden, but I
suspect that this is some sort of misunderstanding between the web
server and the script.
So, I wonder if someone who has a working gitweb would be willing to
test with Cherokee or some other resource conservative web server.
Cheers.
^ permalink raw reply
* Re: What's in git.git
From: Alex Riesen @ 2006-08-03 8:09 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vd5bis9ha.fsf@assigned-by-dhcp.cox.net>
On 8/3/06, Junio C Hamano <junkio@cox.net> wrote:
> >> - Git.pm by Pasky with help from Pavel Roskin and others.
> >>
> >> I'd like to merge this immediately after 1.4.2, unless there
> >> still are concerns about its portability (in which case
> >> please help fixing them up before this hits the "master"
> >> branch).
> >
> > Completely broken on ActiveState Perl and cygwin. Generated Makefile
> > contains pathnames with backslashes and the whole file has
> > CRLF line endings.
>
> Anything constructive other than "doctor it hurts when I use
> activestate", so you can help improve things to be more
> ActiveState friendly?
Nothing. If I had something, I'd post it.
> What's the standard workflow/procedure ActiveState users would
> use to build and install .xs extensions? Maybe they have their
> own $(MAKE) equivalent that groks such a Makefile with
> backslashed pathnames and CRLF endings?
I don't know. It's a bit more than backslashes and CRLF. The pathnames
must be _completely_ converted from windows to cygwin. Cygwin even
provides an utility for that (cygpath). Besides, there still is that stupid
case-sensitivity problem.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox