* Re: Gitk strangeness..
From: Junio C Hamano @ 2006-03-29 0:50 UTC (permalink / raw)
To: Paul Mackerras; +Cc: git, Linus Torvalds
In-Reply-To: <17449.48630.370867.10251@cargo.ozlabs.ibm.com>
Paul Mackerras <paulus@samba.org> writes:
> Junio C Hamano writes:
>
>> How about this alternative patch, then? It turned out to be
>> quite convoluted as I feared.
>
> That's brilliant. Thank you! With the patch to gitk below, the
> graph display on Linus' example looks much saner.
>
> Could you check in your patch to the git.git repository, please?
The patch I sent was a total mess, and the one in "pu" right now
was somewhat cleaned up but was still far suboptimal. **Blush**
Most notably, the code from yesterday was re-injecting the
parents of the boundary commits into the list marked as
UNINTERESTING, which was unnecessary and stupid. This one just
pops boundary commits off the list after consuming it.
Here is a cleaned-up one for eyeballing.
Although I am reasonably sure that this does not affect the way
it works when --boundary is not given, I'd pretty much
appreciate an independent sanity check on this one. rev-list is
so fundamental to git.
-- >8 --
diff --git a/rev-list.c b/rev-list.c
index 441c437..f3a989c 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -7,9 +7,9 @@ #include "blob.h"
#include "diff.h"
#include "revision.h"
-/* bits #0-4 in revision.h */
+/* bits #0-5 in revision.h */
-#define COUNTED (1u<<5)
+#define COUNTED (1u<<6)
static const char rev_list_usage[] =
"git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
@@ -51,6 +51,8 @@ static void show_commit(struct commit *c
printf("%lu ", commit->date);
if (commit_prefix[0])
fputs(commit_prefix, stdout);
+ if (commit->object.flags & BOUNDARY)
+ putchar('-');
fputs(sha1_to_hex(commit->object.sha1), stdout);
if (show_parents) {
struct commit_list *parents = commit->parents;
diff --git a/revision.c b/revision.c
index d7678cf..745b0d2 100644
--- a/revision.c
+++ b/revision.c
@@ -419,6 +419,27 @@ static void limit_list(struct rev_info *
continue;
p = &commit_list_insert(commit, p)->next;
}
+ if (revs->boundary) {
+ list = newlist;
+ while (list) {
+ struct commit *commit = list->item;
+ struct object *obj = &commit->object;
+ struct commit_list *parent = commit->parents;
+ if (obj->flags & (UNINTERESTING|BOUNDARY)) {
+ list = list->next;
+ continue;
+ }
+ while (parent) {
+ struct commit *pcommit = parent->item;
+ parent = parent->next;
+ if (!(pcommit->object.flags & UNINTERESTING))
+ continue;
+ pcommit->object.flags |= BOUNDARY;
+ p = &commit_list_insert(pcommit, p)->next;
+ }
+ list = list->next;
+ }
+ }
revs->commits = newlist;
}
@@ -591,6 +612,10 @@ int setup_revisions(int argc, const char
revs->no_merges = 1;
continue;
}
+ if (!strcmp(arg, "--boundary")) {
+ revs->boundary = 1;
+ continue;
+ }
if (!strcmp(arg, "--objects")) {
revs->tag_objects = 1;
revs->tree_objects = 1;
@@ -731,13 +756,17 @@ struct commit *get_revision(struct rev_i
do {
struct commit *commit = revs->commits->item;
- if (commit->object.flags & (UNINTERESTING|SHOWN))
+ if (commit->object.flags & SHOWN)
+ goto next;
+ if (!(commit->object.flags & BOUNDARY) &&
+ (commit->object.flags & UNINTERESTING))
goto next;
if (revs->min_age != -1 && (commit->date > revs->min_age))
goto next;
if (revs->max_age != -1 && (commit->date < revs->max_age))
return NULL;
- if (revs->no_merges && commit->parents && commit->parents->next)
+ if (revs->no_merges &&
+ commit->parents && commit->parents->next)
goto next;
if (revs->prune_fn && revs->dense) {
if (!(commit->object.flags & TREECHANGE))
@@ -745,8 +774,19 @@ struct commit *get_revision(struct rev_i
rewrite_parents(commit);
}
/* More to go? */
- if (revs->max_count)
- pop_most_recent_commit(&revs->commits, SEEN);
+ if (revs->max_count) {
+ if (commit->object.flags & BOUNDARY) {
+ /* this is already uninteresting,
+ * so there is no point popping its
+ * parents into the list.
+ */
+ struct commit_list *it = revs->commits;
+ revs->commits = it->next;
+ free(it);
+ }
+ else
+ pop_most_recent_commit(&revs->commits, SEEN);
+ }
commit->object.flags |= SHOWN;
return commit;
next:
diff --git a/revision.h b/revision.h
index 6c2beca..61e6bc9 100644
--- a/revision.h
+++ b/revision.h
@@ -6,6 +6,7 @@ #define UNINTERESTING (1u<<1)
#define TREECHANGE (1u<<2)
#define SHOWN (1u<<3)
#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
+#define BOUNDARY (1u<<5)
struct rev_info;
@@ -32,7 +33,8 @@ struct rev_info {
blob_objects:1,
edge_hint:1,
limited:1,
- unpacked:1;
+ unpacked:1,
+ boundary:1;
/* special limits */
int max_count;
^ permalink raw reply related
* Re: git pull fails
From: Junio C Hamano @ 2006-03-29 0:40 UTC (permalink / raw)
To: Petr Baudis; +Cc: git
In-Reply-To: <20060329002415.GG27689@pasky.or.cz>
Petr Baudis <pasky@suse.cz> writes:
> If your current branch would really be a remote branch and you simply
> git-fetched, your HEAD would change but not your working tree, and at
> that moment things would become very confusing. Cogito would start
> showing nonsensical stuff for cg-status and cg-diff (as well as
> git-diff-tree HEAD output), but your index would at least still be
> correct so I'm not sure how much attention do tools like git-diff pay to
> it, the level of messup would be proportional to that.
People want to leave tracking branches checked out, especially
when they are not developers but are "update to the latest and
compile the bleeding edge" types. Support for that mode of
operation was invented long time ago and git-pull knows about
it, and the idea was ported to git-cvsimport recently.
^ permalink raw reply
* Re: git pull fails
From: Petr Baudis @ 2006-03-29 0:24 UTC (permalink / raw)
To: Timo Hirvonen; +Cc: astralstorm, git, ralf
In-Reply-To: <20060329031136.e0389c00.tihirvon@gmail.com>
Dear diary, on Wed, Mar 29, 2006 at 02:11:36AM CEST, I got a letter
where Timo Hirvonen <tihirvon@gmail.com> said that...
> Exactly. Maybe git-fetch should abort only if it could not update the
> currently checked out branch?
That should _never_ be the case. Any modern porcelain shouldn't let you
switch your current branch to a remote one, hopefully. It's just wrong.
The supported setup is that you have a remote branch reflecting where
the upstream is and a local branch reflecting where your current tree
is, and you update your local branch by git-pull (or git-merge if you
want to avoid fetching).
If your current branch would really be a remote branch and you simply
git-fetched, your HEAD would change but not your working tree, and at
that moment things would become very confusing. Cogito would start
showing nonsensical stuff for cg-status and cg-diff (as well as
git-diff-tree HEAD output), but your index would at least still be
correct so I'm not sure how much attention do tools like git-diff pay to
it, the level of messup would be proportional to that.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time. I think
I have forgotten this before.
^ permalink raw reply
* Re: git pull fails
From: Junio C Hamano @ 2006-03-29 0:22 UTC (permalink / raw)
To: Timo Hirvonen; +Cc: git
In-Reply-To: <20060329031136.e0389c00.tihirvon@gmail.com>
Timo Hirvonen <tihirvon@gmail.com> writes:
> Petr Baudis <pasky@suse.cz> wrote:
>
>> If I understand it right, Timo complains that git-fetch got
>> non-fastforward commits for "pu" and "next" and a good fastforward
>> commit for "master", but it didn't update the ref for ANY head, not even
>> the "master".
>
> Exactly. Maybe git-fetch should abort only if it could not update the
> currently checked out branch?
The erroring-out is there so that the user can take notice.
^ permalink raw reply
* Re: [PATCH] xdiff: Show function names in hunk headers.
From: Junio C Hamano @ 2006-03-29 0:21 UTC (permalink / raw)
To: Mark Wooding; +Cc: git
In-Reply-To: <slrne2ik1i.s3g.mdw@metalzone.distorted.org.uk>
Mark Wooding <mdw@distorted.org.uk> writes:
> Junio C Hamano <junkio@cox.net> wrote:
>
>> GNU diff -p does "^[[:alpha:]$_]"; personally I think any line
>> that does not begin with a whitespace is good enough.
>...
> The second suggestion is slightly refined, but a little more
> complicated. We ask for a line which starts /either/ with two
> non-whitespace characters, or with an alphanumeric. Why? Because text
> documents have a tendency to have headings of the form `7 Heading!' and
> I want to catch them.
Asciidoc?
. enumerated one
this is one item
. enumerated two
this is another item
> I think I like option 2 best, as a nice compromise between stupidity and
> actually working. Opinions, anyone?
It's just a heuristic, so there are only two things we could
sensibly do. Either we keep it absolutely stupid to save our
code and sanity, or we give full configurability via -F regexp
to the end users.
I suspect feeping creaturism would eventually push us to go the
latter route, but for now I'd vote for doing exactly the same as
what default GNU does, by looking at the first letter without
using regexps. When we add regexps later, the users can
customize the pattern to match the languages they use, and we
might end up having to have a set of (file-suffix -> default
regexp) mappings, with full end user configurability via
.git/config -- gaaah but true X-<.
[diff]
functionline = "^\w" for .c
functionline = "^(?i)\s*(?:function|procedure)" for .f77
functionline = "^\(defun " for .el
...
^ permalink raw reply
* [PATCH] Support for pickaxe matching regular expressions
From: Petr Baudis @ 2006-03-29 0:16 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Mark Wooding, git
In-Reply-To: <Pine.LNX.4.64.0603281500280.15714@g5.osdl.org>
Dear diary, on Wed, Mar 29, 2006 at 01:03:05AM CEST, I got a letter
where Linus Torvalds <torvalds@osdl.org> said that...
> On Tue, 28 Mar 2006, Mark Wooding wrote:
> > Urgh. So, which regex library do people want to use? ;-) (My vote's
> > for pcre.)
>
> ... No regexps, ...
To toss a random feature idea around, in the recent days I've found
myself thinking about regexp pickaxe several times.
And while already tossing stuff, what about a naive proof-of-concept
patch? A silly example:
git-whatchanged --pickaxe-regex -p -S' +$' | less -p '^[-+ ].* +$'
Then keep hitting 'n'. Good that most of the matches are deletions. :)
(Or commit messages.)
---
git-diff-* --pickaxe-regex will change the -S pickaxe to match
POSIX extended regular expressions instead of fixed strings.
The regex.h library is a rather stupid interface and I like pcre too, but
with any luck it will be everywhere we will want to run Git on, it being
POSIX.2 and all. I'm not sure if we can expect platforms like AIX to
conform to POSIX.2 or if win32 has regex.h. We might add a flag to
Makefile if there is a portability trouble potential.
Signed-off-by: Petr Baudis <pasky@suse.cz>
---
Documentation/diff-options.txt | 4 ++
diff.c | 2 +
diff.h | 1 +
diffcore-pickaxe.c | 68 ++++++++++++++++++++++++++++++----------
4 files changed, 58 insertions(+), 17 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 2a0275e..ec6811c 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -69,6 +69,10 @@
changeset, not just the files that contain the change
in <string>.
+--pickaxe-regex::
+ Make the <string> not a plain string but an extended POSIX
+ regex to match.
+
-O<orderfile>::
Output the patch in the order specified in the
<orderfile>, which has one shell glob pattern per line.
diff --git a/diff.c b/diff.c
index 8b37477..e006adb 100644
--- a/diff.c
+++ b/diff.c
@@ -883,6 +883,8 @@ int diff_opt_parse(struct diff_options *
options->filter = arg + 14;
else if (!strcmp(arg, "--pickaxe-all"))
options->pickaxe_opts = DIFF_PICKAXE_ALL;
+ else if (!strcmp(arg, "--pickaxe-regex"))
+ options->pickaxe_opts = DIFF_PICKAXE_REGEX;
else if (!strncmp(arg, "-B", 2)) {
if ((options->break_opt =
diff_scoreopt_parse(arg)) == -1)
diff --git a/diff.h b/diff.h
index 8fac465..564c94f 100644
--- a/diff.h
+++ b/diff.h
@@ -112,6 +112,7 @@ #define DIFF_DETECT_RENAME 1
#define DIFF_DETECT_COPY 2
#define DIFF_PICKAXE_ALL 1
+#define DIFF_PICKAXE_REGEX 2
extern void diffcore_std(struct diff_options *);
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 50e46ab..d89f314 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -1,12 +1,15 @@
/*
* Copyright (C) 2005 Junio C Hamano
*/
+#include <regex.h>
+
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
static unsigned int contains(struct diff_filespec *one,
- const char *needle, unsigned long len)
+ const char *needle, unsigned long len,
+ regex_t *regexp)
{
unsigned int cnt;
unsigned long offset, sz;
@@ -17,15 +20,28 @@ static unsigned int contains(struct diff
sz = one->size;
data = one->data;
cnt = 0;
-
- /* Yes, I've heard of strstr(), but the thing is *data may
- * not be NUL terminated. Sue me.
- */
- for (offset = 0; offset + len <= sz; offset++) {
- /* we count non-overlapping occurrences of needle */
- if (!memcmp(needle, data + offset, len)) {
- offset += len - 1;
+
+ if (regexp) {
+ regmatch_t regmatch;
+ int flags = 0;
+
+ while (*data && !regexec(regexp, data, 1, ®match, flags)) {
+ flags |= REG_NOTBOL;
+ data += regmatch.rm_so;
+ if (*data) data++;
cnt++;
+ }
+
+ } else { /* Classic exact string match */
+ /* Yes, I've heard of strstr(), but the thing is *data may
+ * not be NUL terminated. Sue me.
+ */
+ for (offset = 0; offset + len <= sz; offset++) {
+ /* we count non-overlapping occurrences of needle */
+ if (!memcmp(needle, data + offset, len)) {
+ offset += len - 1;
+ cnt++;
+ }
}
}
return cnt;
@@ -36,10 +52,24 @@ void diffcore_pickaxe(const char *needle
struct diff_queue_struct *q = &diff_queued_diff;
unsigned long len = strlen(needle);
int i, has_changes;
+ regex_t regex, *regexp = NULL;
struct diff_queue_struct outq;
outq.queue = NULL;
outq.nr = outq.alloc = 0;
+ if (opts & DIFF_PICKAXE_REGEX) {
+ int err;
+ err = regcomp(®ex, needle, REG_EXTENDED | REG_NEWLINE);
+ if (err) {
+ /* The POSIX.2 people are surely sick */
+ char errbuf[1024];
+ regerror(err, ®ex, errbuf, 1024);
+ regfree(®ex);
+ die("invalid pickaxe regex: %s", errbuf);
+ }
+ regexp = ®ex;
+ }
+
if (opts & DIFF_PICKAXE_ALL) {
/* Showing the whole changeset if needle exists */
for (i = has_changes = 0; !has_changes && i < q->nr; i++) {
@@ -48,16 +78,16 @@ void diffcore_pickaxe(const char *needle
if (!DIFF_FILE_VALID(p->two))
continue; /* ignore unmerged */
/* created */
- if (contains(p->two, needle, len))
+ if (contains(p->two, needle, len, regexp))
has_changes++;
}
else if (!DIFF_FILE_VALID(p->two)) {
- if (contains(p->one, needle, len))
+ if (contains(p->one, needle, len, regexp))
has_changes++;
}
else if (!diff_unmodified_pair(p) &&
- contains(p->one, needle, len) !=
- contains(p->two, needle, len))
+ contains(p->one, needle, len, regexp) !=
+ contains(p->two, needle, len, regexp))
has_changes++;
}
if (has_changes)
@@ -80,16 +110,16 @@ void diffcore_pickaxe(const char *needle
if (!DIFF_FILE_VALID(p->two))
; /* ignore unmerged */
/* created */
- else if (contains(p->two, needle, len))
+ else if (contains(p->two, needle, len, regexp))
has_changes = 1;
}
else if (!DIFF_FILE_VALID(p->two)) {
- if (contains(p->one, needle, len))
+ if (contains(p->one, needle, len, regexp))
has_changes = 1;
}
else if (!diff_unmodified_pair(p) &&
- contains(p->one, needle, len) !=
- contains(p->two, needle, len))
+ contains(p->one, needle, len, regexp) !=
+ contains(p->two, needle, len, regexp))
has_changes = 1;
if (has_changes)
@@ -97,6 +127,10 @@ void diffcore_pickaxe(const char *needle
else
diff_free_filepair(p);
}
+
+ if (opts & DIFF_PICKAXE_REGEX) {
+ regfree(®ex);
+ }
free(q->queue);
*q = outq;
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time. I think
I have forgotten this before.
^ permalink raw reply related
* Re: git pull fails
From: Timo Hirvonen @ 2006-03-29 0:11 UTC (permalink / raw)
To: Petr Baudis; +Cc: astralstorm, git, ralf
In-Reply-To: <20060328224807.GC27689@pasky.or.cz>
Petr Baudis <pasky@suse.cz> wrote:
> If I understand it right, Timo complains that git-fetch got
> non-fastforward commits for "pu" and "next" and a good fastforward
> commit for "master", but it didn't update the ref for ANY head, not even
> the "master".
Exactly. Maybe git-fetch should abort only if it could not update the
currently checked out branch?
--
http://onion.dynserv.net/~timo/
^ permalink raw reply
* Re: [PATCH] Add ALL_LDFLAGS to the git target.
From: Junio C Hamano @ 2006-03-29 0:01 UTC (permalink / raw)
To: Jason Riedy; +Cc: git
In-Reply-To: <16397.1143590377@lotus.CS.Berkeley.EDU>
Jason Riedy <ejr@EECS.Berkeley.EDU> writes:
> And Junio C Hamano writes:
> - My preference is to ignore FORTRAN, keep Mark's current rules,
> - perhaps with a way to turn it off if people really find it
> - annoying (I do not mind having it always on).
Sorry I forgot to add smiley to the above ;-).
^ permalink raw reply
* Re: [PATCH] Add ALL_LDFLAGS to the git target.
From: Jason Riedy @ 2006-03-28 23:59 UTC (permalink / raw)
To: git
In-Reply-To: <7vbqvqjgvi.fsf@assigned-by-dhcp.cox.net>
And Junio C Hamano writes:
- My preference is to ignore FORTRAN, keep Mark's current rules,
- perhaps with a way to turn it off if people really find it
- annoying (I do not mind having it always on).
Sorry; I had meant my comment as an aside and not a
request. I had never noticed the function definition
in patches, and now I typically use Emacs's tools.
And as of Fortran 90, it's now officially Fortran and
not FORTRAN.
Jason
^ permalink raw reply
* Re: Cherry-pick particular object
From: Petr Baudis @ 2006-03-28 23:28 UTC (permalink / raw)
To: Linus Torvalds; +Cc: sean, Sébastien Pierre, git
In-Reply-To: <Pine.LNX.4.64.0603281512260.15714@g5.osdl.org>
Dear diary, on Wed, Mar 29, 2006 at 01:24:13AM CEST, I got a letter
where Linus Torvalds <torvalds@osdl.org> said that...
> On Wed, 29 Mar 2006, Petr Baudis wrote:
>
> > Dear diary, on Wed, Mar 29, 2006 at 12:44:02AM CEST, I got a letter
> > where Linus Torvalds <torvalds@osdl.org> said that...
> > > Ie you can have a tree like this:
> > >
> > > 100644 blob f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f abc
> > > 120000 blob f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f file
> > >
> > > where the first one is a regular file called "abc" (which contains the
> > > string "abc"), and the second is the _symlink_ that points to "abc".
> > >
> > > They share the exact same blob, and what distinguishes them is the
> > > filemode info from git-read-tree.
> >
> > Huh? Didn't you rather want to say that "file" will point to a blob
> > containing just the "abc" string (the symlink target)? ;-)
>
> Well no, maybe I should have called the first file something else.
>
> Both "abc" and "file" from a git perspective have the same _contents_ (the
> blob containing the data 'abc').
Oh, I've totally missed the '(which contains the string "abc")' part,
sorry. Apparently it's time to sleep for me. :/
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time. I think
I have forgotten this before.
^ permalink raw reply
* Re: Cherry-pick particular object
From: Linus Torvalds @ 2006-03-28 23:24 UTC (permalink / raw)
To: Petr Baudis; +Cc: sean, Sébastien Pierre, git
In-Reply-To: <20060328225429.GD27689@pasky.or.cz>
On Wed, 29 Mar 2006, Petr Baudis wrote:
> Dear diary, on Wed, Mar 29, 2006 at 12:44:02AM CEST, I got a letter
> where Linus Torvalds <torvalds@osdl.org> said that...
> > Ie you can have a tree like this:
> >
> > 100644 blob f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f abc
> > 120000 blob f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f file
> >
> > where the first one is a regular file called "abc" (which contains the
> > string "abc"), and the second is the _symlink_ that points to "abc".
> >
> > They share the exact same blob, and what distinguishes them is the
> > filemode info from git-read-tree.
>
> Huh? Didn't you rather want to say that "file" will point to a blob
> containing just the "abc" string (the symlink target)? ;-)
Well no, maybe I should have called the first file something else.
Both "abc" and "file" from a git perspective have the same _contents_ (the
blob containing the data 'abc').
But the filemode means that those contents have totally different meaning.
For the pth "file", it means that it's a _symlink_ to "abc", while for the
path "abc" it's a regular file that just has the _contents_ "abc".
So the end _result_ of this is that "file" points to a file called "abc"
that also has the contents "abc", and "cat file abc" will result in
"abcabc".
IOW, this is the result of doing
echo -n abc > abc
ln -s abc file
and importing the mess into git.
Linus
^ permalink raw reply
* Re: [PATCH] Add ALL_LDFLAGS to the git target.
From: Mark Wooding @ 2006-03-28 23:21 UTC (permalink / raw)
To: git
In-Reply-To: <Pine.LNX.4.64.0603281500280.15714@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> wrote:
> I'd really just prefer to make the "-p" switch configurable, the way
> it was before. No regexps, just the same rules as for GNU diff,
The rules for GNU diff aren't actually good enough if you can't
configure them. We used to be able to put runes in GIT_DIFF_OPTS.
> perhaps with the difference being that it would be on by default.
I thought it /was/ on by default:
: static const char *diff_opts = "-pu";
(killed in cebff98db).
> Another possible approach is to say
> - if the first line of the real diff matches the rules, do NOT add
> another line that matches the rule at the @@-line.
>
> since the simple @@-line rule really doesn't make sense for any file that
> is "dense" (ie where most lines start with non-whitespace).
It's true, and that's an easy fix. But it doesn't do any actual harm.
-- [mdw]
^ permalink raw reply
* Re: [PATCH] Add ALL_LDFLAGS to the git target.
From: Junio C Hamano @ 2006-03-28 23:20 UTC (permalink / raw)
To: Linus Torvalds; +Cc: git
In-Reply-To: <Pine.LNX.4.64.0603281500280.15714@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
> On Tue, 28 Mar 2006, Mark Wooding wrote:
>
>> Jason Riedy <ejr@EECS.Berkeley.EDU> wrote:
>>
>> > P.S. For the whole finding-a-function-name business, some of
>> > us are using git on fixed-format Fortran. Every non-comment
>> > line begins with whitespace... ;) And in free format, many
>> > people don't add that first indentation within subroutines.
>>
>> Urgh. So, which regex library do people want to use? ;-) (My vote's
>> for pcre.)
>
> I'd really just prefer to make the "-p" switch configurable, the way it
> was before. No regexps, just the same rules as for GNU diff, perhaps with
> the difference being that it would be on by default.
Strictly speaking, "No regexps" and "same rules as for GNU diff"
are mutually incompatible, since GNU diff -p defaults to
"^[[:alpha:]$_]" but the regexp is configurable.
My preference is to ignore FORTRAN, keep Mark's current rules,
perhaps with a way to turn it off if people really find it
annoying (I do not mind having it always on).
> Another possible approach is to say
> - if the first line of the real diff matches the rules, do NOT add
> another line that matches the rule at the @@-line.
>
> since the simple @@-line rule really doesn't make sense for any file that
> is "dense" (ie where most lines start with non-whitespace).
I think this is a good rule. If "the first non-empty line" may
be even better; we do not want to see the name of previous
function for a huke like this:
@@ -a,b +c,d @@
int frotz(void)
{
...
^ permalink raw reply
* Re: [PATCH] Add ALL_LDFLAGS to the git target.
From: Linus Torvalds @ 2006-03-28 23:03 UTC (permalink / raw)
To: Mark Wooding; +Cc: git
In-Reply-To: <slrne2jf9t.s3g.mdw@metalzone.distorted.org.uk>
On Tue, 28 Mar 2006, Mark Wooding wrote:
> Jason Riedy <ejr@EECS.Berkeley.EDU> wrote:
>
> > P.S. For the whole finding-a-function-name business, some of
> > us are using git on fixed-format Fortran. Every non-comment
> > line begins with whitespace... ;) And in free format, many
> > people don't add that first indentation within subroutines.
>
> Urgh. So, which regex library do people want to use? ;-) (My vote's
> for pcre.)
I'd really just prefer to make the "-p" switch configurable, the way it
was before. No regexps, just the same rules as for GNU diff, perhaps with
the difference being that it would be on by default.
Another possible approach is to say
- if the first line of the real diff matches the rules, do NOT add
another line that matches the rule at the @@-line.
since the simple @@-line rule really doesn't make sense for any file that
is "dense" (ie where most lines start with non-whitespace).
Linus
^ permalink raw reply
* Re: Cherry-pick particular object
From: Petr Baudis @ 2006-03-28 22:54 UTC (permalink / raw)
To: Linus Torvalds; +Cc: sean, Sébastien Pierre, git
In-Reply-To: <Pine.LNX.4.64.0603281435410.15714@g5.osdl.org>
Dear diary, on Wed, Mar 29, 2006 at 12:44:02AM CEST, I got a letter
where Linus Torvalds <torvalds@osdl.org> said that...
> Ie you can have a tree like this:
>
> 100644 blob f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f abc
> 120000 blob f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f file
>
> where the first one is a regular file called "abc" (which contains the
> string "abc"), and the second is the _symlink_ that points to "abc".
>
> They share the exact same blob, and what distinguishes them is the
> filemode info from git-read-tree.
Huh? Didn't you rather want to say that "file" will point to a blob
containing just the "abc" string (the symlink target)? ;-)
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time. I think
I have forgotten this before.
^ permalink raw reply
* Re: Gitk strangeness..
From: Paul Mackerras @ 2006-03-28 22:51 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Linus Torvalds
In-Reply-To: <7vzmjbj9a1.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano writes:
> How about this alternative patch, then? It turned out to be
> quite convoluted as I feared.
That's brilliant. Thank you! With the patch to gitk below, the
graph display on Linus' example looks much saner.
Could you check in your patch to the git.git repository, please?
Thanks,
Paul.
diff --git a/gitk b/gitk
index 03cd475..1989aa5 100755
--- a/gitk
+++ b/gitk
@@ -46,7 +46,7 @@ proc start_rev_list {rlargs} {
}
if {[catch {
set commfd [open [concat | git-rev-list --header $order \
- --parents $rlargs] r]
+ --parents --boundary $rlargs] r]
} err]} {
puts stderr "Error executing git-rev-list: $err"
exit 1
@@ -114,8 +114,13 @@ proc getcommitlines {commfd} {
set start [expr {$i + 1}]
set j [string first "\n" $cmit]
set ok 0
+ set listed 1
if {$j >= 0} {
set ids [string range $cmit 0 [expr {$j - 1}]]
+ if {[string range $ids 0 0] == "-"} {
+ set listed 0
+ set ids [string range $ids 1 end]
+ }
set ok 1
foreach id $ids {
if {[string length $id] != 40} {
@@ -133,8 +138,12 @@ proc getcommitlines {commfd} {
exit 1
}
set id [lindex $ids 0]
- set olds [lrange $ids 1 end]
- set commitlisted($id) 1
+ if {$listed} {
+ set olds [lrange $ids 1 end]
+ set commitlisted($id) 1
+ } else {
+ set olds {}
+ }
updatechildren $id $olds
set commitdata($id) [string range $cmit [expr {$j + 1}] end]
set commitrow($id) $commitidx
^ permalink raw reply related
* Re: [PATCH] Add ALL_LDFLAGS to the git target.
From: Mark Wooding @ 2006-03-28 22:48 UTC (permalink / raw)
To: git
In-Reply-To: <15693.1143575188@lotus.CS.Berkeley.EDU>
Jason Riedy <ejr@EECS.Berkeley.EDU> wrote:
> P.S. For the whole finding-a-function-name business, some of
> us are using git on fixed-format Fortran. Every non-comment
> line begins with whitespace... ;) And in free format, many
> people don't add that first indentation within subroutines.
Urgh. So, which regex library do people want to use? ;-) (My vote's
for pcre.)
-- [mdw]
^ permalink raw reply
* Re: git pull fails
From: Petr Baudis @ 2006-03-28 22:48 UTC (permalink / raw)
To: Radoslaw Szkodzinski; +Cc: git, Timo Hirvonen, Ralf Baechle
In-Reply-To: <200603281700.17233.astralstorm@o2.pl>
Dear diary, on Tue, Mar 28, 2006 at 05:00:11PM CEST, I got a letter
where Radoslaw Szkodzinski <astralstorm@o2.pl> said that...
> On Tuesday 28 March 2006 16:38, Timo Hirvonen wrote yet:
> > Thanks, but forcing everyone to edit their git/remotes/origin file
> > is not very nice solution. I think git-fetch should update refs for the
> > other non-'broken' branches and leave "pu" and "next" refs untouched.
>
> How do you know a non-broken branch from something weird?
If I understand it right, Timo complains that git-fetch got
non-fastforward commits for "pu" and "next" and a good fastforward
commit for "master", but it didn't update the ref for ANY head, not even
the "master".
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time. I think
I have forgotten this before.
^ permalink raw reply
* Re: Cherry-pick particular object
From: Linus Torvalds @ 2006-03-28 22:44 UTC (permalink / raw)
To: sean; +Cc: Sébastien Pierre, git
In-Reply-To: <BAYC1-PASMTP02B05019F52DE48793CB39AED30@CEZ.ICE>
On Tue, 28 Mar 2006, sean wrote:
>
> $ git cat-file -t 78132af2643
Side note: when using git-ls-tree, the "blob"ness information is already
in the tree output itself and you shouldn't even need to check the type
with "-t". So what is perhaps somewhat more interesting is actually the
mode of the file, since that determines whether the blob should be
interpreted as regular file content or as a symlink.
Ie you can have a tree like this:
100644 blob f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f abc
120000 blob f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f file
where the first one is a regular file called "abc" (which contains the
string "abc"), and the second is the _symlink_ that points to "abc".
They share the exact same blob, and what distinguishes them is the
filemode info from git-read-tree.
Of course, the symlink case isn't very common and likely not very
interesting in this case, but the fact that "git ls-files" is set up so
that you can just cut-and-paste the "blob <sha1-of-blob" part and feed it
to git-cat-file was definitely not just coincidence.
(A number of the early stuff was set up so that I could do things by hand
by just doing cut-and-paste of the output of the previous command. Git has
come a long way in the last 12 months ;)
Linus
^ permalink raw reply
* Re: Cherry-pick particular object
From: Sébastien Pierre @ 2006-03-28 17:23 UTC (permalink / raw)
To: sean; +Cc: Git ML
In-Reply-To: <BAYC1-PASMTP02B05019F52DE48793CB39AED30@CEZ.ICE>
On Tue, 28 Mar 2006 16:34:22 -0500
sean <seanlkml@sympatico.ca> wrote:
> If you used:
>
> $ git cat-file -t 78132af2643
>
> It would tell you that this object is of type "blob".
> To see the contents of blobs you can do something like:
>
> $ git cat-file blob 78132af2643
Thanks. That was exactly what I was looking for :)
-- Sébastien
^ permalink raw reply
* Re: Cherry-pick particular object
From: Tony Luck @ 2006-03-28 21:38 UTC (permalink / raw)
To: Sébastien Pierre; +Cc: git
In-Reply-To: <20060328113107.20ab4c21.sebastien@xprima.com>
> "get the file corresponding to 78132af26431e649a0f85f22dc27e5787d80700f and save it as myfile.txt"
>
> How would one properly do that with core git ?
$ git cat-file blob 78132af2643 > myfile.txt
-Tony
^ permalink raw reply
* Re: Cherry-pick particular object
From: Shawn Pearce @ 2006-03-28 21:37 UTC (permalink / raw)
To: Sébastien Pierre; +Cc: git
In-Reply-To: <20060328113107.20ab4c21.sebastien@xprima.com>
S?bastien Pierre <sebastien@xprima.com> wrote:
> Hi all,
>
> This is a newbie question.
>
> I recently wanted to "cherry" pick a particular file from my
> git-managed project history. Using gitk, I identified which was
> the revision I wanted (95ba0c74e03874e8c1721b91f92f161e9061621f),
> and then using git ls-tree, I managed to get the id of the file I
> wanted (78132af26431e649a0f85f22dc27e5787d80700f).
>
> Now, what I simply wanted was to do something like:
>
> "get the file corresponding to
> 78132af26431e649a0f85f22dc27e5787d80700f and save it as myfile.txt"
>
> How would one properly do that with core git ?
git cat-file blob 78132af26431e649a0f85f22dc27e5787d80700f >myfile.txt
--
Shawn.
^ permalink raw reply
* Re: Cherry-pick particular object
From: sean @ 2006-03-28 21:34 UTC (permalink / raw)
To: Sébastien Pierre; +Cc: git
In-Reply-To: <20060328113107.20ab4c21.sebastien@xprima.com>
On Tue, 28 Mar 2006 11:31:07 -0500
Sébastien Pierre <sebastien@xprima.com> wrote:
> Hi all,
>
> This is a newbie question.
>
> I recently wanted to "cherry" pick a particular file from my
> git-managed project history. Using gitk, I identified which was
> the revision I wanted (95ba0c74e03874e8c1721b91f92f161e9061621f),
> and then using git ls-tree, I managed to get the id of the file I
> wanted (78132af26431e649a0f85f22dc27e5787d80700f).
>
> Now, what I simply wanted was to do something like:
>
> "get the file corresponding to 78132af26431e649a0f85f22dc27e5787d80700f
> and save it as myfile.txt"
>
> How would one properly do that with core git ?
If you used:
$ git cat-file -t 78132af2643
It would tell you that this object is of type "blob".
To see the contents of blobs you can do something like:
$ git cat-file blob 78132af2643
Sean
^ permalink raw reply
* Cherry-pick particular object
From: Sébastien Pierre @ 2006-03-28 16:31 UTC (permalink / raw)
To: git
Hi all,
This is a newbie question.
I recently wanted to "cherry" pick a particular file from my git-managed project history. Using gitk, I identified which was the revision I wanted (95ba0c74e03874e8c1721b91f92f161e9061621f), and then using git ls-tree, I managed to get the id of the file I wanted (78132af26431e649a0f85f22dc27e5787d80700f).
Now, what I simply wanted was to do something like:
"get the file corresponding to 78132af26431e649a0f85f22dc27e5787d80700f and save it as myfile.txt"
How would one properly do that with core git ?
-- Sébastien
^ permalink raw reply
* Re: [PATCH] Add ALL_LDFLAGS to the git target.
From: Jason Riedy @ 2006-03-28 19:46 UTC (permalink / raw)
To: git
In-Reply-To: <7vu09jks1u.fsf@assigned-by-dhcp.cox.net>
And Junio C Hamano writes:
- Hmph. We do fprintf(stderr, "blah\r") to draw them. The
- standard says that "standard error stream is not fully
- buffered", but I guess it does not necessarily mean it is
- unbuffered, so we probably need to fflush(3) there. Would
- something like this help?
I suppose I should have mentioned that I tried flushing
stderr. Your more comprehensive flushing also does not
fix it, giving outputs like:
> Unpacking Total 3333 objects
> , written 33 (delta 1), reused 0 (delta 0)
The problem is that stderr from a child is not tied to any
stream of its parent. Generally, as far as I know, you
cannot make any assumptions about how pipes from separate
processes are interleaved in the output. Some standard may
say something, but I have no idea what or if anyone listens.
And this particular system is a busy SMP node, making the
problem worse.
Line-buffered streams like stdout tend to work, but not
unbuffered streams like stderr. We can't make stderr line-
buffered without breaking the status indicator...
If I add a third fd to all the pipes and dup it to stderr,
the tests work. I never read from that fd, so I never get
the status output... Progress needs to be part of the
protocol so front ends can handle it cleanly rather than
using stderr tricks.
So some possibilities:
1) Add the ability to pass options through the whole
connect system. Then pass -q in the tester.
2) Add a specific "quiet" command to the protocol for
just passing -q from git-fetch-pack. Pass -q in the
tester.
3) Add an option to pack-objects that dumps progress
output to stdout in a special packet format. Then
update everyone who talks through upload-pack to
expect another phase of informational messages after
negotiating object differences and before the pack
data.
The first two are cosmetic fixes only, and #2 is a cheap,
ugly, but easy hack.
This problem is (to me) low priority. It unfortunately
breaks a test case on AIX, but I can live with it for now.
If others here start to listen to the gospel of git, well,
I'll need to fix it. (But I once recommended Arch, and
people stopped listening after they tried it.)
Folks using moderately-loaded SMPs may experience similar
problems. But if they're fetching large packs, the problem
likely won't appear at all.
Jason
P.S. For the whole finding-a-function-name business, some of
us are using git on fixed-format Fortran. Every non-comment
line begins with whitespace... ;) And in free format, many
people don't add that first indentation within subroutines.
^ 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