* Re: [PATCH] Add a simple option parser.
From: Johannes Schindelin @ 2007-10-13 14:39 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: git, Junio C Hamano
In-Reply-To: <1192282153-26684-2-git-send-email-madcoder@debian.org>
Hi,
On Sat, 13 Oct 2007, Pierre Habouzit wrote:
> Aggregation of single switches is allowed:
> -rC0 is the same as -r -C 0 (supposing that -C wants an arg).
I'd be more interested in "-rC 0" working... Is that supported, too?
> diff --git a/parse-options.c b/parse-options.c
> new file mode 100644
> index 0000000..07abb50
> --- /dev/null
> +++ b/parse-options.c
> @@ -0,0 +1,227 @@
> +#include "git-compat-util.h"
> +#include "parse-options.h"
> +#include "strbuf.h"
> +
> +#define OPT_SHORT 1
> +#define OPT_UNSET 2
> +
> +struct optparse_t {
> + const char **argv;
> + int argc;
> + const char *opt;
> +};
> +
> +static inline const char *get_arg(struct optparse_t *p)
> +{
> + if (p->opt) {
> + const char *res = p->opt;
> + p->opt = NULL;
> + return res;
> + }
> + p->argc--;
> + return *++p->argv;
> +}
This is only used once; I wonder if it is really that more readable having
this as a function in its own right.
> +static inline const char *skippfx(const char *str, const char *prefix)
Personally, I do not like abbreviations like that. They do not save that
much screen estate (skip_prefix is only 4 characters longer, but much more
readable). Same goes for "cnt" later.
> +static int get_value(struct optparse_t *p, struct option *opt, int flags)
> +{
> + if (p->opt && (flags & OPT_UNSET))
> + return opterror(opt, "takes no value", flags);
> +
> + switch (opt->type) {
> + case OPTION_BOOLEAN:
> + if (!(flags & OPT_SHORT) && p->opt)
> + return opterror(opt, "takes no value", flags);
> + if (flags & OPT_UNSET) {
> + *(int *)opt->value = 0;
> + } else {
> + (*(int *)opt->value)++;
> + }
> + return 0;
> +
> + case OPTION_STRING:
> + if (flags & OPT_UNSET) {
> + *(const char **)opt->value = (const char *)NULL;
> + } else {
> + if (!p->opt && p->argc < 1)
> + return opterror(opt, "requires a value", flags);
> + *(const char **)opt->value = get_arg(p);
> + }
> + return 0;
> +
> + case OPTION_INTEGER:
> + if (flags & OPT_UNSET) {
> + *(int *)opt->value = 0;
> + } else {
> + const char *s;
> + if (!p->opt && p->argc < 1)
> + return opterror(opt, "requires a value", flags);
> + *(int *)opt->value = strtol(*p->argv, (char **)&s, 10);
> + if (*s)
> + return opterror(opt, "expects a numerical value", flags);
> + }
> + return 0;
> +
> + default:
> + die("should not happen, someone must be hit on the forehead");
:-P
> +static int parse_long_opt(struct optparse_t *p, const char *arg,
> + struct option *options, int count)
> +{
> + int i;
> +
> + for (i = 0; i < count; i++) {
> + const char *rest;
> + int flags = 0;
> +
> + if (!options[i].long_name)
> + continue;
> +
> + rest = skippfx(arg, options[i].long_name);
> + if (!rest && !strncmp(arg, "no-", 3)) {
> + rest = skippfx(arg + 3, options[i].long_name);
> + flags |= OPT_SHORT;
> + }
Would this not be more intuitive as
if (!prefixcmp(arg, "no-")) {
arg += 3;
flags |= OPT_UNSET;
}
rest = skip_prefix(arg, options[i].long_name);
Hm? (Note that I say UNSET, not SHORT... ;-)
> + if (!rest)
> + continue;
> + if (*rest) {
> + if (*rest != '=')
> + continue;
Is this really no error? For example, "git log
--decorate-walls-and-roofs" would not fail...
> +int parse_options(int argc, const char **argv,
> + struct option *options, int count,
> + const char * const usagestr[], int flags)
Please indent by the same amount.
> + if (arg[1] != '-') {
> + optp.opt = arg + 1;
> + do {
> + if (*optp.opt == 'h')
> + make_usage(usagestr, options, count);
How about calling this "usage_with_options()"? With that name I expected
make_usage() to return a strbuf.
> + if (!arg[2]) { /* "--" */
> + if (!(flags & OPT_COPY_DASHDASH))
> + optp.argc--, optp.argv++;
I would prefer this as
if (!(flags & OPT_COPY_DASHDASH)) {
optp.argc--;
optp.argv++;
}
While I'm at it: could you use "args" instead of "optp"? It is misleading
both in that it not only contains options (but other arguments, too) as in
that it is not a pointer (the trailing "p" is used as an indicator of that
very often, including git's source code).
In the same vein, OPT_COPY_DASHDASH should be named
PARSE_OPT_KEEP_DASHDASH.
> + if (opts->short_name) {
> + strbuf_addf(&sb, "-%c", opts->short_name);
> + }
> + if (opts->long_name) {
> + strbuf_addf(&sb, opts->short_name ? ", --%s" : "--%s",
> + opts->long_name);
> + }
Please lose the curly brackets.
> + if (sb.len - pos <= USAGE_OPTS_WIDTH) {
> + int pad = USAGE_OPTS_WIDTH - (sb.len - pos) + USAGE_GAP;
> + strbuf_addf(&sb, "%*s%s\n", pad, "", opts->help);
> + } else {
> + strbuf_addf(&sb, "\n%*s%s\n", USAGE_OPTS_WIDTH + USAGE_GAP, "",
> + opts->help);
> + }
Same here. (And I'd also make sure that the lines are not that long.)
> diff --git a/parse-options.h b/parse-options.h
> new file mode 100644
> index 0000000..4b33d17
> --- /dev/null
> +++ b/parse-options.h
> @@ -0,0 +1,37 @@
> +#ifndef PARSE_OPTIONS_H
> +#define PARSE_OPTIONS_H
> +
> +enum option_type {
> + OPTION_BOOLEAN,
I know that I proposed "BOOLEAN", but actually, you use it more like an
"INCREMENTAL", right?
Other than that: I like it very much.
Ciao,
Dscho
^ permalink raw reply
* Re: [bug] gitk can not read history if diff color is enabled
From: Johannes Schindelin @ 2007-10-13 14:43 UTC (permalink / raw)
To: msharov; +Cc: git
In-Reply-To: <4710D3AA.8000502@softhome.net>
Hi,
On Sat, 13 Oct 2007, Mike Sharov wrote:
> Reproduced in git version 1.5.3.4.217.gbfc1, although it's been this way
> for a while. To see the bug, enable color diff with
>
> [diff]
> color
>
> and launch gitk on any repository (like the Linux kernel tree).
Thanks for the bug report.
This is fixed in http://hjemli.net/git/git/log/?h=q/mb/gitk/log--no-color
(which will be applied without any doubt once our king penguin comes
back).
Ciao,
Dscho
^ permalink raw reply
* Re: [bug] gitk can not read history if diff color is enabled
From: Michele Ballabio @ 2007-10-13 14:49 UTC (permalink / raw)
To: git, msharov
In-Reply-To: <4710D3AA.8000502@softhome.net>
On Saturday 13 October 2007, Mike Sharov wrote:
> Reproduced in git version 1.5.3.4.217.gbfc1, although it's been this way
> for a while. To see the bug, enable color diff with
>
> [diff]
> color
>
> and launch gitk on any repository (like the Linux kernel tree). The
> result is a dialog box "Can't parse git log output '\x1b[33mcommit" etc.
> qgit can still view the history without errors, so I guess it must be
> possible to somehow turn off color for a specific query.
A patch was posted, and is queued here:
http://hjemli.net/git/git/commit/?h=q/mb/gitk/log--no-color
^ permalink raw reply
* Re: [PATCH] Color support added to git-add--interactive.
From: Wincent Colaiuta @ 2007-10-13 14:45 UTC (permalink / raw)
To: Dan Zwell
Cc: Git Mailing List, Jeff King, Jonathan del Strother,
Johannes Schindelin, Frank Lichtenheld
In-Reply-To: <471045DA.5050902@gmail.com>
El 13/10/2007, a las 6:13, Dan Zwell escribió:
> Dan Zwell<Color-add-interactive.patch.gz>
Based on a couple of the suggestions you've received I made a couple
of changes to your patch and given it a quick try-out. I'm no perl
hacker so there may be better ways.
- as per Jeff's suggestion, changed your print_ansi_color method,
modelling it after the print_color_ln and color_vprintf functions
defined in color.c; accepts a color, a string, and an optional
trailer (where if there is a newline you pass it as the trailer)
- as Johannes pointed out, "clear" and "reset" are not used
consistently even though the Term::ANSIColor documentation says that
they're the same, so settled on "clear"; although in any case, the
changes to the print_ansi_color function mean that it is now the only
site where clearing takes place
- changed the regex as suggested by Johannes, and a couple of others
that are used when splitting hunks
- used more explicit notation for regex as proposed by Frank
Took it for a basic spin here and seems to work. Didn't even think
about implementing user-settable colors.
Cheers,
Wincent
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index be68814..ae3d11e 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -2,6 +2,28 @@
use strict;
+my $use_color;
+my $color_config = qx(git config --get color.add-interactive);
+if ($color_config =~ /true/ || -t STDOUT && $color_config =~ /auto/) {
+ $use_color = "true";
+ require Term::ANSIColor;
+}
+
+sub print_ansi_color($$;$) {
+ my $color = shift;
+ my $string = shift;
+ my $trailer = shift;
+ if ($use_color) {
+ printf '%s%s%s', Term::ANSIColor::color($color), $string,
+ Term::ANSIColor::color('clear');
+ } else {
+ print $string;
+ }
+ if ($trailer) {
+ print $trailer;
+ }
+}
+
sub run_cmd_pipe {
if ($^O eq 'MSWin32') {
my @invalid = grep {m/[":*]/} @_;
@@ -175,7 +197,7 @@ sub list_and_choose {
if (!$opts->{LIST_FLAT}) {
print " ";
}
- print "$opts->{HEADER}\n";
+ print_ansi_color "bold", "$opts->{HEADER}", "\n";
}
for ($i = 0; $i < @stuff; $i++) {
my $chosen = $chosen[$i] ? '*' : ' ';
@@ -205,7 +227,7 @@ sub list_and_choose {
return if ($opts->{LIST_ONLY});
- print $opts->{PROMPT};
+ print_ansi_color "bold blue", $opts->{PROMPT};
if ($opts->{SINGLETON}) {
print "> ";
}
@@ -338,11 +360,17 @@ sub add_untracked_cmd {
sub parse_diff {
my ($path) = @_;
- my @diff = run_cmd_pipe(qw(git diff-files -p --), $path);
+ my @diff;
+ if ($use_color) {
+ @diff = run_cmd_pipe(qw(git diff-files --color -p --), $path);
+ }
+ else {
+ @diff = run_cmd_pipe(qw(git diff-files -p --), $path);
+ }
my (@hunk) = { TEXT => [] };
for (@diff) {
- if (/^@@ /) {
+ if (/^[^-+ ]*@@ /) {
push @hunk, { TEXT => [] };
}
push @{$hunk[-1]{TEXT}}, $_;
@@ -360,7 +388,7 @@ sub hunk_splittable {
sub parse_hunk_header {
my ($line) = @_;
my ($o_ofs, $o_cnt, $n_ofs, $n_cnt) =
- $line =~ /^@@ -(\d+)(?:,(\d+)) \+(\d+)(?:,(\d+)) @@/;
+ $line =~ /^[^-+ ]*@@ -(\d+)(?:,(\d+)) \+(\d+)(?:,(\d+)) @@/;
return ($o_ofs, $o_cnt, $n_ofs, $n_cnt);
}
@@ -426,7 +454,7 @@ sub split_hunk {
}
push @{$this->{TEXT}}, $line;
$this->{ADDDEL}++;
- if ($line =~ /^-/) {
+ if ($line =~ /^[^-+ ]*-/) {
$this->{OCNT}++;
}
else {
@@ -483,7 +511,7 @@ sub merge_hunk {
$o_cnt = $n_cnt = 0;
for ($i = 1; $i < @{$prev->{TEXT}}; $i++) {
my $line = $prev->{TEXT}[$i];
- if ($line =~ /^\+/) {
+ if ($line =~ /^[^-+ ]*\+/) {
$n_cnt++;
push @line, $line;
next;
@@ -501,7 +529,7 @@ sub merge_hunk {
for ($i = 1; $i < @{$this->{TEXT}}; $i++) {
my $line = $this->{TEXT}[$i];
- if ($line =~ /^\+/) {
+ if ($line =~ /^[^-+ ]*\+/) {
$n_cnt++;
push @line, $line;
next;
@@ -544,7 +572,7 @@ sub coalesce_overlapping_hunks {
}
sub help_patch_cmd {
- print <<\EOF ;
+ my $help = <<\EOF ;
y - stage this hunk
n - do not stage this hunk
a - stage this and all the remaining hunks
@@ -555,6 +583,7 @@ k - leave this hunk undecided, see previous
undecided hunk
K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks
EOF
+ print_ansi_color "blue", $_, "\n" foreach (split /[\r\n]/, $help);
}
sub patch_update_cmd {
@@ -619,7 +648,7 @@ sub patch_update_cmd {
for (@{$hunk[$ix]{TEXT}}) {
print;
}
- print "Stage this hunk [y/n/a/d$other/?]? ";
+ print_ansi_color "bold", "Stage this hunk [y/n/a/d$other/?]? ";
my $line = <STDIN>;
if ($line) {
if ($line =~ /^y/i) {
^ permalink raw reply related
* Re: [PATCH] Port builtin-add.c to use the new option parser.
From: Johannes Schindelin @ 2007-10-13 14:47 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: git, Junio C Hamano, Kristian Høgsberg
In-Reply-To: <1192282153-26684-3-git-send-email-madcoder@debian.org>
Hi,
On Sat, 13 Oct 2007, Pierre Habouzit wrote:
> +static struct option builtin_add_options[] = {
> + OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
> + OPT_BOOLEAN('n', NULL, &show_only, "dry-run"),
> + OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"),
> + OPT_BOOLEAN('v', NULL, &verbose, "be verbose"),
> + OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update only files that git already knows about"),
> + OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh stat() informations in the index"),
> +};
I see you terminate the list by a ",". How does this play with the option
parser?
Thinking about this more, I am reverting my stance on the ARRAY_SIZE()
issue. I think if you introduce a "OPTION_NONE = 0" in the enum, then
this single last comma should be enough.
In the same vein, you would not need the NULL in builtin_add_usage[],
right?
Ciao,
Dscho
^ permalink raw reply
* Re: [RFC] CLI option parsing and usage generation for porcelains
From: Wincent Colaiuta @ 2007-10-13 14:53 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: git
In-Reply-To: <1192282153-26684-1-git-send-email-madcoder@debian.org>
El 13/10/2007, a las 15:29, Pierre Habouzit escribió:
> The following series is open for comments, it's not 100% ready for
> inclusion IMHO, as some details may need to be sorted out first, and
> that I've not re-read the patches thoroughly yet. Though I uses the
> tip
> of that branch as my everyday git for 2 weeks or so without any
> noticeable issues.
Great to see two things:
- the simplification in the commands switched over to use the options
parser
- the improved readability and usefulness of the options help
Great work, Pierre! I'll take a closer look at this and trial it in
my local Git install for a while to see if any issues come up.
Wincent
^ permalink raw reply
* Re: [PATCH] Add a simple option parser.
From: Pierre Habouzit @ 2007-10-13 14:58 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, Junio C Hamano
In-Reply-To: <Pine.LNX.4.64.0710131519510.25221@racer.site>
[-- Attachment #1: Type: text/plain, Size: 4865 bytes --]
On Sat, Oct 13, 2007 at 02:39:10PM +0000, Johannes Schindelin wrote:
> Hi,
>
> On Sat, 13 Oct 2007, Pierre Habouzit wrote:
>
> > Aggregation of single switches is allowed:
> > -rC0 is the same as -r -C 0 (supposing that -C wants an arg).
>
> I'd be more interested in "-rC 0" working... Is that supported, too?
yes it is.
> > +static inline const char *get_arg(struct optparse_t *p)
> > +{
> > + if (p->opt) {
> > + const char *res = p->opt;
> > + p->opt = NULL;
> > + return res;
> > + }
> > + p->argc--;
> > + return *++p->argv;
> > +}
>
> This is only used once; I wonder if it is really that more readable having
> this as a function in its own right.
it's used twice, and it makes the code more readable I believe.
> > +static inline const char *skippfx(const char *str, const char *prefix)
>
> Personally, I do not like abbreviations like that. They do not save that
> much screen estate (skip_prefix is only 4 characters longer, but much more
> readable). Same goes for "cnt" later.
Ack I'll fix that.
> > +static int parse_long_opt(struct optparse_t *p, const char *arg,
> > + struct option *options, int count)
> > +{
> > + int i;
> > +
> > + for (i = 0; i < count; i++) {
> > + const char *rest;
> > + int flags = 0;
> > +
> > + if (!options[i].long_name)
> > + continue;
> > +
> > + rest = skippfx(arg, options[i].long_name);
> > + if (!rest && !strncmp(arg, "no-", 3)) {
> > + rest = skippfx(arg + 3, options[i].long_name);
> > + flags |= OPT_SHORT;
> > + }
>
> Would this not be more intuitive as
>
> if (!prefixcmp(arg, "no-")) {
> arg += 3;
> flags |= OPT_UNSET;
> }
> rest = skip_prefix(arg, options[i].long_name);
Yes, that can be done indeed, but the point is, we have sometimes
option whose long-name is "no-foo" (because it's what makes sense) but I
can rework that.
> Hm? (Note that I say UNSET, not SHORT... ;-)
fsck, good catch.
> > + if (!rest)
> > + continue;
> > + if (*rest) {
> > + if (*rest != '=')
> > + continue;
>
> Is this really no error? For example, "git log
> --decorate-walls-and-roofs" would not fail...
it would be an error, it will yield a "option not found".
> > +int parse_options(int argc, const char **argv,
> > + struct option *options, int count,
> > + const char * const usagestr[], int flags)
>
> Please indent by the same amount.
oops, stupid space vs. tab thing.
> > + if (arg[1] != '-') {
> > + optp.opt = arg + 1;
> > + do {
> > + if (*optp.opt == 'h')
> > + make_usage(usagestr, options, count);
>
> How about calling this "usage_with_options()"? With that name I expected
> make_usage() to return a strbuf.
will do.
> > + if (!arg[2]) { /* "--" */
> > + if (!(flags & OPT_COPY_DASHDASH))
> > + optp.argc--, optp.argv++;
>
> I would prefer this as
>
> if (!(flags & OPT_COPY_DASHDASH)) {
> optp.argc--;
> optp.argv++;
> }
>
> While I'm at it: could you use "args" instead of "optp"? It is misleading
> both in that it not only contains options (but other arguments, too) as in
> that it is not a pointer (the trailing "p" is used as an indicator of that
> very often, including git's source code).
okay.
> In the same vein, OPT_COPY_DASHDASH should be named
> PARSE_OPT_KEEP_DASHDASH.
okay.
>
> > + if (opts->short_name) {
> > + strbuf_addf(&sb, "-%c", opts->short_name);
> > + }
> > + if (opts->long_name) {
> > + strbuf_addf(&sb, opts->short_name ? ", --%s" : "--%s",
> > + opts->long_name);
> > + }
>
> Please lose the curly brackets.
>
> > + if (sb.len - pos <= USAGE_OPTS_WIDTH) {
> > + int pad = USAGE_OPTS_WIDTH - (sb.len - pos) + USAGE_GAP;
> > + strbuf_addf(&sb, "%*s%s\n", pad, "", opts->help);
> > + } else {
> > + strbuf_addf(&sb, "\n%*s%s\n", USAGE_OPTS_WIDTH + USAGE_GAP, "",
> > + opts->help);
> > + }
>
> Same here. (And I'd also make sure that the lines are not that long.)
okay.
>
> > diff --git a/parse-options.h b/parse-options.h
> > new file mode 100644
> > index 0000000..4b33d17
> > --- /dev/null
> > +++ b/parse-options.h
> > @@ -0,0 +1,37 @@
> > +#ifndef PARSE_OPTIONS_H
> > +#define PARSE_OPTIONS_H
> > +
> > +enum option_type {
> > + OPTION_BOOLEAN,
>
> I know that I proposed "BOOLEAN", but actually, you use it more like an
> "INCREMENTAL", right?
yes, I don't like _BOOLEAN either, I would have prefered _FLAG or sth
like that. INCREMENTAL is just too long.
> Other than that: I like it very much.
:P
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [PATCH] Port builtin-add.c to use the new option parser.
From: Pierre Habouzit @ 2007-10-13 15:03 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, Junio C Hamano, Kristian Høgsberg
In-Reply-To: <Pine.LNX.4.64.0710131544030.25221@racer.site>
[-- Attachment #1: Type: text/plain, Size: 1873 bytes --]
On Sat, Oct 13, 2007 at 02:47:20PM +0000, Johannes Schindelin wrote:
> Hi,
>
> On Sat, 13 Oct 2007, Pierre Habouzit wrote:
>
> > +static struct option builtin_add_options[] = {
> > + OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"),
> > + OPT_BOOLEAN('n', NULL, &show_only, "dry-run"),
> > + OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"),
> > + OPT_BOOLEAN('v', NULL, &verbose, "be verbose"),
> > + OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update only files that git already knows about"),
> > + OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh stat() informations in the index"),
> > +};
>
> I see you terminate the list by a ",". How does this play with the option
> parser?
>
> Thinking about this more, I am reverting my stance on the ARRAY_SIZE()
> issue. I think if you introduce a "OPTION_NONE = 0" in the enum, then
> this single last comma should be enough.
adding a trailing comma does not add a NULL after that, it's ignored,
you're confused.
┌─(17:00)────
└[artemis] cat a.c
#include <stdio.h>
int main(void) {
const char * const arr[] = { "1", "2", };
printf("%d\n", sizeof(arr) / sizeof(arr[0]));
return 0;
};
┌─(17:00)────
└[artemis] ./a
2
Very few compilers do not grok trailing commas, I always put them
because it avoids spurious diffs for nothing, and that you can reorder
lines easily too.
Note that I don't really like using ARRAY_SIZE either, I kept it that
way, but my taste would rather be to have an "empty" option, and
explicitely mark the end of the array.
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [PATCH] Color support added to git-add--interactive.
From: Jean-Luc Herren @ 2007-10-13 16:38 UTC (permalink / raw)
To: Wincent Colaiuta, git
In-Reply-To: <19271E58-5C4F-41AF-8F9D-F114F36A34AC@wincent.com>
Hi!
I really like the idea of colorizing git add -i, especially the
prompt. Here are my two cents.
Wincent Colaiuta wrote:
> +sub print_ansi_color($$;$) {
> + my $color = shift;
> + my $string = shift;
> + my $trailer = shift;
None of the other subs in this file have a prototype, so for
consistency I'd suggest to not add it on this function either.
However maybe a patch that adds it to all subs would be welcome.
(I wouldn't see the necessity though.)
And the common way of getting the arguments is reading @_ (see all
other subs in the file). So maybe instead write:
[...]
sub print_ansi_color {
my ($color, $string, $trailer) = @_;
[...]
> + if ($use_color) {
> + printf '%s%s%s', Term::ANSIColor::color($color), $string,
> + Term::ANSIColor::color('clear');
> + } else {
Why use printf when you could directly use print here? It's only
used for concatenating.
> + if ($trailer) {
> + print $trailer;
> + }
This will fail to print $trailer when $trailer happens to be a
string that evaluates to false in bool context, like '0'. Write
this as:
if (defined $trailer) {
print $trailer;
}
IMHO, parsing the output of 'git diff-files --color' is a very bad
idea and it makes all regexes uglier and more difficult to read.
You're much better off recolorizing it yourself, which makes it a
more localized change. Especially, I don't think that you have
any guarantee that escape sequences won't ever contain the
characters '+', '-' or ' ' (space), which would break your code on
lines like this:
> + if ($line =~ /^[^-+ ]*\+/) {
Finally -- and this might be just my eyes -- blue is a very nice
color, but it looks a bit too dark on black background. Maybe
choose a default color that looks reasonable on black *and* white
background.
Cheers,
jlh
^ permalink raw reply
* Re: [PATCH] Color support added to git-add--interactive.
From: Johannes Schindelin @ 2007-10-13 16:38 UTC (permalink / raw)
To: Wincent Colaiuta
Cc: Dan Zwell, Git Mailing List, Jeff King, Jonathan del Strother,
Frank Lichtenheld
In-Reply-To: <19271E58-5C4F-41AF-8F9D-F114F36A34AC@wincent.com>
Hi,
On Sat, 13 Oct 2007, Wincent Colaiuta wrote:
> Didn't even think about implementing user-settable colors.
FWIW, this is what Documentation/config.txt has to say about it:
color.diff.<slot>::
Use customized color for diff colorization. `<slot>` specifies
which part of the patch to use the specified color, and is one
of `plain` (context text), `meta` (metainformation), `frag`
(hunk header), `old` (removed lines), `new` (added lines),
`commit` (commit headers), or `whitespace` (highlighting dubious
whitespace). The values of these variables may be specified as
in color.branch.<slot>.
Hth,
Dscho
^ permalink raw reply
* Re: push fails with unexpected 'matches more than one'
From: Steffen Prohaska @ 2007-10-13 16:51 UTC (permalink / raw)
To: Git Mailing List; +Cc: Shawn O. Pearce
In-Reply-To: <20071013032100.GK27899@spearce.org>
On Oct 13, 2007, at 5:21 AM, Shawn O. Pearce wrote:
> Steffen Prohaska <prohaska@zib.de> wrote:
>> I read carefully through the documentation of git-send-pack and
>> git-rev-parse. The current implementation of git-send-pack is in line
>> with the documented behaviour, as is the implementation of git-rev-
>> parse.
>>
>> So formally everything is correct.
>>
>> But it is completely against my expectation that git-push <remote>
>> <head>
>> can successfully resolve a <head> that git-rev-parse fails to
>> parse. I
>> understand that refs are not revs ;). But nonetheless, I'd expect
>> that a
>> local ref that cannot be parsed by git-rev-parse should also fail
>> to be
>> pushed by git-send-pack. I didn't expect that git-send-pack would
>> locate
>> <head> as someprefix/<head>.
>>
>> Why is my expectation wrong?
>> Or is the current specification of git-send-pack's ref parsing wrong?
>
> I think its a bug. But I didn't write the original code.
>
> Meaning I think what happened here was someone wanted to enable
> git-send-pack to match "master" here with "refs/heads/master" on
> the remote side. One easy way to do that was to see if any ref
> ended with "/master", as that was what the ref here was called.
>
> Way back when that code was written most Git repositories probably
> only ever had that one branch anyway, or maybe two (refs/heads/master
> and refs/heads/origin) so matching the trailing suffix never came
> up as a bug. Nobody ever had two refs that could possibly match.
>
> Then the documentation got expanded to actually document the behavior
> that git-send-pack implemented. Unfortunately that codified the
> bug as documented behavior.
>
>
> So I agree with you Steffen, this is a bug in send-pack, and I run
> up against it every once in a while. I've specifically told my
> coworkers "NEVER, EVER, EVER, create a branch called 'master' that
> isn't exactly refs/heads/master OR ELSE I WILL COME BEAT YOU WITH A
> CLUE STICK". They still create "refs/heads/experiments/master".
> *sigh*.
>
> I think we should fix it. Anyone that is relying on "git push
> $url master" to resolve to "refs/heads/experimental/master" on the
> remote side is already playing with fire. But Junio is (rightfully
> so) very conservative and doesn't like to break a user's scripts.
> We may not be able to fix this until Git 1.6.
I'm working on this and will send patches tomorrow.
Steffen
^ permalink raw reply
* Re: [PATCH] Color support added to git-add--interactive.
From: Wincent Colaiuta @ 2007-10-13 17:14 UTC (permalink / raw)
To: Jean-Luc Herren; +Cc: git
In-Reply-To: <4710F47D.2070306@gmx.ch>
El 13/10/2007, a las 18:38, Jean-Luc Herren escribió:
> Here are my two cents.
>
> Wincent Colaiuta wrote:
>> +sub print_ansi_color($$;$) {
>> + my $color = shift;
>> + my $string = shift;
>> + my $trailer = shift;
>
> None of the other subs in this file have a prototype, so for
> consistency I'd suggest to not add it on this function either.
> However maybe a patch that adds it to all subs would be welcome.
> (I wouldn't see the necessity though.)
Yes, I saw that the other functions didn't use prototypes and I agree
that consistency would be a good thing. I liked the idea of it in
this case because it makes explicit the fact that the function takes
two params plus a third, optional one. So definitely not necessary,
but a preference of mine. In any case, a change to all the other
functions is a question for a separate patch.
> And the common way of getting the arguments is reading @_ (see all
> other subs in the file). So maybe instead write:
>
> [...]
> sub print_ansi_color {
> my ($color, $string, $trailer) = @_;
> [...]
Yes, I actually did write it that way first but then my doubts about
Perl made me write it the longer way; but if they are equivalent then
I prefer the shorter way.
>> + if ($use_color) {
>> + printf '%s%s%s', Term::ANSIColor::color($color), $string,
>> + Term::ANSIColor::color('clear');
>> + } else {
>
> Why use printf when you could directly use print here? It's only
> used for concatenating.
True. I had may brain in the C-world.
>> + if ($trailer) {
>> + print $trailer;
>> + }
>
> This will fail to print $trailer when $trailer happens to be a
> string that evaluates to false in bool context, like '0'. Write
> this as:
>
> if (defined $trailer) {
> print $trailer;
> }
Again, I actually wrote it that way the first time, and then changed
it, this time because I thought they were the same. Like I said, not
a perl hacker.
> IMHO, parsing the output of 'git diff-files --color' is a very bad
> idea and it makes all regexes uglier and more difficult to read.
> You're much better off recolorizing it yourself, which makes it a
> more localized change.
You're probably right, although it is also duplicating the work
that's already done elsewhere. In general I favor making the simplest
change that would work, and tweaking a few of the regexes did look
simpler than re-implementing the colorization logic.
But the approach you suggest might be more robust, perhaps, seeing as
there's not much to the diff output. As far as I can tell there are
really only five or six different things to look for, and they'd be
fairly easy to catch:
- lines beginning with "@@ " (hunk headers)
- lines beginning with "+" (insertions)
- lines beginning with "-" (deletions)
- lines beginning with " " (context lines, no color)
- lines beginning with "\" (things like "\ No newline at end of
file", again, no color)
- everything else; ie. the diff header stuff (eg "diff --git a/foo b/
foo")
The only special cases seem to be the "+++" and "---" lines in the
header, which look like insertions and deletions when they're not.
Trickier would be the highlighting of dubious whitespace, and that's
when it starts to sound like re-inventing the wheel and duplicating
the logic for the detection that's defined elsewhere (possibly in
diff-lib.c? haven't found the exact spot yet).
> Especially, I don't think that you have
> any guarantee that escape sequences won't ever contain the
> characters '+', '-' or ' ' (space)
Yes, that was one of the things I didn't like about the sloppy
regexes. I couldn't really make them any stricter though because I
wasn't confident about the range of possible characters that might be
included in the escape sequences.
> Finally -- and this might be just my eyes -- blue is a very nice
> color, but it looks a bit too dark on black background. Maybe
> choose a default color that looks reasonable on black *and* white
> background.
Yeah, well I didn't choose the colours and I didn't really want to
get into it. Before being considered for inclusion a patch like this
would need to tap in to the existing config settings for color.diff
and color.diff.<slot> anyway...
Wincent
^ permalink raw reply
* Re: [PATCH] Color support added to git-add--interactive.
From: Jeff King @ 2007-10-13 17:27 UTC (permalink / raw)
To: Wincent Colaiuta
Cc: Dan Zwell, Git Mailing List, Jonathan del Strother,
Johannes Schindelin, Frank Lichtenheld
In-Reply-To: <19271E58-5C4F-41AF-8F9D-F114F36A34AC@wincent.com>
On Sat, Oct 13, 2007 at 04:45:41PM +0200, Wincent Colaiuta wrote:
> - as Johannes pointed out, "clear" and "reset" are not used consistently
> even though the Term::ANSIColor documentation says that they're the same, so
> settled on "clear"; although in any case, the changes to the
> print_ansi_color function mean that it is now the only site where clearing
> takes place
Please use "reset", as that is the term used by the C color code.
> - changed the regex as suggested by Johannes, and a couple of others that
> are used when splitting hunks
I believe there are other places where the diff output is parsed, and
the colors will mess that up, too (e.g., split_hunk). All of those
regexes need to be changed, too. I am a bit concerned that we are
putting intimate knowledge of the colorization scheme here. As much as
it pains me to have two diff colorizers, I wonder if that would be a
better solution than having a diff colorizer, and a colorized diff
parser.
-Peff
^ permalink raw reply
* [PATCH] gitk: Added support for OS X mouse wheel
From: Jonathan del Strother @ 2007-10-13 17:33 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Väinö Järvelä
(Väinö Järvelä supplied this patch a while ago for 1.5.2. It no longer
applied cleanly, so I'm reposting it.)
MacBook doesn't seem to recognize MouseRelease-4 and -5 events, at all.
So i added a support for the MouseWheel event, which i limited to Tcl/tk
aqua, as i couldn't test it neither on Linux or Windows. Tcl/tk needs to
be updated from the version that is shipped with OS X 10.4 Tiger, for
this patch to work.
Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv>
---
gitk | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/gitk b/gitk
index 300fdce..9b3e627 100755
--- a/gitk
+++ b/gitk
@@ -838,11 +838,17 @@ proc makewindow {} {
bindall <1> {selcanvline %W %x %y}
#bindall <B1-Motion> {selcanvline %W %x %y}
if {[tk windowingsystem] == "win32"} {
- bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D }
- bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %
D ; break }
+ bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y
%D }
+ bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %
X %Y %D ; break }
} else {
- bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
- bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
+ bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
+ bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
+ if {[tk windowingsystem] eq "aqua"} {
+ bindall <MouseWheel> {
+ set delta [expr {- (%D)}]
+ allcanvs yview scroll $delta units
+ }
+ }
}
bindall <2> "canvscan mark %W %x %y"
bindall <B2-Motion> "canvscan dragto %W %x %y"
--
1.5.3.1
^ permalink raw reply related
* Re: [PATCH] Color support added to git-add--interactive.
From: Jeff King @ 2007-10-13 17:51 UTC (permalink / raw)
To: Wincent Colaiuta
Cc: Dan Zwell, Git Mailing List, Jonathan del Strother,
Johannes Schindelin, Frank Lichtenheld
In-Reply-To: <20071013172745.GA2624@coredump.intra.peff.net>
On Sat, Oct 13, 2007 at 01:27:45PM -0400, Jeff King wrote:
> I believe there are other places where the diff output is parsed, and
> the colors will mess that up, too (e.g., split_hunk). All of those
Oops, I see you actually dealt with those already (I just responded to
your cover letter first). Though I am still concerned about the
robustness of the re-parsing scheme.
-Peff
^ permalink raw reply
* Re: Git User's Survey 2007 unfinished summary continued
From: Andreas Ericsson @ 2007-10-13 18:00 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Jakub Narebski, git
In-Reply-To: <Pine.LNX.4.64.0710130130380.25221@racer.site>
Johannes Schindelin wrote:
>
> At the GSoC mentor summit, I encountered a rather different stance: people
> did not _know_ what distributed SCM means, and were rather afraid of the
> concept. Some of them seemed to fight changing their known procedures
> tooth and nail. Which is fine by me (I don't have to force anybody to
> use git, thankyouverymuch).
>
I recently attended a fairly large opensource conference in germany, where
companies that somehow do business around the opensource network
monitoring tool named Nagios gather and drink themselves and each other
into insensibility once a year. I ran into much the same issues there, even though
it would have made all our lives a whole lot easier if we could pull patches from
each others repositories.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
^ permalink raw reply
* Re: [PATCH] Fixing path quoting issues
From: Jonathan del Strother @ 2007-10-13 18:12 UTC (permalink / raw)
To: Johannes Sixt; +Cc: git, Junio C Hamano
In-Reply-To: <470DC05A.8020209@viscovery.net>
On 11 Oct 2007, at 07:19, Johannes Sixt wrote:
>> - git-commit -F msg -m amending ."
>> + git-commit -F msg -m amending ."
>
> You fix whitespace...
>
>> test_expect_success \
>> - "using message from other commit" \
>> - "git-commit -C HEAD^ ."
>> + "using message from other commit" \
>> + "git-commit -C HEAD^ ."
>
> ... and you break it. More of these follow. Don't do that, it makes
> patch review unnecessarily hard.
I'm just preparing to release this patch... was that "don't break
whitespace", or "don't try to fix whitespace in a patch that's has
nothing to do with whitespacing-fixing" ?
And while I'm here - tabs are preferred, are they? There seem to be
a mixture of tabs & 4 space indentation.
^ permalink raw reply
* Re: [PATCH] Color support added to git-add--interactive.
From: Andreas Ericsson @ 2007-10-13 18:31 UTC (permalink / raw)
To: Jean-Luc Herren; +Cc: Wincent Colaiuta, git
In-Reply-To: <4710F47D.2070306@gmx.ch>
Jean-Luc Herren wrote:
> Hi!
>
> I really like the idea of colorizing git add -i, especially the
> prompt. Here are my two cents.
>
> Wincent Colaiuta wrote:
>> +sub print_ansi_color($$;$) {
>> + my $color = shift;
>> + my $string = shift;
>> + my $trailer = shift;
>
> None of the other subs in this file have a prototype, so for
> consistency I'd suggest to not add it on this function either.
> However maybe a patch that adds it to all subs would be welcome.
> (I wouldn't see the necessity though.)
>
> And the common way of getting the arguments is reading @_ (see all
> other subs in the file). So maybe instead write:
>
> [...]
> sub print_ansi_color {
> my ($color, $string, $trailer) = @_;
> [...]
>
>> + if ($use_color) {
>> + printf '%s%s%s', Term::ANSIColor::color($color), $string,
>> + Term::ANSIColor::color('clear');
>> + } else {
>
> Why use printf when you could directly use print here? It's only
> used for concatenating.
>
>> + if ($trailer) {
>> + print $trailer;
>> + }
>
> This will fail to print $trailer when $trailer happens to be a
> string that evaluates to false in bool context, like '0'. Write
> this as:
>
> if (defined $trailer) {
> print $trailer;
> }
>
> IMHO, parsing the output of 'git diff-files --color' is a very bad
> idea and it makes all regexes uglier and more difficult to read.
> You're much better off recolorizing it yourself, which makes it a
> more localized change. Especially, I don't think that you have
> any guarantee that escape sequences won't ever contain the
> characters '+', '-' or ' ' (space), which would break your code on
> lines like this:
>
>> + if ($line =~ /^[^-+ ]*\+/) {
>
> Finally -- and this might be just my eyes -- blue is a very nice
> color, but it looks a bit too dark on black background. Maybe
> choose a default color that looks reasonable on black *and* white
> background.
>
Red for removed and green for added seems to be the standard, although
I know it makes life terribly difficult for red-green colorblind people,
who usually prefer yellow/lightblue for black bg, or beige/blue for
white background.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
^ permalink raw reply
* Re: [PATCH] Add a simple option parser.
From: Alex Riesen @ 2007-10-13 19:16 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: git, Junio C Hamano
In-Reply-To: <1192282153-26684-2-git-send-email-madcoder@debian.org>
Pierre Habouzit, Sat, Oct 13, 2007 15:29:03 +0200:
> +static int opterror(struct option *opt, const char *reason, int flags)
"const struct option *opt"? You never modify the struct option itself,
only the values under the pointers it contains. Using const here will
allow the compiler to reuse string constants (not that there will be
much of the opportunity, but anyway) in the option arrays.
> +static int get_value(struct optparse_t *p, struct option *opt, int flags)
"const struct option *opt"?
> +static int parse_short_opt(struct optparse_t *p, struct option *options, int count)
"const struct option *options"?
> +int parse_options(int argc, const char **argv,
> + struct option *options, int count,
> + const char * const usagestr[], int flags)
"const struct option *options"?
> +void make_usage(const char * const usagestr[], struct option *opts, int cnt)
"const struct option *opts"?
Why not "const char *const *usagestr"? Especially if you change
"usagestr" (the pointer itself) later. "[]" is sometimes a hint that
the pointer itself should not be changed, being an array.
And you want make opts const.
BTW, it does not "make" usage. It calls the usage() or prints a usage
description. "make" implies it creates the "usage", which according to
the prototype is later nowhere to be found.
> +{
> + struct strbuf sb;
> +
> + strbuf_init(&sb, 4096);
> + do {
> + strbuf_addstr(&sb, *usagestr++);
> + strbuf_addch(&sb, '\n');
> + } while (*usagestr);
This will crash for empty usagestr, like "{ NULL }". Was it
deliberately? (I'd make it deliberately, if I were you. I'd even used
cnt of opts, to force people to document all options).
> + strbuf_addf(&sb, "\n%*s%s\n", USAGE_OPTS_WIDTH + USAGE_GAP, "",
> + opts->help);
...
> + usage(sb.buf);
BTW, if you just printed the usage message out (it is about usage of a
program, isn't it?) and called exit() everyone would be just as happy.
And you wouldn't have to include strbuf (it is the only use of it),
less code, too. It'd make simplier to stea^Wcopy your implementation,
which I like :)
^ permalink raw reply
* Re: [PATCH] Port builtin-add.c to use the new option parser.
From: Alex Riesen @ 2007-10-13 19:22 UTC (permalink / raw)
To: Pierre Habouzit, Johannes Schindelin, git, Junio C Hamano
In-Reply-To: <20071013150306.GH7110@artemis.corp>
Pierre Habouzit, Sat, Oct 13, 2007 17:03:06 +0200:
> On Sat, Oct 13, 2007 at 02:47:20PM +0000, Johannes Schindelin wrote:
> > Thinking about this more, I am reverting my stance on the ARRAY_SIZE()
> > issue. I think if you introduce a "OPTION_NONE = 0" in the enum, then
> > this single last comma should be enough.
>
> adding a trailing comma does not add a NULL after that, it's ignored,
> you're confused.
Yep
> Note that I don't really like using ARRAY_SIZE either, I kept it that
> way, but my taste would rather be to have an "empty" option, and
> explicitely mark the end of the array.
You can have both. Just stop at NULL-entry or when the 'size' elements
passed, whatever happens first.
^ permalink raw reply
* Re: Git User's Survey 2007 unfinished summary continued
From: David Kastrup @ 2007-10-13 19:59 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Jakub Narebski, git
In-Reply-To: <Pine.LNX.4.64.0710130130380.25221@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Jakub, thank you very much for doing this. It is a very tedious
> work, and I deem it invaluable.
And yet you trash the results.
>> Git is just too complicated for a typical project. I understand
>> it's probably great for the Linux kernel but for a smaller
>> project like mine (Mesa) it's overkill and a frustration. (...)
>> With git everything seems hard. (...) I've _wasted_ hours
>> trying to figure out git. That alone is a huge issue. I guess I
>> could go into specific details about my problems with git but
>> I've already spent enough time on this survey.
>
> I find it always a little strange how people want to use something
> like git, but are unwilling to ask. Is this such a big attack on
> the manliness to admist one needs help or what?
Not everybody likes getting the kind of treatment you find fit to dish
out.
>> Figure out why people find git hard to learn and eliminate those
>> barriers to entry. Make git more task-oriented rather than
>> data-model-oriented the way it is now.
>
> Frankly, expectations like these make me want to bang somebody's
> head on the wall.
And you wonder that people are unwilling to ask for things on the
list? When even mentioning something in a _survey_ makes core
developers want to bang their heads against a wall?
I find it a pity that my suggestion to ask about how comfortable
people are with the tone on the list did not make it into the survey.
Enough core developers make the tone sufficiently unconstructive to
make it quite understandable that people are unwilling to ask
questions here, in order to avoid getting their heads banged against a
wall, virtual or not.
--
David Kastrup, Kriemhildstr. 15, 44793 Bochum
^ permalink raw reply
* Re: [PATCH] Color support added to git-add--interactive.
From: Dan Zwell @ 2007-10-13 20:03 UTC (permalink / raw)
To: Jeff King
Cc: Wincent Colaiuta, Git Mailing List, Jonathan del Strother,
Johannes Schindelin, Frank Lichtenheld
In-Reply-To: <20071013175127.GA3183@coredump.intra.peff.net>
Jeff King wrote:
> On Sat, Oct 13, 2007 at 01:27:45PM -0400, Jeff King wrote:
>
> <snip> Though I am still concerned about the
> robustness of the re-parsing scheme.
>
> -Peff
>
The importance of the diff coloring pales in comparison to the prompt
coloring. Diff coloring is useful, but prompt coloring is a basic
usability concern (if people can't easily tell where a hunk begins, the
tool becomes annoying). Perhaps we could split this into two patches,
merging the first after a few small changes can be taken care of, while
the second may need more discussion and testing. The coloring of the
prompts is relatively low risk. It just needs to be modified to take
color settings from .git/config. I was thinking that this might be the
example that I would take settings from:
[color]
add-interactive = auto
[color "add-interactive"]
prompt = bold blue
header = bold
help = blue
For the sake of a unified interface, the "Stage this hunk?" prompt
should be colored the same as the other prompts. I will give a bit of
thought to the default colors, though it's important to avoid red and
green (as those will look like diff output when the second patch is
applied).
Also needed is some command line parsing so that "--color" can be
specified on the command line (very small change), and all of this
should be added to the documentation.
Obviously, the suggestions/fixes from other parts of this thread must be
taken into account, as well. I can probably do all this tomorrow (and
send low-risk/high-risk patches), unless someone takes it before me.
Dan
^ permalink raw reply
* [PATCH 0/14] fork/exec removal series
From: Johannes Sixt @ 2007-10-13 20:06 UTC (permalink / raw)
To: gitster; +Cc: git, Johannes Sixt
Junio,
here is a series of patches that removes a number fork/exec pairs.
The series consists of 2 parts:
- The first half replaces a number of fork/exec pairs by start_command/
finish_command or run_command.
- The second half introduces a new framework that runs a function
asynchronously. New functions start_async and finish_async are implemented
similarly to start_command and run_command. They are used to replace
occurrences of fork() that does not exec() in the child. Such code
could in principle be run in a thread, and on MinGW port we will go this
route, but on Posix we stay with fork().
The series can be applied on top of 2b5a06e (Restore default verbosity for
http fetches), as you reqested, but that commit does not compile, so I
developed it on 90446a00 (bundle transport: fix an alloc_ref() call),
which is a few commits earlier.
There will be some strbuf related merge conflicts once you merge this into
master.
builtin-archive.c | 8 +-
builtin-fetch-pack.c | 101 +++++++++----------------
cache.h | 4 +-
connect.c | 131 ++++++++++++++++-----------------
convert.c | 87 ++++++++--------------
diff.c | 38 +---------
peek-remote.c | 8 +-
run-command.c | 79 +++++++++++++++++---
run-command.h | 24 ++++++
send-pack.c | 8 +-
t/t0021-conversion.sh | 7 ++-
transport.c | 9 +--
upload-pack.c | 199 ++++++++++++++++++++++---------------------------
13 files changed, 334 insertions(+), 369 deletions(-)
-- Hannes
^ permalink raw reply
* [PATCH 02/14] Use start_command() in git_connect() instead of explicit fork/exec.
From: Johannes Sixt @ 2007-10-13 20:06 UTC (permalink / raw)
To: gitster; +Cc: git, Johannes Sixt
In-Reply-To: <1192305984-22594-2-git-send-email-johannes.sixt@telecom.at>
The child process handling is delegated to start_command() and
finish_command().
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
---
connect.c | 108 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 50 insertions(+), 58 deletions(-)
diff --git a/connect.c b/connect.c
index b156f92..21597bf 100644
--- a/connect.c
+++ b/connect.c
@@ -484,11 +484,15 @@ struct child_process *git_connect(int fd[2], char *url,
char *host, *path = url;
char *end;
int c;
- int pipefd[2][2];
struct child_process *conn;
enum protocol protocol = PROTO_LOCAL;
int free_path = 0;
char *port = NULL;
+ const char **arg;
+ char command[MAX_CMD_LEN];
+ char *posn = command;
+ int size = MAX_CMD_LEN;
+ int of = 0;
/* Without this we cannot rely on waitpid() to tell
* what happened to our children.
@@ -574,62 +578,51 @@ struct child_process *git_connect(int fd[2], char *url,
return NULL;
}
- if (pipe(pipefd[0]) < 0 || pipe(pipefd[1]) < 0)
- die("unable to create pipe pair for communication");
conn = xcalloc(1, sizeof(*conn));
- conn->pid = fork();
- if (conn->pid < 0)
- die("unable to fork");
- if (!conn->pid) {
- char command[MAX_CMD_LEN];
- char *posn = command;
- int size = MAX_CMD_LEN;
- int of = 0;
-
- of |= add_to_string(&posn, &size, prog, 0);
- of |= add_to_string(&posn, &size, " ", 0);
- of |= add_to_string(&posn, &size, path, 1);
-
- if (of)
- die("command line too long");
-
- dup2(pipefd[1][0], 0);
- dup2(pipefd[0][1], 1);
- close(pipefd[0][0]);
- close(pipefd[0][1]);
- close(pipefd[1][0]);
- close(pipefd[1][1]);
- if (protocol == PROTO_SSH) {
- const char *ssh, *ssh_basename;
- ssh = getenv("GIT_SSH");
- if (!ssh) ssh = "ssh";
- ssh_basename = strrchr(ssh, '/');
- if (!ssh_basename)
- ssh_basename = ssh;
- else
- ssh_basename++;
- if (!port)
- execlp(ssh, ssh_basename, host, command, NULL);
- else
- execlp(ssh, ssh_basename, "-p", port, host,
- command, NULL);
- }
- else {
- unsetenv(ALTERNATE_DB_ENVIRONMENT);
- unsetenv(DB_ENVIRONMENT);
- unsetenv(GIT_DIR_ENVIRONMENT);
- unsetenv(GIT_WORK_TREE_ENVIRONMENT);
- unsetenv(GRAFT_ENVIRONMENT);
- unsetenv(INDEX_ENVIRONMENT);
- execlp("sh", "sh", "-c", command, NULL);
+ of |= add_to_string(&posn, &size, prog, 0);
+ of |= add_to_string(&posn, &size, " ", 0);
+ of |= add_to_string(&posn, &size, path, 1);
+
+ if (of)
+ die("command line too long");
+
+ conn->in = conn->out = -1;
+ conn->argv = arg = xcalloc(6, sizeof(*arg));
+ if (protocol == PROTO_SSH) {
+ const char *ssh = getenv("GIT_SSH");
+ if (!ssh) ssh = "ssh";
+
+ *arg++ = ssh;
+ if (port) {
+ *arg++ = "-p";
+ *arg++ = port;
}
- die("exec failed");
+ *arg++ = host;
+ }
+ else {
+ /* remove these from the environment */
+ const char *env[] = {
+ ALTERNATE_DB_ENVIRONMENT,
+ DB_ENVIRONMENT,
+ GIT_DIR_ENVIRONMENT,
+ GIT_WORK_TREE_ENVIRONMENT,
+ GRAFT_ENVIRONMENT,
+ INDEX_ENVIRONMENT,
+ NULL
+ };
+ conn->env = env;
+ *arg++ = "sh";
+ *arg++ = "-c";
}
- fd[0] = pipefd[0][0];
- fd[1] = pipefd[1][1];
- close(pipefd[0][1]);
- close(pipefd[1][0]);
+ *arg++ = command;
+ *arg = NULL;
+
+ if (start_command(conn))
+ die("unable to fork");
+
+ fd[0] = conn->out; /* read from child's stdout */
+ fd[1] = conn->in; /* write to child's stdin */
if (free_path)
free(path);
return conn;
@@ -637,13 +630,12 @@ struct child_process *git_connect(int fd[2], char *url,
int finish_connect(struct child_process *conn)
{
+ int code;
if (conn == NULL)
return 0;
- while (waitpid(conn->pid, NULL, 0) < 0) {
- if (errno != EINTR)
- return -1;
- }
+ code = finish_command(conn);
+ free(conn->argv);
free(conn);
- return 0;
+ return code;
}
--
1.5.3.3.1134.gee562
^ permalink raw reply related
* [PATCH 03/14] Use start_command() to run content filters instead of explicit fork/exec.
From: Johannes Sixt @ 2007-10-13 20:06 UTC (permalink / raw)
To: gitster; +Cc: git, Johannes Sixt
In-Reply-To: <1192305984-22594-3-git-send-email-johannes.sixt@telecom.at>
The previous code already used finish_command() to wait for the process
to terminate, but did not use start_command() to run it.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
---
convert.c | 30 +++++++-----------------------
1 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/convert.c b/convert.c
index d77c8eb..6d64994 100644
--- a/convert.c
+++ b/convert.c
@@ -208,34 +208,18 @@ static int filter_buffer(const char *path, const char *src,
* Spawn cmd and feed the buffer contents through its stdin.
*/
struct child_process child_process;
- int pipe_feed[2];
int write_err, status;
+ const char *argv[] = { "sh", "-c", cmd, NULL };
memset(&child_process, 0, sizeof(child_process));
+ child_process.argv = argv;
+ child_process.in = -1;
- if (pipe(pipe_feed) < 0) {
- error("cannot create pipe to run external filter %s", cmd);
- return 1;
- }
-
- child_process.pid = fork();
- if (child_process.pid < 0) {
- error("cannot fork to run external filter %s", cmd);
- close(pipe_feed[0]);
- close(pipe_feed[1]);
- return 1;
- }
- if (!child_process.pid) {
- dup2(pipe_feed[0], 0);
- close(pipe_feed[0]);
- close(pipe_feed[1]);
- execlp("sh", "sh", "-c", cmd, NULL);
- return 1;
- }
- close(pipe_feed[0]);
+ if (start_command(&child_process))
+ return error("cannot fork to run external filter %s", cmd);
- write_err = (write_in_full(pipe_feed[1], src, size) < 0);
- if (close(pipe_feed[1]))
+ write_err = (write_in_full(child_process.in, src, size) < 0);
+ if (close(child_process.in))
write_err = 1;
if (write_err)
error("cannot feed the input to external filter %s", cmd);
--
1.5.3.3.1134.gee562
^ permalink raw reply related
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