* [PATCH] blame: Add --time to produce raw timestamps
From: Fredrik Kuivinen @ 2006-06-12 21:42 UTC (permalink / raw)
To: git; +Cc: junkio
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
---
Documentation/git-blame.txt | 5 ++++-
blame.c | 24 ++++++++++++++++++++----
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 0a1fa00..bfed945 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -20,7 +20,10 @@ OPTIONS
Use the same output mode as git-annotate (Default: off).
-l, --long::
- Show long rev (Defaults off).
+ Show long rev (Default: off).
+
+-t, --time::
+ Show raw timestamp (Default: off).
-S, --rev-file <revs-file>::
Use revs from revs-file instead of calling git-rev-list.
diff --git a/blame.c b/blame.c
index 88bfec2..afa22b5 100644
--- a/blame.c
+++ b/blame.c
@@ -20,9 +20,11 @@ #include "xdiff-interface.h"
#define DEBUG 0
-static const char blame_usage[] = "[-c] [-l] [--] file [commit]\n"
+static const char blame_usage[] = "[-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n"
" -c, --compability Use the same output mode as git-annotate (Default: off)\n"
" -l, --long Show long commit SHA1 (Default: off)\n"
+ " -t, --time Show raw timestamp (Default: off)\n"
+ " -S, --revs-file Use revisions from revs-file instead of calling git-rev-list\n"
" -h, --help This message";
static struct commit **blame_lines;
@@ -680,13 +682,19 @@ static void get_commit_info(struct commi
*tmp = 0;
}
-static const char* format_time(unsigned long time, const char* tz_str)
+static const char* format_time(unsigned long time, const char* tz_str,
+ int raw_time)
{
static char time_buf[128];
time_t t = time;
int minutes, tz;
struct tm *tm;
+ if (raw_time) {
+ sprintf(time_buf, "%lu %s", time, tz_str);
+ return time_buf;
+ }
+
tz = atoi(tz_str);
minutes = tz < 0 ? -tz : tz;
minutes = (minutes / 100)*60 + (minutes % 100);
@@ -740,6 +748,7 @@ int main(int argc, const char **argv)
char filename_buf[256];
int sha1_len = 8;
int compability = 0;
+ int raw_time = 0;
int options = 1;
struct commit* start_commit;
@@ -768,6 +777,10 @@ int main(int argc, const char **argv)
!strcmp(argv[i], "--compability")) {
compability = 1;
continue;
+ } else if(!strcmp(argv[i], "-t") ||
+ !strcmp(argv[i], "--time")) {
+ raw_time = 1;
+ continue;
} else if(!strcmp(argv[i], "-S")) {
if (i + 1 < argc &&
!read_ancestry(argv[i + 1], &sha1_p)) {
@@ -873,14 +886,17 @@ int main(int argc, const char **argv)
fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
if(compability) {
printf("\t(%10s\t%10s\t%d)", ci.author,
- format_time(ci.author_time, ci.author_tz), i+1);
+ format_time(ci.author_time, ci.author_tz,
+ raw_time),
+ i+1);
} else {
if (found_rename)
printf(" %-*.*s", longest_file, longest_file,
u->pathname);
printf(" (%-*.*s %10s %*d) ",
longest_author, longest_author, ci.author,
- format_time(ci.author_time, ci.author_tz),
+ format_time(ci.author_time, ci.author_tz,
+ raw_time),
max_digits, i+1);
}
^ permalink raw reply related
* Hi, milo maize
From: Myrna Pereira @ 2006-06-12 22:11 UTC (permalink / raw)
To: netdev
Join and Play at the best Emperial zCASINOz!
As a Special Welcome TODAY, we will DOUBL your 1 Deposit up to 200 bucks!
For example:
Deposit 50 play with 100!
Deposit 100 play with 200!
And your FREE Bonuses will be INSTANTLY added to your acount!
Try us, inhere:
http://EBR7I3.erprost.com/d1/today
==========
inverted spin, the gull bunt, the pinwheel.
unscrewed the cap, and attached myself to it like a lamprey. I sat on the
Then one day Jonathan, standing on the shore, closing his eyes,
hours unless he can answer this question: 'How do you know you're sane?' ";
Tender.
==
Still, it was easier for them to practice high performance than it
He spread out the map on the windowsill, leaned on his hands, and bent
"Why is it," Jonathan puzzled, "that the hardest thing in the world
==
"Not bad. And you?" He didn't answer. He hugged my neck, pressed me to
The squawks and grockles of everyday life in the Flock were cut off
I kicked him in his bare can and dove into my stall and locked the
^ permalink raw reply
* Re: [PATCH] blame: Add --time to produce raw timestamps
From: Johannes Schindelin @ 2006-06-12 22:41 UTC (permalink / raw)
To: Fredrik Kuivinen; +Cc: git, junkio
In-Reply-To: <20060612214210.22342.46844.stgit@c165>
Hi,
On Mon, 12 Jun 2006, Fredrik Kuivinen wrote:
> diff --git a/blame.c b/blame.c
> index 88bfec2..afa22b5 100644
> --- a/blame.c
> +++ b/blame.c
> @@ -20,9 +20,11 @@ #include "xdiff-interface.h"
>
> #define DEBUG 0
>
> -static const char blame_usage[] = "[-c] [-l] [--] file [commit]\n"
> +static const char blame_usage[] = "[-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n"
That is a bit more than the commit message says.
> + " -t, --time Show raw timestamp (Default: off)\n"
> + " -S, --revs-file Use revisions from revs-file instead of calling git-rev-list\n"
I smell white space corruption here.
> + int raw_time)
Just a tiny nit: could you name it "show_raw_time" instead of "raw_time"?
I got confused by that naming into believeing raw_time was actually a
timestamp, not a boolean...
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH] gitweb: Adding a `blame' interface.
From: Johannes Schindelin @ 2006-06-12 22:42 UTC (permalink / raw)
To: Fredrik Kuivinen; +Cc: Florian Forster, git
In-Reply-To: <20060612213826.GC4705@c165.ib.student.liu.se>
Hi,
On Mon, 12 Jun 2006, Fredrik Kuivinen wrote:
> git-blame is a bit faster than git-annotate and, as far as I know, it
> produces output which is correct.
Yeah: Bring It On(tm)! I already waited for ages for this war to begin!
Ciao,
Dscho
^ permalink raw reply
* Re: git-applymbox broken?
From: Johannes Schindelin @ 2006-06-12 22:43 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: Git Mailing List
In-Reply-To: <m13bea6w13.fsf@ebiederm.dsl.xmission.com>
Hi,
On Mon, 12 Jun 2006, Eric W. Biederman wrote:
> Index: linux/arch/i386/kernel/crash.c
> ===================================================================
> --- linux.orig/arch/i386/kernel/crash.c
> +++ linux/arch/i386/kernel/crash.c
Tsk, tsk. Not using git, are we?
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH] gitweb: Adding a `blame' interface.
From: Linus Torvalds @ 2006-06-12 22:49 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Fredrik Kuivinen, Florian Forster, git
In-Reply-To: <Pine.LNX.4.63.0606130041260.25422@wbgn013.biozentrum.uni-wuerzburg.de>
On Tue, 13 Jun 2006, Johannes Schindelin wrote:
>
> On Mon, 12 Jun 2006, Fredrik Kuivinen wrote:
>
> > git-blame is a bit faster than git-annotate and, as far as I know, it
> > produces output which is correct.
>
> Yeah: Bring It On(tm)! I already waited for ages for this war to begin!
Sadly, I don't think either of you can really do much about the fact that
annotate/blame is simply the wrong model for git.
The war _I_d like to see is the GUI thing which does the "show when this
section changed last" by following the history down only so far that the
selected section shows up in the diff against the most current thing.
THAT is what I want. It also fits the git model much better, since you
generally don't have to go back all the way.
Somebody? "Here's a nickel saying you can't do it!" (if somebody needs the
motivation ;)
Linus
^ permalink raw reply
* Re: [PATCH] gitweb: Adding a `blame' interface.
From: Johannes Schindelin @ 2006-06-12 22:55 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Fredrik Kuivinen, Florian Forster, git
In-Reply-To: <Pine.LNX.4.64.0606121546320.5498@g5.osdl.org>
Hi,
On Mon, 12 Jun 2006, Linus Torvalds wrote:
> On Tue, 13 Jun 2006, Johannes Schindelin wrote:
> >
> > On Mon, 12 Jun 2006, Fredrik Kuivinen wrote:
> >
> > > git-blame is a bit faster than git-annotate and, as far as I know, it
> > > produces output which is correct.
> >
> > Yeah: Bring It On(tm)! I already waited for ages for this war to begin!
>
> Sadly, I don't think either of you can really do much about the fact that
> annotate/blame is simply the wrong model for git.
>
> The war _I_d like to see is the GUI thing which does the "show when this
> section changed last" by following the history down only so far that the
> selected section shows up in the diff against the most current thing.
But this is just the next step! Nothing prevents you -- once everybody
agrees that blame/annotate does the right thing -- to restrict the lines
of interest. And AFAICT both blame and annotate are good at stopping when
all lines are accounted for.
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH] gitweb: Adding a `blame' interface.
From: Linus Torvalds @ 2006-06-12 23:21 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Fredrik Kuivinen, Florian Forster, git
In-Reply-To: <Pine.LNX.4.63.0606130053400.25682@wbgn013.biozentrum.uni-wuerzburg.de>
On Tue, 13 Jun 2006, Johannes Schindelin wrote:
> >
> > The war _I_d like to see is the GUI thing which does the "show when this
> > section changed last" by following the history down only so far that the
> > selected section shows up in the diff against the most current thing.
>
> But this is just the next step! Nothing prevents you -- once everybody
> agrees that blame/annotate does the right thing -- to restrict the lines
> of interest. And AFAICT both blame and annotate are good at stopping when
> all lines are accounted for.
You misunderstand. It's not "all", it's "any" (in fact, it would be even
better if it would be on a byte-range basis, not on a line-based diff
basis).
And it needs the GUI to make it useful, because nobody in their right mind
will say "git showchange fs/inode.c 77-89" (and then do it iteratively if
the first one wasn't actually the interesting case).
Linus
^ permalink raw reply
* Re: git-applymbox broken?
From: Randy.Dunlap @ 2006-06-12 23:54 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: ebiederm, git
In-Reply-To: <Pine.LNX.4.63.0606130042290.25422@wbgn013.biozentrum.uni-wuerzburg.de>
On Tue, 13 Jun 2006 00:43:06 +0200 (CEST) Johannes Schindelin wrote:
> Hi,
>
> On Mon, 12 Jun 2006, Eric W. Biederman wrote:
>
> > Index: linux/arch/i386/kernel/crash.c
> > ===================================================================
> > --- linux.orig/arch/i386/kernel/crash.c
> > +++ linux/arch/i386/kernel/crash.c
>
> Tsk, tsk. Not using git, are we?
what's your point?
Eric clearly identified where the patch came from.
---
~Randy
^ permalink raw reply
* Your cash, mineral blue
From: Camille Gipson @ 2006-06-13 0:04 UTC (permalink / raw)
To: postmaster
Join and Play at the best Emperial zCASINOz!
As a Special Welcome TODAY, we will DOUBL your 1 Deposit up to 200 bucks!
For example:
Deposit 50 play with 100!
Deposit 100 play with 200!
And your FREE Bonuses will be INSTANTLY added to your acount!
Try us, inhere:
http://5HIC53.erprost.com/d1/today
==========
He folded his wings, rolled and dropped in a dive to a hundred ninety
could be of great scientific value. I am suggesting that we inspect the
joy of flight, using its wings as means to the end of finding and fighting
whipping over them all.
looked into the open doors. At first I couldn't see anything because of the
==
And then another hundred lives until we began to learn that there is such
He looked at me pitifully, flopped his lips, and went on: how much silk
predictions of battle melted in the Flock's confusion.
==
He didn't answer. The water was making a lot of noise.
proud or how hurt a bird was Fletcher Seagull.
I was too slippery for them to catch me now.
^ permalink raw reply
* Hi, Neo-christianity
From: Maritza Bruno @ 2006-06-13 1:51 UTC (permalink / raw)
To: postmaster
Join and Play at the best Emperial zCASINOz!
As a Special Welcome TODAY, we will DOUBL your 1 Deposit up to 200 bucks!
For example:
Deposit 50 play with 100!
Deposit 100 play with 200!
And your FREE Bonuses will be INSTANTLY added to your acount!
Try us, inhere:
http://LHDERY.erprost.com/d1/today
==========
"Well sure, O.K. they're Outcast," said some of the younger gulls,
"He knows," Kirill said. "He's a good driver.
do? How did we get here?"
Shame in the sight of your fellow gulls!"
Commission on Problems of the Visitation."
==
"At last you've got the idea," Chiang said, "but your control needs a
anyway, to tell the truth, people drop like flies in the special suits too.
The next night from the Flock came Kirk Maynard Gull, wobbling across
==
and your Tender brags to everybody how we headed straight for the garage,
He climbed two thousand feet above the black sea, and without a
because you can't press them together, and no one's been able to pull them
^ permalink raw reply
* Re: Problem upgrading to 1.4.0
From: Pavel Roskin @ 2006-06-13 2:33 UTC (permalink / raw)
To: git; +Cc: Geoff Russell
In-Reply-To: <7v1wtwh246.fsf@assigned-by-dhcp.cox.net>
On Sat, 2006-06-10 at 19:12 -0700, Junio C Hamano wrote:
> This is the second time this same gotcha caused trouble here. I
> agree it would be sensible to make git-fetch (which is called by
> git-pull) to detect stale entries in the remotes/origin file and
> remote.origin.fetch configuration items.
And while at that, it would be great to download and keep the list of
the remote branches, perhaps when requested with a special switch. It
doesn't mean that all of the branches should be fetched, but it would be
nice to have a list of the available remove branches somewhere.
As it stands now, this functionality is implemented in git-clone, which
it probably not the best place. Users should not be forced to clone the
directory again to find out which branches are available.
--
Regards,
Pavel Roskin
^ permalink raw reply
* Re: Problem upgrading to 1.4.0
From: Sean @ 2006-06-13 2:48 UTC (permalink / raw)
To: Pavel Roskin; +Cc: git, geoffrey.russell
In-Reply-To: <1150165982.4297.88.camel@dv>
On Mon, 12 Jun 2006 22:33:02 -0400
Pavel Roskin <proski@gnu.org> wrote:
> And while at that, it would be great to download and keep the list of
> the remote branches, perhaps when requested with a special switch. It
> doesn't mean that all of the branches should be fetched, but it would be
> nice to have a list of the available remove branches somewhere.
>
> As it stands now, this functionality is implemented in git-clone, which
> it probably not the best place. Users should not be forced to clone the
> directory again to find out which branches are available.
Hi Pavel,
You can get a list of the remote branches whenever you want:
$ git ls-remote -h <remote>
So, to see available branches in the repo from which you initially
cloned:
$ git ls-remote -h origin
Or to see which branches are available in the official cogito repo,
without ever cloning it:
$ git ls-remote -h git://git.kernel.org/pub/scm/cogito/cogito.git
HTH,
Sean
^ permalink raw reply
* Re: Problem upgrading to 1.4.0
From: Pavel Roskin @ 2006-06-13 3:02 UTC (permalink / raw)
To: Sean; +Cc: git, geoffrey.russell
In-Reply-To: <20060612224818.383b13ee.seanlkml@sympatico.ca>
Hi, Sean!
On Mon, 2006-06-12 at 22:48 -0400, Sean wrote:
> Hi Pavel,
>
> You can get a list of the remote branches whenever you want:
>
> $ git ls-remote -h <remote>
I heard of that command. But git-clone only uses it for local and rsync
protocols. If it's so good, shouldn't it be used unconditionally or at
least with minimal exceptions (some kinds of local clones)?
--
Regards,
Pavel Roskin
^ permalink raw reply
* Your future, ox ray
From: Delia Rutherford @ 2006-06-13 0:21 UTC (permalink / raw)
To: postmaster
Join and Play at the best Emperial zCASINOz!
As a Special Welcome TODAY, we will DOUBL your 1 Deposit up to 200 bucks!
For example:
Deposit 50 play with 100!
Deposit 100 play with 200!
And your FREE Bonuses will be INSTANTLY added to your acount!
Try us, inhere:
http://KWL2JO.erprost.com/d1/today
==========
Flock in that direction."
it was a snap! My eyes had gotten used to the murky light, and I could even
He spoke of very simple things - that it is right for a guil to fly,
Seagull - blinked. His pain, his resolutions, vanished.
"Yes. But I have nothing to do with the study of extraterrestrial
==
Jonathan was stunned. "Where are we?"
I got back to the lab in the morning as usual, around nine, and showed
yourself, a little more each day, that real, unlimited Fletcher Seagull.
==
of my business. Now nothing concerned me any more.
heaven from where they stand! Jon, they can't see their own wingtips! Stay
to them, but I gave him such a jab in the ribs that he immediately dropped
^ permalink raw reply
* Re: Problem upgrading to 1.4.0
From: Linus Torvalds @ 2006-06-13 3:28 UTC (permalink / raw)
To: Pavel Roskin; +Cc: Sean, git, geoffrey.russell
In-Reply-To: <1150167759.4297.95.camel@dv>
On Mon, 12 Jun 2006, Pavel Roskin wrote:
>
> > You can get a list of the remote branches whenever you want:
> >
> > $ git ls-remote -h <remote>
>
> I heard of that command. But git-clone only uses it for local and rsync
> protocols.
The native format doesn't _need_ to use "git ls-remote", because the
native format does it on its own.
In fact, "git ls-remote" actually uses the pack transfer protocol to
figure out what the remote heads are (it just then doesn't _ask_ for
anything), so in many ways you can see "git ls-remote" as being just a
helper around the basic clone/pull protocol.
So "git clone" ends up doing the equivalent of a git ls-remote to populate
the initial local heads and tags. It's just that for the native protocol,
it all happens together in one burst.
Linus
^ permalink raw reply
* Re: git-applymbox broken?
From: Ryan Anderson @ 2006-06-13 3:41 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: Linus Torvalds, Junio C Hamano, Git Mailing List
In-Reply-To: <m1wtbn468o.fsf@ebiederm.dsl.xmission.com>
On Sun, Jun 11, 2006 at 05:33:59PM -0600, Eric W. Biederman wrote:
> Linus Torvalds <torvalds@osdl.org> writes:
>
> > It looks like something has broken git-applymbox lately.
> >
> > The "From: authorname" lines are no longer removed from the message, and
> > are duplicated in the commit log. This has resulted in several recent
> > kernel commits looking like this:
>
> Agreed. That isn't terribly desirable.
> Do you have the original email message some place?
>
> There is an odd case where if someone put the From: header
> in the middle of the text that we now notice and process and I
> didn't feel right about removing a line from the middle of the
> text.
>
> I was fixing a nasty corner case that happens if there aren't any
> mail headers at all passed to git-mailinfo. Where we could drop
> lines without processing them at all.
>
> This doesn't look like the From: header was in the middle of the
> message until it was imported into git so it is probably a small
> logic error that is easily corrected. But I need to see what
> we are parsing so I can understand what is happening.
I hate to say this, because I'm bad about it, too, but we should
probably have a few tests for applymbox, to cover the various scenarios
discussed in this thread.
--
Ryan Anderson
sometimes Pug Majere
^ permalink raw reply
* Re: Problem upgrading to 1.4.0
From: Pavel Roskin @ 2006-06-13 3:56 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Sean, git, geoffrey.russell
In-Reply-To: <Pine.LNX.4.64.0606122024400.5498@g5.osdl.org>
On Mon, 2006-06-12 at 20:28 -0700, Linus Torvalds wrote:
>
> On Mon, 12 Jun 2006, Pavel Roskin wrote:
> >
> > > You can get a list of the remote branches whenever you want:
> > >
> > > $ git ls-remote -h <remote>
> >
> > I heard of that command. But git-clone only uses it for local and rsync
> > protocols.
>
> The native format doesn't _need_ to use "git ls-remote", because the
> native format does it on its own.
OK. I actually suspected that git-ls-remote was limited to some
protocols. I'm glad to be wrong about it.
--
Regards,
Pavel Roskin
^ permalink raw reply
* Re: cvs import error
From: carbonated beverage @ 2006-06-13 4:25 UTC (permalink / raw)
To: git
In-Reply-To: <46a038f90606112101la88168xc5d540fe1220fbf8@mail.gmail.com>
Whups, make an error on the reply so it didn't hit the list:
Switched to the git 'next' branch, applied that patch, nuked ~/.cvsps
(forgot it cached stuff), and rm'ing the one directory that was giving
cvsps fits (in that order) finally allowed the rest of the repo to get
imported.
Thanks!
-- DN
Daniel
^ permalink raw reply
* [PATCH 1/4] Remove dependencies with absolute path
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
From: Pavel Roskin <proski@gnu.org>
Not everybody has headers in the same locations and not everybody uses
gcc 3.3.6. Only leave dependencies with relative path.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
Makefile | 213 ++++----------------------------------------------------------
1 files changed, 14 insertions(+), 199 deletions(-)
diff --git a/Makefile b/Makefile
index 1257ae7..cc277e2 100644
--- a/Makefile
+++ b/Makefile
@@ -38,218 +38,33 @@ clean:
.PHONY: install clean
# DO NOT DELETE
-cache.o: /usr/include/stdio.h /usr/include/features.h
-cache.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cache.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cache.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cache.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cache.o: /usr/include/_G_config.h /usr/include/wchar.h
-cache.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cache.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cache.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-cache.o: /usr/include/search.h /usr/include/string.h /usr/include/stdlib.h
-cache.o: /usr/include/limits.h
-cache.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cache.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-cache.o: /usr/include/bits/confname.h /usr/include/ctype.h
-cache.o: /usr/include/endian.h /usr/include/bits/endian.h /usr/include/time.h
-cache.o: /usr/include/bits/time.h ./cbtcommon/hash.h ./cbtcommon/list.h
-cache.o: ./cbtcommon/inline.h ./cbtcommon/debug.h /usr/include/sys/types.h
+cache.o: ./cbtcommon/hash.h ./cbtcommon/list.h
+cache.o: ./cbtcommon/inline.h ./cbtcommon/debug.h
cache.o: cache.h cvsps_types.h cvsps.h util.h
-cap.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
-cap.o: /usr/include/gnu/stubs.h
-cap.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cap.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cap.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cap.o: /usr/include/_G_config.h /usr/include/wchar.h
-cap.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cap.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cap.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-cap.o: /usr/include/stdlib.h /usr/include/string.h ./cbtcommon/debug.h
-cap.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/bits/time.h
+cap.o: ./cbtcommon/debug.h
cap.o: ./cbtcommon/inline.h ./cbtcommon/text_util.h cap.h cvs_direct.h
-cvs_direct.o: /usr/include/string.h /usr/include/features.h
-cvs_direct.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cvs_direct.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cvs_direct.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-cvs_direct.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cvs_direct.o: /usr/include/bits/typesizes.h /usr/include/bits/confname.h
-cvs_direct.o: /usr/include/stdlib.h /usr/include/limits.h
-cvs_direct.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cvs_direct.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cvs_direct.o: /usr/include/zlib.h /usr/include/zconf.h
-cvs_direct.o: /usr/include/sys/types.h /usr/include/time.h
-cvs_direct.o: /usr/include/bits/time.h /usr/include/sys/socket.h
-cvs_direct.o: /usr/include/sys/uio.h /usr/include/bits/uio.h
-cvs_direct.o: /usr/include/bits/socket.h /usr/include/bits/sockaddr.h
-cvs_direct.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
-cvs_direct.o: ./cbtcommon/debug.h /usr/include/stdio.h /usr/include/libio.h
-cvs_direct.o: /usr/include/_G_config.h /usr/include/wchar.h
-cvs_direct.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cvs_direct.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+cvs_direct.o: ./cbtcommon/debug.h
cvs_direct.o: ./cbtcommon/inline.h ./cbtcommon/text_util.h
cvs_direct.o: ./cbtcommon/tcpsocket.h ./cbtcommon/sio.h cvs_direct.h util.h
-cvsps.o: /usr/include/stdio.h /usr/include/features.h
-cvsps.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cvsps.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cvsps.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cvsps.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cvsps.o: /usr/include/_G_config.h /usr/include/wchar.h
-cvsps.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cvsps.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cvsps.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-cvsps.o: /usr/include/stdlib.h /usr/include/string.h /usr/include/limits.h
-cvsps.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cvsps.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-cvsps.o: /usr/include/bits/confname.h /usr/include/search.h
-cvsps.o: /usr/include/time.h /usr/include/bits/time.h /usr/include/ctype.h
-cvsps.o: /usr/include/endian.h /usr/include/bits/endian.h
-cvsps.o: /usr/include/sys/stat.h /usr/include/bits/stat.h
-cvsps.o: /usr/include/sys/types.h /usr/include/fcntl.h
-cvsps.o: /usr/include/bits/fcntl.h /usr/include/regex.h
-cvsps.o: /usr/include/sys/wait.h /usr/include/signal.h
-cvsps.o: /usr/include/bits/sigset.h /usr/include/bits/signum.h
-cvsps.o: /usr/include/sys/resource.h /usr/include/bits/resource.h
-cvsps.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
cvsps.o: ./cbtcommon/hash.h ./cbtcommon/list.h ./cbtcommon/inline.h
cvsps.o: ./cbtcommon/list.h ./cbtcommon/text_util.h ./cbtcommon/debug.h
cvsps.o: ./cbtcommon/rcsid.h cache.h cvsps_types.h cvsps.h util.h stats.h
cvsps.o: cap.h cvs_direct.h list_sort.h
-list_sort.o: /usr/include/stdio.h /usr/include/features.h
-list_sort.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-list_sort.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-list_sort.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-list_sort.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-list_sort.o: /usr/include/_G_config.h /usr/include/wchar.h
-list_sort.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-list_sort.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-list_sort.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-list_sort.o: /usr/include/stdlib.h list_sort.h ./cbtcommon/list.h
-stats.o: /usr/include/stdio.h /usr/include/features.h
-stats.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-stats.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-stats.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-stats.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-stats.o: /usr/include/_G_config.h /usr/include/wchar.h
-stats.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-stats.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-stats.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-stats.o: /usr/include/string.h /usr/include/search.h ./cbtcommon/hash.h
+list_sort.o: list_sort.h ./cbtcommon/list.h
+stats.o: ./cbtcommon/hash.h
stats.o: ./cbtcommon/list.h ./cbtcommon/inline.h cvsps_types.h
-stats.o: /usr/include/time.h /usr/include/bits/time.h cvsps.h
-util.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
-util.o: /usr/include/gnu/stubs.h
-util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-util.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-util.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-util.o: /usr/include/_G_config.h /usr/include/wchar.h
-util.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-util.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-util.o: /usr/include/string.h /usr/include/stdlib.h /usr/include/unistd.h
-util.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
-util.o: /usr/include/limits.h
-util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-util.o: /usr/include/assert.h /usr/include/search.h /usr/include/time.h
-util.o: /usr/include/bits/time.h /usr/include/errno.h
-util.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
-util.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h
-util.o: /usr/include/asm-generic/errno-base.h /usr/include/signal.h
-util.o: /usr/include/bits/sigset.h /usr/include/bits/signum.h
-util.o: /usr/include/regex.h /usr/include/sys/types.h /usr/include/sys/stat.h
-util.o: /usr/include/bits/stat.h /usr/include/sys/time.h
-util.o: /usr/include/sys/select.h /usr/include/bits/select.h
-util.o: /usr/include/sys/wait.h /usr/include/sys/resource.h
-util.o: /usr/include/bits/resource.h /usr/include/bits/waitflags.h
-util.o: /usr/include/bits/waitstatus.h ./cbtcommon/debug.h
+stats.o: cvsps.h
+util.o: ./cbtcommon/debug.h
util.o: ./cbtcommon/inline.h util.h
-cbtcommon/debug.o: /usr/include/stdio.h /usr/include/features.h
-cbtcommon/debug.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/debug.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/debug.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/debug.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cbtcommon/debug.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/debug.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/debug.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/debug.o: /usr/include/bits/stdio_lim.h
-cbtcommon/debug.o: /usr/include/bits/sys_errlist.h /usr/include/errno.h
-cbtcommon/debug.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
-cbtcommon/debug.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h
-cbtcommon/debug.o: /usr/include/asm-generic/errno-base.h /usr/include/ctype.h
-cbtcommon/debug.o: /usr/include/endian.h /usr/include/bits/endian.h
-cbtcommon/debug.o: /usr/include/string.h cbtcommon/debug.h
-cbtcommon/debug.o: /usr/include/sys/types.h /usr/include/time.h
-cbtcommon/debug.o: /usr/include/bits/time.h ./cbtcommon/inline.h
+cbtcommon/debug.o: cbtcommon/debug.h
+cbtcommon/debug.o: ./cbtcommon/inline.h
cbtcommon/debug.o: cbtcommon/rcsid.h
-cbtcommon/hash.o: /usr/include/stdio.h /usr/include/features.h
-cbtcommon/hash.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/hash.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/hash.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/hash.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cbtcommon/hash.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/hash.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/hash.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/hash.o: /usr/include/bits/stdio_lim.h
-cbtcommon/hash.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
-cbtcommon/hash.o: /usr/include/string.h cbtcommon/debug.h
-cbtcommon/hash.o: /usr/include/sys/types.h /usr/include/time.h
-cbtcommon/hash.o: /usr/include/bits/time.h ./cbtcommon/inline.h
+cbtcommon/hash.o: cbtcommon/debug.h
+cbtcommon/hash.o: ./cbtcommon/inline.h
cbtcommon/hash.o: cbtcommon/hash.h ./cbtcommon/list.h cbtcommon/rcsid.h
-cbtcommon/sio.o: /usr/include/stdio.h /usr/include/features.h
-cbtcommon/sio.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/sio.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/sio.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/sio.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cbtcommon/sio.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/sio.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/sio.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/sio.o: /usr/include/bits/stdio_lim.h
-cbtcommon/sio.o: /usr/include/bits/sys_errlist.h /usr/include/unistd.h
-cbtcommon/sio.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
-cbtcommon/sio.o: /usr/include/errno.h /usr/include/bits/errno.h
-cbtcommon/sio.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
-cbtcommon/sio.o: /usr/include/asm-generic/errno.h
-cbtcommon/sio.o: /usr/include/asm-generic/errno-base.h cbtcommon/sio.h
+cbtcommon/sio.o: cbtcommon/sio.h
cbtcommon/sio.o: cbtcommon/rcsid.h
-cbtcommon/tcpsocket.o: /usr/include/string.h /usr/include/features.h
-cbtcommon/tcpsocket.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/tcpsocket.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/tcpsocket.o: /usr/include/sys/types.h /usr/include/bits/types.h
-cbtcommon/tcpsocket.o: /usr/include/bits/wordsize.h
-cbtcommon/tcpsocket.o: /usr/include/bits/typesizes.h /usr/include/time.h
-cbtcommon/tcpsocket.o: /usr/include/bits/time.h /usr/include/sys/socket.h
-cbtcommon/tcpsocket.o: /usr/include/sys/uio.h /usr/include/bits/uio.h
-cbtcommon/tcpsocket.o: /usr/include/bits/socket.h /usr/include/limits.h
-cbtcommon/tcpsocket.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cbtcommon/tcpsocket.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h
-cbtcommon/tcpsocket.o: /usr/include/asm/sockios.h /usr/include/netinet/in.h
-cbtcommon/tcpsocket.o: /usr/include/stdint.h /usr/include/bits/wchar.h
-cbtcommon/tcpsocket.o: /usr/include/bits/in.h /usr/include/endian.h
-cbtcommon/tcpsocket.o: /usr/include/bits/endian.h
-cbtcommon/tcpsocket.o: /usr/include/bits/byteswap.h /usr/include/arpa/inet.h
-cbtcommon/tcpsocket.o: /usr/include/netdb.h /usr/include/bits/netdb.h
-cbtcommon/tcpsocket.o: /usr/include/errno.h /usr/include/bits/errno.h
-cbtcommon/tcpsocket.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
-cbtcommon/tcpsocket.o: /usr/include/asm-generic/errno.h
-cbtcommon/tcpsocket.o: /usr/include/asm-generic/errno-base.h
cbtcommon/tcpsocket.o: cbtcommon/tcpsocket.h cbtcommon/debug.h
-cbtcommon/tcpsocket.o: /usr/include/stdio.h /usr/include/libio.h
-cbtcommon/tcpsocket.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/tcpsocket.o: /usr/include/gconv.h
-cbtcommon/tcpsocket.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/tcpsocket.o: /usr/include/bits/stdio_lim.h
-cbtcommon/tcpsocket.o: /usr/include/bits/sys_errlist.h ./cbtcommon/inline.h
+cbtcommon/tcpsocket.o: ./cbtcommon/inline.h
cbtcommon/tcpsocket.o: cbtcommon/rcsid.h
-cbtcommon/text_util.o: /usr/include/ctype.h /usr/include/features.h
-cbtcommon/text_util.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/text_util.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/text_util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/text_util.o: /usr/include/bits/typesizes.h /usr/include/endian.h
-cbtcommon/text_util.o: /usr/include/bits/endian.h /usr/include/string.h
-cbtcommon/text_util.o: /usr/include/stdio.h /usr/include/libio.h
-cbtcommon/text_util.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/text_util.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/text_util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/text_util.o: /usr/include/bits/stdio_lim.h
-cbtcommon/text_util.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
cbtcommon/text_util.o: cbtcommon/text_util.h cbtcommon/rcsid.h
^ permalink raw reply related
* [PATCH 2/4] Trivial compile fix for cache.c
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
In-Reply-To: <20060613043224.16681.98358.stgit@dv.roinet.com>
From: Pavel Roskin <proski@gnu.org>
"tagnames" was renamed to "link", fix the last occurrence of "tagnames".
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
cache.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cache.c b/cache.c
index 409392d..07e5d02 100644
--- a/cache.c
+++ b/cache.c
@@ -501,7 +501,7 @@ static void dump_patch_set(FILE * fp, Pa
struct list_head * tag;
for (tag = ps->tags.next; tag != &ps->tags; tag = tag->next)
{
- TagName* tagname = list_entry (tag, TagName, tagnames);
+ TagName* tagname = list_entry (tag, TagName, link);
fprintf(fp, " %s %d%s", tagname->name, tagname->flags,
(tag->next == &ps->tags) ? "" : ",");
^ permalink raw reply related
* [PATCH 3/4] Use __linux__ conditional, not LINUX.
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
In-Reply-To: <20060613043224.16681.98358.stgit@dv.roinet.com>
From: Pavel Roskin <proski@gnu.org>
__linux__ is defined automatically, LINUX is not.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
cbtcommon/tcpsocket.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
index 27cc13a..a174007 100644
--- a/cbtcommon/tcpsocket.c
+++ b/cbtcommon/tcpsocket.c
@@ -185,14 +185,14 @@ #endif
int
convert_address(long *dest, const char *addr_str)
{
-#ifdef LINUX
+#ifdef __linux__
struct in_addr ip;
#endif
int retval = 0;
char errstr[256];
/* first try converting "numbers and dots" notation */
-#ifdef LINUX
+#ifdef __linux__
if ( inet_aton(addr_str, &ip) )
{
memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
^ permalink raw reply related
* [PATCH 4/4] Use INADDR_NONE instead of -1 to check inet_addr() result
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
In-Reply-To: <20060613043224.16681.98358.stgit@dv.roinet.com>
From: Pavel Roskin <proski@gnu.org>
INADDR_NONE is not equal to -1 on 64-bit systems.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
cbtcommon/tcpsocket.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
index a174007..f31060e 100644
--- a/cbtcommon/tcpsocket.c
+++ b/cbtcommon/tcpsocket.c
@@ -198,7 +198,7 @@ #ifdef __linux__
memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
}
#else
- if ( (*dest = inet_addr(addr_str)) != -1)
+ if ( (*dest = inet_addr(addr_str)) != INADDR_NONE)
{
/* nothing */
}
^ permalink raw reply related
* Re: Collecting cvsps patches
From: Pavel Roskin @ 2006-06-13 4:35 UTC (permalink / raw)
To: Yann Dirson; +Cc: GIT list, cvsps
In-Reply-To: <20060611122746.GB7766@nowhere.earth>
Hi, Yann!
On Sun, 2006-06-11 at 14:27 +0200, Yann Dirson wrote:
> Since there are has been some work done here and there on cvsps, but
> upstream does not seem to have time to issue a new release, I have
> started to collect the patches I found.
That's great news. Thank you! I'm sending four patches - two compile
fixes for recent regressions and two patches fixing DNS resolution on
64-bit systems - one on Linux and the other on other OSes.
--
Regards,
Pavel Roskin
^ permalink raw reply
* Re: cvsps wierdness
From: Robin Rosenberg (list subscriber) @ 2006-06-13 6:06 UTC (permalink / raw)
To: Linus Torvalds; +Cc: git
In-Reply-To: <Pine.LNX.4.64.0606121406200.5498@g5.osdl.org>
måndag 12 juni 2006 23:27 skrev Linus Torvalds:
[...]
> Does this patch fix it for you (untested - it could result in tons of
> other trouble, but it basically just says that time ordering is less
> important than member revision ordering).
Thanks, it worked on the simple case at least. We'll see about the original
full repo later.
>
> I don't think this is strictly correct, btw. I suspect you can still get
> into strange situations where the changeset merging has resulted in one
> file ordering one way, and another file ordering the other way.
Doesn't cvsps's conflict handing simply break up those patches into several
patches? More patches is ok. Suboptimal patches can be accepted
-- robin
^ 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