* Re: [PATCH] send-email: allow sendmail binary to be used instead of SMTP
From: Eric Wong @ 2006-05-15 19:10 UTC (permalink / raw)
To: Martin Langhoff; +Cc: Junio C Hamano, git
In-Reply-To: <46a038f90605150337l3357ce3by22834823eee7b87c@mail.gmail.com>
Martin Langhoff <martin.langhoff@gmail.com> wrote:
> Thanks Eric! git-send-email used to default to using local binaries.
> It was only with the switch to Net::SMTP that the default changed to
> localhost:25.
You're welcome.
That's odd, though, looking at Mail::Sendmail, I don't think it actually
uses the sendmail binary, either. The FAQ
<http://alma.ch/perl/Mail-Sendmail-FAQ.html> confirms this, too.
Of course documentation may be lying and the code I'm looking at may be
*very* well obfuscated :D
--
Eric Wong
^ permalink raw reply
* Re: how to display file history?
From: Linus Torvalds @ 2006-05-15 18:51 UTC (permalink / raw)
To: Marco Costalba; +Cc: Eric W. Biederman, Junio C Hamano, Brown, Len, git
In-Reply-To: <e5bfff550605151132s4605a241sd3132aaeb2de6a39@mail.gmail.com>
On Mon, 15 May 2006, Marco Costalba wrote:
>
> $ git-rev-list --topo-order --after="Apr 10" --before="Apr 11" HEAD |wc
> 14 14 574
> $ git-rev-list --topo-order --boundary --after="Apr 10" --before="Apr
> 11" HEAD |wc
> 18 18 742
>
> Boundary revisions in this case are _not_ passed through search
> filtering. Using --boundary option we get revisions ouside given
> filter range.
Right. And the commit counting is a special filter, and "boundary" is
special in that it doesn't normally honor some other filters (it _does_
honor path-based ones, though, I think).
So you really should see "--boundary" as a heuristic, and as a hack to
help you close the loop on uninteresting commits _faster_. But if
something else has closed it for other reasons, you shouldn't depend on
it.
Linus
^ permalink raw reply
* Re: how to display file history?
From: Marco Costalba @ 2006-05-15 18:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Eric W. Biederman, Junio C Hamano, Brown, Len, git
In-Reply-To: <Pine.LNX.4.64.0605151055080.3866@g5.osdl.org>
On 5/15/06, Linus Torvalds <torvalds@osdl.org> wrote:
>
>
> qgit would seem to prefer to have the commit counting only affect the
> "primary" commits, and not the "boundary" ones at all. Which might be
> sensible, but it's not the semantics it has now.
>
> gitk doesn't care, because it uses the boundary commits just as hints.
>
$ git-rev-list --topo-order --after="Apr 10" --before="Apr 11" HEAD |wc
14 14 574
$ git-rev-list --topo-order --boundary --after="Apr 10" --before="Apr
11" HEAD |wc
18 18 742
Boundary revisions in this case are _not_ passed through search
filtering. Using --boundary option we get revisions ouside given
filter range.
This does not apply to our previous example. So at least --boundary
behaviour it's a little bit inconsistent at the moment.
Marco
^ permalink raw reply
* gateway status?
From: David Lang @ 2006-05-15 18:26 UTC (permalink / raw)
To: git
I seem to remember seeing discussion of gateways to cvs/svn that would let
a project use a git repository and allow clients to use cvs/svn clients to
retreive data.
am I remembering correctly, and are these tools ready for production use?
the popfile project is getting ready to abandon sourceforge and move to
self-hosting, but before I suggest that they use git I need to know the
current status of these projects (I think the ability to export directly
into the other interfaces is a significant advantage)
David Lang
--
There are two ways of constructing a software design. One way is to make it so simple that there are obviously no deficiencies. And the other way is to make it so complicated that there are no obvious deficiencies.
-- C.A.R. Hoare
^ permalink raw reply
* Re: how to display file history?
From: Linus Torvalds @ 2006-05-15 18:03 UTC (permalink / raw)
To: Marco Costalba; +Cc: Eric W. Biederman, Junio C Hamano, Brown, Len, git
In-Reply-To: <e5bfff550605151022m7b9ddcd9y53cd745e16ff6b22@mail.gmail.com>
On Mon, 15 May 2006, Marco Costalba wrote:
>
> Well, it works but the nice boundary circles are not shown, and qgit
> always adds --boundary to command line args to feed git-rev-list, but
> in this case it seems the --boundary option didn't do his job.
Well, it did do it's job, but you expected different counting priorities
than git-rev-list actually gives you.
For the "limit by number" case, the commit counting counts _both_
"primary" commits and "boundary" commits, and will limit the total output
to the number specified.
qgit would seem to prefer to have the commit counting only affect the
"primary" commits, and not the "boundary" ones at all. Which might be
sensible, but it's not the semantics it has now.
gitk doesn't care, because it uses the boundary commits just as hints.
I _think_ gitk is correct here, and qgit is being too strict in its
semantic understanding of what the boundary commits mean. But I think so
mostly because it would actually be pretty hard to do otherwise (ie the
git-rev-list commit counting is largely defined by it's _implementation_,
not necessarily by what you want it to do ;)
Linus
^ permalink raw reply
* Re: how to display file history?
From: J. Bruce Fields @ 2006-05-15 17:55 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: Linus Torvalds, Junio C Hamano, Brown, Len, git
In-Reply-To: <m164k76ylb.fsf@ebiederm.dsl.xmission.com>
On Mon, May 15, 2006 at 10:29:20AM -0600, Eric W. Biederman wrote:
> Sure. If it gets included in a tutorial is great, but existing
> users aren't likely to read through a tutorial if they think they
> know what is going on.
>
> Having it documented in the man pages (i.e. the reference
> documentation) which is where people look to check up on the fine
> points of a command is more likely to matter.
Looks like the current git-log man page refers you to the git-rev-list
page for that, and the use of path names is documented there.
I think that's a pretty reasonable approach for reference
documentation, which should be concise. Duplicating the git-rev-list
documentation (even some of it) to every man page to which it's relevant
would add a lot of text.
The current git-log man page is misleading, though--it suggests that
git-log accepts (and git-rev-list documents) only options, which might
discourage a reader from tracking down information about non-option
arguments.
I also agree about the tutorial--the "Keeping track of history" section
would be a good place to introduce this and git-grep with some fun
examples. It's on my todo list, but may take a while, so maybe someone
else can beat me to it....
--b.
^ permalink raw reply
* RE: how to display file history?
From: Linus Torvalds @ 2006-05-15 17:54 UTC (permalink / raw)
To: Brown, Len; +Cc: Junio C Hamano, git
In-Reply-To: <CFF307C98FEABE47A452B27C06B85BB670FB0A@hdsmsx411.amr.corp.intel.com>
On Mon, 15 May 2006, Brown, Len wrote:
>
> > git log --stat -- A
>
> very handy indeed.
>
> I was surprised on initial use that --stat is
> limited to the file specified in "A" and doesn't
> expand to describe the entire commit that touches "A".
> (ie. the stat output is a subset of what is associated
> with the displayed commit comments).
>
> This, of course, is clear now, it just isn't what
> I expected on first use.
Well, you can obviously have your cake and eat it too (ie "--full-diff").
I don't often end up using the "--full-diff" thing. It's almost never
actually worth it until I find the diff that I actually start caring
about, and the full diff just makes it harder to see the part I explicitly
told git I was interested in.
So the default "show only diffs for the files asked for" behaviour is in
my opinion much superior (and it used to be the only one), because the
"show the whole thing" part ends up being something you use only once
you've already skimmed the default case and decide to go deeper.
Of course, "gitk" ends up using the full diff by default in its diff
window. I'm not convinced that's the right thing, but usually when I use
gitk I'm primarily looking at the history and the commit messages to
decide if it's a relevant one, not the diff, so I don't think it matters.
Linus
^ permalink raw reply
* [PATCH] pack-object: slightly more efficient
From: Nicolas Pitre @ 2006-05-15 17:47 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Avoid creating a delta index for objects with maximum depth since they
are not going to be used as delta base anyway. This also reduce peak
memory usage slightly as the current object's delta index is not useful
until the next object in the loop is considered for deltification. This
saves a bit more than 1% on CPU usage.
Signed-off-by: Nicolas Pitre <nico@cam.org>
---
diff --git a/delta.h b/delta.h
index 727ae30..7b3f86d 100644
--- a/delta.h
+++ b/delta.h
@@ -18,6 +18,8 @@ create_delta_index(const void *buf, unsi
/*
* free_delta_index: free the index created by create_delta_index()
+ *
+ * Given pointer must be what create_delta_index() returned, or NULL.
*/
extern void free_delta_index(struct delta_index *index);
diff --git a/pack-objects.c b/pack-objects.c
index b0388d7..9daf1c1 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -1104,17 +1104,14 @@ static void find_deltas(struct object_en
if (entry->size < 50)
continue;
- if (n->index)
- free_delta_index(n->index);
+ free_delta_index(n->index);
+ n->index = NULL;
free(n->data);
n->entry = entry;
n->data = read_sha1_file(entry->sha1, type, &size);
if (size != entry->size)
die("object %s inconsistent object length (%lu vs %lu)",
sha1_to_hex(entry->sha1), size, entry->size);
- n->index = create_delta_index(n->data, size);
- if (!n->index)
- die("out of memory");
j = window;
while (--j > 0) {
@@ -1134,6 +1131,11 @@ static void find_deltas(struct object_en
*/
if (entry->delta && depth <= entry->depth)
continue;
+
+ n->index = create_delta_index(n->data, size);
+ if (!n->index)
+ die("out of memory");
+
idx++;
if (idx >= window)
idx = 0;
@@ -1143,8 +1145,7 @@ static void find_deltas(struct object_en
fputc('\n', stderr);
for (i = 0; i < window; ++i) {
- if (array[i].index)
- free_delta_index(array[i].index);
+ free_delta_index(array[i].index);
free(array[i].data);
}
free(array);
^ permalink raw reply related
* RE: how to display file history?
From: Brown, Len @ 2006-05-15 17:24 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
> git log --stat -- A
very handy indeed.
I was surprised on initial use that --stat is
limited to the file specified in "A" and doesn't
expand to describe the entire commit that touches "A".
(ie. the stat output is a subset of what is associated
with the displayed commit comments).
This, of course, is clear now, it just isn't what
I expected on first use.
thanks,
-Len
^ permalink raw reply
* git lines of code
From: Marco Costalba @ 2006-05-15 17:33 UTC (permalink / raw)
To: git
I have run a code lines counter utility on today git tree.
Detailed results are here:
http://digilander.libero.it/mcostalba/git_loc.htm
Summary is git have almost 57.000 lines of code (no blank lines, no
comments), not bad for a stupid content tracker. :-)
Marco
^ permalink raw reply
* Re: how to display file history?
From: Marco Costalba @ 2006-05-15 17:22 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Eric W. Biederman, Junio C Hamano, Brown, Len, git
In-Reply-To: <Pine.LNX.4.64.0605150900510.3866@g5.osdl.org>
>
> So
>
> gitk --all --since=1.month -15 -- t/
>
> will show at most fifteen commits from _any_ branch that changed the
> test subdirectory in the last month.
>
> And yeah, maybe that isn't a very interesting query, but it's easy to
> explain and understand, so it's worth explaining early.
>
> And it should be equally obvious to everybody that if it works for "gitk",
> that means that it works for "qgit", "git log" and "git whatchanged" too,
For qgit it doesn't work :-)
Well, it works but the nice boundary circles are not shown, and qgit
always adds --boundary to command line args to feed git-rev-list, but
in this case it seems the --boundary option didn't do his job.
$git-rev-list --topo-order --boundary --parents --all --since=1.month -15 -- t/
ea892b27b15fbc46a3bb3ad2ddce737dc6590ae5
b0121fb3f279a9cf13aff9da060e742aef3a83fa
8d48ad62a902556b523ee892a3fbe4206d576d3f
8d48ad62a902556b523ee892a3fbe4206d576d3f
2c49009dbe98a26505891d3c680da73baf0b4f81
d14f776402d9f7040cc71ff6e3b992b2e019526a
b0121fb3f279a9cf13aff9da060e742aef3a83fa
7f498065e9bf85f6f3e954ec57dedf56fec29e01
6bd20358a9b831b3b545284188871bc844245c25
6bd20358a9b831b3b545284188871bc844245c25
9af0b8dbe2fb252262412a11254e2bcc6ffb87bb
7f498065e9bf85f6f3e954ec57dedf56fec29e01
c2b9e6994d044b218e59abf6d19f7751c4aa13e3
dd05ea1799656024a45017238bbd4857b5256370
c2b9e6994d044b218e59abf6d19f7751c4aa13e3
aadc81c13bbb103e7db759ba9a98a6f9509831f1
bd886fd3ea49b726493255d4adf5d20b31681713
aadc81c13bbb103e7db759ba9a98a6f9509831f1
42d0ee8302c361a0e3bde7bc59858eda94bc13a4
22293b9c41778bb60f3b07355e1b8e421a503702
2c49009dbe98a26505891d3c680da73baf0b4f81
143f4d94c6e2188a6bedfdfa268e66b579e3fbf9
dd05ea1799656024a45017238bbd4857b5256370
dd05ea1799656024a45017238bbd4857b5256370
fd60acaced6de16ebfb66959067e2b29f99a133e
143f4d94c6e2188a6bedfdfa268e66b579e3fbf9
2fc240a7b21c060529c1d2e19d6b483361f81f2a
22293b9c41778bb60f3b07355e1b8e421a503702
22293b9c41778bb60f3b07355e1b8e421a503702
83e77a25dc194933c0fb7908ab6d9fb84a5045e2
83e77a25dc194933c0fb7908ab6d9fb84a5045e2
2fa9a0fb31cbf01e8318a02c3e222d7fd3fd0a83
2fc240a7b21c060529c1d2e19d6b483361f81f2a
fd60acaced6de16ebfb66959067e2b29f99a133e
42d0ee8302c361a0e3bde7bc59858eda94bc13a4
42d0ee8302c361a0e3bde7bc59858eda94bc13a4
2fa9a0fb31cbf01e8318a02c3e222d7fd3fd0a83
fd60acaced6de16ebfb66959067e2b29f99a133e
bd886fd3ea49b726493255d4adf5d20b31681713
cf9dc65368113caa28f2829e2ada5477fbb031ec
Marco
^ permalink raw reply
* Re: The git newbie experience
From: Carl Baldwin @ 2006-05-15 16:46 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Shawn Pearce, Tommi Virtanen, git
In-Reply-To: <7v1wuvvg0j.fsf@assigned-by-dhcp.cox.net>
Junio,
This seems a lot like what I tried to do with git-undo/git-redo quite a
while back.
My implementation actually wrote the working file state into the object
store as a tree and stored a reference to the tree under something like
.git/refs/undo (or .git/refs/stash). Redo was a simple merge of this
tree back onto the current working files.
I think I would like something like this better than the 'generate
binary patch and reapply the patch later.
If these commands were added to git I think they would be better if the
commands chose a temporary branch name, committed the current state to
that branch and did everything else that someone more experienced would
do using branches having chosen a temporary branch name.
The redo or unstash operation could just pick the most recent tempory
branch name (top of stack) and merge changes into the working copy.
Carl
On Mon, May 15, 2006 at 01:39:08AM -0700, Junio C Hamano wrote:
> Shawn Pearce <spearce@spearce.org> writes:
>
> >> I'd rather do that with a diff file that can be used to do a
> >> 3-way (see how rebase does it with --full-index diff with am -3).
> >> No point creating and forgetting to remove a throw away branch
> >> and getting more complaints.
> >
> > How is a quick stash different from a topic branch?
>
> The original version of my message in response to TV looked like
> this.
>
> - Jack is a beginning user of git and does not (want to) understand
> the index (right now).
>
> - Jack works on branch X, say his HEAD points to X1. He has an edited,
> uncommitted files with the names A, B and C.
>
> - Jack wants to pull new changes made by others to his branch.
> But "git merge" invoked from "git pull" says he needs to stash
> away the local changes to do the merge.
>
> - Jack stashes away what he has been working on and cleans up
> his mess.
>
> git checkout -b stash ;# risks error when "stash" exists
> git commit -a -m 'Stashing WIP'
> git checkout master ;# assuming that was where he was
>
> - Jack then pulls. There are merge conflicts in files D, E, ..., Z.
>
> - Jack resolves the merge conflicts and is ready to commit the resulting
> merge. Note files A, B and C do not have his unfinished work.
>
> There is no "if Jack does this or that" problem; he says "git
> commit -a" because that is the only "commit" command he knows
> about.
>
> - Jack then reapplies what he stashed away, and keeps working.
>
> git pull . --no-commit stash
> git branch -D stash
>
> You have to teach the new user to (1) name something, only to
> immediately discard it when he returns to what he was in the
> middle of, (2) remember to clean up the temporary thing once he
> is done lest he forgets to clean it up (and common names like
> "stash", "tmp" will be reused by accident causing grief next
> time he needs to do another stash), and (3) use of --no-commit
> pull.
>
> On the other hand, "git stash/unstash" workflow would be quite
> simple:
>
> $ git stash >my.precious.state
> ... do whatever you want to deviate to
> $ git unstash <my.precious.state
>
> Merge resolve might be needed while unstashing, but
> we are talking about pulling somebody else's work in "do
> whatever" part, so that is something the user knows how to
> perform anyway.
>
> A quick and dirty stash implementation would go like this:
>
> Stash is easy.
>
> #!/bin/sh
> # git stash
> git diff --binary HEAD
> git reset --hard
>
> Unstash is a bit involved.
>
> #!/bin/sh
> # git unstash
> . git-sh-setup
> O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
> O_DIR=`cd "$GIT_DIR" && pwd`
> stash="$O_DIR/.stash$$"
> rm -fr "$stash.*"
> trap 'rm -rf $stash.*' 0
> cat >"$stash.patch"
> git-apply -z --index-info <"$stash.patch" >"$stash.list"
> GIT_INDEX_FILE="$stash.index" \
> GIT_OBJECT_DIRECTORY="$O_OBJECT" \
> (
> mkdir -p "$stash.tmp" &&
> git-update-index -z --index-info <"$stash.list" &&
> git-write-tree >"$stash.base" &&
> cd "$stash.tmp" &&
> git-apply --binary --index <"$stash.patch" &&
> git-write-tree >"$stash.his"
> )
> his_tree=$(cat "$stash.his")
> orig_tree=$(cat "$stash.base")
> rm -fr "$stash.*"
> git-merge-resolve $orig_tree -- HEAD $his_tree
>
> This is essentially the core of "am -3" logic; if you are going
> to use this for real, you would probably want to see if the
> patch applies cleanly before falling back on the three-way
> merge, though.
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Carl Baldwin RADCAD (R&D CAD)
Hewlett Packard Company
MS 88 work: 970 898-1523
3404 E. Harmony Rd. work: Carl.N.Baldwin@hp.com
Fort Collins, CO 80525 home: Carl@ecBaldwin.net
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
^ permalink raw reply
* Re: how to display file history?
From: Linus Torvalds @ 2006-05-15 16:45 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: Junio C Hamano, Brown, Len, git
In-Reply-To: <m164k76ylb.fsf@ebiederm.dsl.xmission.com>
On Mon, 15 May 2006, Eric W. Biederman wrote:
>
> Having it documented in the man pages (i.e. the reference
> documentation) which is where people look to check up on the fine
> points of a command is more likely to matter.
Somehow I really doubt that.
Check out the current man-page for "git log" or "git whatchanged".
In particular, check the "examples" section.
Yes, it's right there. And no, people apparently don't read the man-pages.
Linus
^ permalink raw reply
* Re: how to display file history?
From: Eric W. Biederman @ 2006-05-15 16:29 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Junio C Hamano, Brown, Len, git
In-Reply-To: <Pine.LNX.4.64.0605150900510.3866@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
> On Mon, 15 May 2006, Eric W. Biederman wrote:
>>
>> So that it has a chance of being remembered, and eventually fixed
>> the man pages of git-whatchanged and git-log only sort of tell you
>> that this is even possible.
>
> I don't think this is a man-page issue. I think this is a very basic
> tutorial issue.
>
> People still don't seem to realize how flexible (and powerful) the git
> revision specifications are. It's not just limiting by path, all of these
> work on _all_ of the "history tools" (whether they be gitk, qgit, "git
> log", "git whatchanged" or your own home-cooked stuff):
>
> - "revision based limiting"
>
> "a..b", but also "a ^b ^c ^d" or "a --not b c d" for the more
> complex case where you're interested in one (or more) commit, but
> not anything that flows from any of a number of other commits.
>
> "--all".
>
> - "commit date based limiting"
>
> "--since=2.weeks.ago" "--since=aug.5th"
>
> - "limit by number of hits"
>
> "-15"
>
> - "limit by type or state"
>
> "--no-merges" and "--unpacked"
>
> And finally
>
> - "limit by pathname"
>
> and you can combine all of these.
>
> So
>
> gitk --all --since=1.month -15 -- t/
>
> will show at most fifteen commits from _any_ branch that changed the
> test subdirectory in the last month.
>
> And yeah, maybe that isn't a very interesting query, but it's easy to
> explain and understand, so it's worth explaining early.
>
> And it should be equally obvious to everybody that if it works for "gitk",
> that means that it works for "qgit", "git log" and "git whatchanged" too,
> ie this is a very core concept, and not just some tacked-on thing for one
> special tool.
Sure. If it gets included in a tutorial is great, but existing
users aren't likely to read through a tutorial if they think they
know what is going on.
Having it documented in the man pages (i.e. the reference
documentation) which is where people look to check up on the fine
points of a command is more likely to matter. Plus it doesn't
take any creativity to write a man page you just need to describe
what is, which makes man-pages easier to write than documentation
where you aren't certain of who your audience is.
Since it isn't specific to one command we probably need to document
the query limiting in a single file like the diff options are
and then just included it in all of the different man pages.
But regardless of where we put it, it needs to be documented someplace
besides in the email so you don't need to read the code to see that
the option is there.
Eric
^ permalink raw reply
* Re: [PATCH] send-email: allow sendmail binary to be used instead of SMTP
From: Junio C Hamano @ 2006-05-15 16:25 UTC (permalink / raw)
To: Martin Langhoff; +Cc: Eric Wong, Junio C Hamano, git
In-Reply-To: <46a038f90605150337l3357ce3by22834823eee7b87c@mail.gmail.com>
"Martin Langhoff" <martin.langhoff@gmail.com> writes:
> On 5/15/06, Eric Wong <normalperson@yhbt.net> wrote:
>> Junio C Hamano <junkio@cox.net> wrote:
>> > I am not opposed to have an option to run a local submission
>> > agent binary (I said I like that if(){}else{} there, didn't I?).
>> > The ability to do so is a good thing. I am not however sure
>> > about changing the default when no option is specified on the
>> > command line.
>>
>> By "I believe this is what Martin wanted", I meant changing the default to
>> sendmail: <46a038f90604271804j195d62f3x93ae816e809f4ffd@mail.gmail.com>
>>
>> > Oh, it should just work with sendmail if it's there and we don't
>
> Thanks Eric! git-send-email used to default to using local binaries.
> It was only with the switch to Net::SMTP that the default changed to
> localhost:25.
Thanks, and I think it makes sense.
^ permalink raw reply
* Re: how to display file history?
From: Linus Torvalds @ 2006-05-15 16:15 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: Junio C Hamano, Brown, Len, git
In-Reply-To: <m1ejyv7077.fsf@ebiederm.dsl.xmission.com>
On Mon, 15 May 2006, Eric W. Biederman wrote:
>
> So that it has a chance of being remembered, and eventually fixed
> the man pages of git-whatchanged and git-log only sort of tell you
> that this is even possible.
I don't think this is a man-page issue. I think this is a very basic
tutorial issue.
People still don't seem to realize how flexible (and powerful) the git
revision specifications are. It's not just limiting by path, all of these
work on _all_ of the "history tools" (whether they be gitk, qgit, "git
log", "git whatchanged" or your own home-cooked stuff):
- "revision based limiting"
"a..b", but also "a ^b ^c ^d" or "a --not b c d" for the more
complex case where you're interested in one (or more) commit, but
not anything that flows from any of a number of other commits.
"--all".
- "commit date based limiting"
"--since=2.weeks.ago" "--since=aug.5th"
- "limit by number of hits"
"-15"
- "limit by type or state"
"--no-merges" and "--unpacked"
And finally
- "limit by pathname"
and you can combine all of these.
So
gitk --all --since=1.month -15 -- t/
will show at most fifteen commits from _any_ branch that changed the
test subdirectory in the last month.
And yeah, maybe that isn't a very interesting query, but it's easy to
explain and understand, so it's worth explaining early.
And it should be equally obvious to everybody that if it works for "gitk",
that means that it works for "qgit", "git log" and "git whatchanged" too,
ie this is a very core concept, and not just some tacked-on thing for one
special tool.
Linus
^ permalink raw reply
* Re: 1.3.2.gde1d fails to build on OpenBSD
From: Linus Torvalds @ 2006-05-15 16:00 UTC (permalink / raw)
To: Randal L. Schwartz; +Cc: git
In-Reply-To: <86psiftlgf.fsf@blue.stonehenge.com>
On Mon, 15 May 2006, Randal L. Schwartz wrote:
>
> GIT_VERSION = 1.3.2.gde1d
> gcc -o sha1_file.o -c -g -O2 -Wall -I/usr/local/include -DSHA1_HEADER='<openssl/sha.h>' -DNO_STRCASESTR sha1_file.c
> sha1_file.c:16:20: stdint.h: No such file or directory
> gmake: *** [sha1_file.o] Error 1
>
> I think you want
>
> #include <sys/types.h>
>
> on OpenBSD.
Gaah. This was one reason why I absolutely _detested_ those "intXX_t"
types historically. I thought the world had gotten over it, and they were
all so common and standard that we'd never need to worry about it.
Randal: we already _do_ include <sys/types.h>, as part of the standard set
of headers in git-compat-util.h.
So the problem is that that wasn't enough on OS X, which wanted
<stdint.h>.
Junio: I'd suggest just using "unsigned int", or just defining your own
types in "cache.h". I would suggest
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
typedef signed char s8;
typedef short s16;
typedef int s32;
which is the only sane way to avoid idiotic crap like autoconf, and which
avoids that whole "standard namespace" issue.
Yeah, some people will complain. Ten years later, they _still_ complain
about me doing this right in the kernel. But you can sleep well, knowing
that the complainers are standards-weenies that have read books, but never
seen the real world.
Linus
^ permalink raw reply
* Re: 1.3.2.gde1d fails to build on OpenBSD
From: Randal L. Schwartz @ 2006-05-15 15:57 UTC (permalink / raw)
To: Timo Hirvonen; +Cc: git
In-Reply-To: <20060515185819.ff05f6fe.tihirvon@gmail.com>
>>>>> "Timo" == Timo Hirvonen <tihirvon@gmail.com> writes:
>> I think you want
>>
>> #include <sys/types.h>
>>
>> on OpenBSD.
Timo> I think it should be #include <inttypes.h>. It works at least on BSD
Timo> and Linux.
Yes, that's present in OpenBSD.
--
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!
^ permalink raw reply
* Re: 1.3.2.gde1d fails to build on OpenBSD
From: Timo Hirvonen @ 2006-05-15 15:58 UTC (permalink / raw)
To: merlyn; +Cc: git
In-Reply-To: <86psiftlgf.fsf@blue.stonehenge.com>
merlyn@stonehenge.com (Randal L. Schwartz) wrote:
>
> GIT_VERSION = 1.3.2.gde1d
> gcc -o sha1_file.o -c -g -O2 -Wall -I/usr/local/include -DSHA1_HEADER='<openssl/sha.h>' -DNO_STRCASESTR sha1_file.c
> sha1_file.c:16:20: stdint.h: No such file or directory
> gmake: *** [sha1_file.o] Error 1
>
> I think you want
>
> #include <sys/types.h>
>
> on OpenBSD.
I think it should be #include <inttypes.h>. It works at least on BSD
and Linux.
--
http://onion.dynserv.net/~timo/
^ permalink raw reply
* Re: how to display file history?
From: Eric W. Biederman @ 2006-05-15 15:54 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Brown, Len, git
In-Reply-To: <7v64k7wzzf.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> writes:
> "Brown, Len" <len.brown@intel.com> writes:
>
>>
>>> git whatchanged A
>>
>> thanks. I've used this on entire repos before, but
>> for some reason didn't think of this command name
>> when looking for individual file history.
>
> Probably with recent enough git, one of
>
> git log --stat -- A
> git log -p -- A
> git log -p --full-diff -- A
>
> might be more pleasant, depending on what you are trying to look
> for.
>
> "A" can be a single file, more than one files, a directory,...
So that it has a chance of being remembered, and eventually fixed
the man pages of git-whatchanged and git-log only sort of tell you
that this is even possible. git-whatchanged is certainly worse,
but I don't think if I didn't know to look for it I could see the
fact that these commands take path names from looking at their
man pages.
Eric
^ permalink raw reply
* [PATCH] simple euristic for further free packing improvements
From: Nicolas Pitre @ 2006-05-15 15:40 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <Pine.LNX.4.64.0605132305580.18071@localhost.localdomain>
Given that the early eviction of objects with maximum delta depth
may exhibit bad packing on its own, why not considering a bias against
deep base objects in try_delta() to mitigate that bad behavior.
This patch adjust the MAX_size allowed for a delta based on the depth of
the base object as well as enabling the early eviction of max depth
objects from the object window. When used separately, those two things
produce slightly better and much worse results respectively. But their
combined effect is a surprising significant packing improvement.
With this really simple patch the GIT repo gets nearly 15% smaller, and
the Linux kernel repo about 5% smaller, with no significantly measurable
CPU usage difference.
Signed-off-by: Nicolas Pitre <nico@cam.org>
---
diff --git a/pack-objects.c b/pack-objects.c
index 523a1c7..b0388d7 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -1038,8 +1038,8 @@ static int try_delta(struct unpacked *tr
/* Now some size filtering euristics. */
size = trg_entry->size;
- max_size = size / 2 - 20;
- if (trg_entry->delta)
+ max_size = (size/2 - 20) / (src_entry->depth + 1);
+ if (trg_entry->delta && trg_entry->delta_size <= max_size)
max_size = trg_entry->delta_size-1;
src_size = src_entry->size;
sizediff = src_size < size ? size - src_size : 0;
@@ -1128,15 +1128,12 @@ static void find_deltas(struct object_en
if (try_delta(n, m, m->index, depth) < 0)
break;
}
-#if 0
/* if we made n a delta, and if n is already at max
* depth, leaving it in the window is pointless. we
* should evict it first.
- * ... in theory only; somehow this makes things worse.
*/
if (entry->delta && depth <= entry->depth)
continue;
-#endif
idx++;
if (idx >= window)
idx = 0;
^ permalink raw reply related
* 1.3.2.gde1d fails to build on OpenBSD
From: Randal L. Schwartz @ 2006-05-15 14:24 UTC (permalink / raw)
To: git
GIT_VERSION = 1.3.2.gde1d
gcc -o sha1_file.o -c -g -O2 -Wall -I/usr/local/include -DSHA1_HEADER='<openssl/sha.h>' -DNO_STRCASESTR sha1_file.c
sha1_file.c:16:20: stdint.h: No such file or directory
gmake: *** [sha1_file.o] Error 1
I think you want
#include <sys/types.h>
on OpenBSD.
--
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!
^ permalink raw reply
* pack-object mystery explained
From: Nicolas Pitre @ 2006-05-15 15:29 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
[-- Attachment #1: Type: TEXT/PLAIN, Size: 7928 bytes --]
As Junio certainly knows since he added it himself, there is some code
currently surrounded with #if 0 ... #endif in pack-objects.c that was
meant to improve delta window usage.
The idea was to _not_ keep any object in the object window which delta
depth reached the maximum depth since it obviously cannot be used as a
base for any further deltification anyway. In doing so the object
window would always be filled only with objects that are not too deep
and therefore increase the possibility for better delta match.
In theory... only.
Because, in practice, doing so produces pack files that are between 20%
to 60% *larger* than without this "optimization".
This is just so counter-intuitive that I wanted to find out why. So I
added a few lines to output the target object sha1, and the sha1 of each
object in the object window as well as the return code from try_delta(),
the object depth and the size of the best delta, something like the
attached patch. Then diffing the output between a run with the code as
is and another run with the "optimization" enabled produce a really
interesting result.
Looking at the diff:
--- /tmp/l1 2006-05-13 22:38:06.000000000 -0400
+++ /tmp/l2 2006-05-13 23:04:53.000000000 -0400
@@ -1255,7 +1255,6 @@
0 src 57cefdea530171c71c72229a85aa0212dedb2c5a depth 5 delta_sz 115
nbdelta = 34 deltasz = 25794
trg f24cfd2b46a65bde53610eecb6998fa615b62363
- 0 src 0b90fb9ae3396d0f2b0a9ebf9acad8374f3db317 depth 10 delta_sz 0
1 src 8866189332568a317183f6f895014519515f67e7 depth 9 delta_sz 20146
1 src 4c1b0c3039a84c4c786a09ba70a84df46f995186 depth 8 delta_sz 3357
0 src 226d71966d4a0e8a8611ea09e35719688a987ceb depth 7 delta_sz 3357
@@ -1265,10 +1264,10 @@
0 src e44310f5a8115011eafce41362d1752c4ee0f72f depth 3 delta_sz 1365
0 src b35d400ee1a2e8b5c97ca6ad82f6d91818519456 depth 2 delta_sz 1365
0 src b60fa8d2417c32cf72331e9869d4d3a3208e953f depth 2 delta_sz 1365
+ 0 src 57cefdea530171c71c72229a85aa0212dedb2c5a depth 5 delta_sz 1365
nbdelta = 35 deltasz = 27159
trg 553e1e1749ab537a71c7a1cfb97f18f85dc9ef1f
1 src f24cfd2b46a65bde53610eecb6998fa615b62363 depth 6 delta_sz 990
- 0 src 0b90fb9ae3396d0f2b0a9ebf9acad8374f3db317 depth 10 delta_sz 990
0 src 8866189332568a317183f6f895014519515f67e7 depth 9 delta_sz 990
0 src 4c1b0c3039a84c4c786a09ba70a84df46f995186 depth 8 delta_sz 990
0 src 226d71966d4a0e8a8611ea09e35719688a987ceb depth 7 delta_sz 990
@@ -1277,11 +1276,11 @@
0 src 42b0d59e8c15dff0d72b0d3a486d0248bd767dfe depth 4 delta_sz 248
0 src e44310f5a8115011eafce41362d1752c4ee0f72f depth 3 delta_sz 248
0 src b35d400ee1a2e8b5c97ca6ad82f6d91818519456 depth 2 delta_sz 248
+ 0 src b60fa8d2417c32cf72331e9869d4d3a3208e953f depth 2 delta_sz 248
nbdelta = 36 deltasz = 27407
[...]
So the object that reached a delta depth of 10 is clearly not added to
the window in the second log.
But here's the interesting part:
trg f3c92c971e65e9df72fafdab52b4935866a0a794
- 0 src e85f1c17089a1da95b264909cfc50235c74471da depth 10 delta_sz 0
- 0 src 134d405ba2e6dd41c7501aa9e078a8879ba8025f depth 10 delta_sz 0
- 0 src 6a241aab054a8d6b5c021aba77bba795d7684196 depth 10 delta_sz 0
- 0 src 85cd595802ca565f380a9851efd5a3551c959db0 depth 10 delta_sz 0
- 0 src 89fda42efb678d2f9f9e802454fe561b4452a167 depth 10 delta_sz 0
- 0 src c10067c17ff9eef3ce0f01e5c14ba86bd2273d54 depth 10 delta_sz 0
- 0 src 8e953a67596cf0f5c12f2d8c66055759a7d2201c depth 10 delta_sz 0
1 src 553e1e1749ab537a71c7a1cfb97f18f85dc9ef1f depth 6 delta_sz 6223
0 src f24cfd2b46a65bde53610eecb6998fa615b62363 depth 6 delta_sz 6223
- 0 src 0b90fb9ae3396d0f2b0a9ebf9acad8374f3db317 depth 10 delta_sz 6223
-nbdelta = 44 deltasz = 40076
+ 1 src 8866189332568a317183f6f895014519515f67e7 depth 9 delta_sz 5135
+ 0 src 4c1b0c3039a84c4c786a09ba70a84df46f995186 depth 8 delta_sz 5135
+ 0 src 226d71966d4a0e8a8611ea09e35719688a987ceb depth 7 delta_sz 5135
+ 0 src 78129ec0cd5fb9767caefee8a8dc1a17dc095bdb depth 6 delta_sz 5135
+ 0 src 93a50b4444e3bba210f6879795979d0894ad5aaf depth 5 delta_sz 5135
+ 0 src 42b0d59e8c15dff0d72b0d3a486d0248bd767dfe depth 4 delta_sz 5135
+ 0 src e44310f5a8115011eafce41362d1752c4ee0f72f depth 3 delta_sz 5135
+ 0 src b35d400ee1a2e8b5c97ca6ad82f6d91818519456 depth 2 delta_sz 5135
+nbdelta = 44 deltasz = 38988
trg fe925609b4024119c6171dd32350a6570bea8516
- 1 src f3c92c971e65e9df72fafdab52b4935866a0a794 depth 7 delta_sz 99
- 0 src e85f1c17089a1da95b264909cfc50235c74471da depth 10 delta_sz 99
- 0 src 134d405ba2e6dd41c7501aa9e078a8879ba8025f depth 10 delta_sz 99
- 0 src 6a241aab054a8d6b5c021aba77bba795d7684196 depth 10 delta_sz 99
- 0 src 85cd595802ca565f380a9851efd5a3551c959db0 depth 10 delta_sz 99
- 0 src 89fda42efb678d2f9f9e802454fe561b4452a167 depth 10 delta_sz 99
- 0 src c10067c17ff9eef3ce0f01e5c14ba86bd2273d54 depth 10 delta_sz 99
- 0 src 8e953a67596cf0f5c12f2d8c66055759a7d2201c depth 10 delta_sz 99
- 0 src 553e1e1749ab537a71c7a1cfb97f18f85dc9ef1f depth 6 delta_sz 99
- 0 src f24cfd2b46a65bde53610eecb6998fa615b62363 depth 6 delta_sz 99
-nbdelta = 45 deltasz = 40175
+ 1 src 553e1e1749ab537a71c7a1cfb97f18f85dc9ef1f depth 6 delta_sz 6006
+ 0 src f24cfd2b46a65bde53610eecb6998fa615b62363 depth 6 delta_sz 6006
+ 1 src 8866189332568a317183f6f895014519515f67e7 depth 9 delta_sz 5027
+ 0 src 4c1b0c3039a84c4c786a09ba70a84df46f995186 depth 8 delta_sz 5027
+ 0 src 226d71966d4a0e8a8611ea09e35719688a987ceb depth 7 delta_sz 5027
+ 0 src 78129ec0cd5fb9767caefee8a8dc1a17dc095bdb depth 6 delta_sz 5027
+ 0 src 93a50b4444e3bba210f6879795979d0894ad5aaf depth 5 delta_sz 5027
+ 0 src 42b0d59e8c15dff0d72b0d3a486d0248bd767dfe depth 4 delta_sz 5027
+ 0 src e44310f5a8115011eafce41362d1752c4ee0f72f depth 3 delta_sz 5027
+ 0 src b35d400ee1a2e8b5c97ca6ad82f6d91818519456 depth 2 delta_sz 5027
+nbdelta = 45 deltasz = 44015
[...]
Here we can see that f3c92c97 benefits from a window that has none of
those objects with a depth of 10 so it can find a better delta base.
But in doing so it becomes itself depth 10 and is therefore discarded
from the object window right away. And the unfortunate fact is that
f3c92c97 would have been the best base for the next object (fe925609) by
far with a delta size of 99 bytes instead of 5027 bytes.
And then the story repeats itself for a while since fe925609 also
becomes depth 10 which means the object window doesn't get refreshed as
long as best match are based on 88661893 with a delta size around 5000
bytes instead of 100 bytes if f3c92c97 didn't reach depth 10 initially.
So it is like a priority inversion problem. Instead of evicting max
depth objects early to always have a full window of potential usable
base object to delta against andimprove the delta packing, this early
eviction of objects with max depth may enter a perverse state where the
object window is not recycled with new objects for a while, which is
especially bad if the window content is the source of suboptimal delta
matches. And that perverse state will remain until the delta match
becomes bad enough to break the link with 88661893.
I thought about recording the second best delta base for any object that
reached maximum delta depth and reverting to that base whenever an
object of maximum depth would allow for a delta of greater saving if it
wasn't of max depth already and could be used as a delta base again.
But this quickly gets complicated if we want to retroactively consider
previous objects that didn't constitute a good enough saving to motivate
the switch of given object to its second best base but could benefit
from such a switch if some other objects are making that switch anyway,
and then it would be necessary to make sure not to exceed the depth of
objects already deltified from the object we're considering moving,
etc. In short it gets really twisted for an incertain gain.
But... there is still a way to improve things with a really really
simple euristic...
Nicolas
[-- Attachment #2: Type: TEXT/PLAIN, Size: 1108 bytes --]
diff --git a/pack-objects.c b/pack-objects.c
index 523a1c7..8ff7f30 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -1116,8 +1116,10 @@ static void find_deltas(struct object_en
if (!n->index)
die("out of memory");
+fprintf(stderr, "trg %s\n", sha1_to_hex(entry->sha1));
j = window;
while (--j > 0) {
+ int rc;
unsigned int other_idx = idx + j;
struct unpacked *m;
if (other_idx >= window)
@@ -1125,10 +1127,15 @@ static void find_deltas(struct object_en
m = array + other_idx;
if (!m->entry)
break;
- if (try_delta(n, m, m->index, depth) < 0)
+ rc = try_delta(n, m, m->index, depth);
+fprintf(stderr, "% d src %s depth %d delta_sz %d\n", rc, sha1_to_hex(m->entry->sha1), m->entry->depth, n->entry->delta_size);
+ if (rc < 0)
break;
}
+static int nbdelta=0, deltasz=0;
+if (n->entry->delta) nbdelta++, deltasz += n->entry->delta_size;
+fprintf(stderr, "nbdelta = %d deltasz = %d\n", nbdelta, deltasz);
#if 1
/* if we made n a delta, and if n is already at max
* depth, leaving it in the window is pointless. we
* should evict it first.
^ permalink raw reply related
* Re: how to display file history?
From: Linus Torvalds @ 2006-05-15 15:15 UTC (permalink / raw)
To: Brown, Len; +Cc: git
In-Reply-To: <CFF307C98FEABE47A452B27C06B85BB670F4F8@hdsmsx411.amr.corp.intel.com>
On Mon, 15 May 2006, Brown, Len wrote:
>
> it is tiresome to access kernel.org/git tree display
> to see the list of commits that changed a particular file.
> (and for files on my local disk, this isn't available).
>
> How do I print the list of commits that change a particular file
> on my local disk?
Just do
git whatchanged -p <file>
which has worked pretty much since day one. In fact, it's much better than
that. The "file" can be any abritrary combination of files and/or
directories, and it will track them all at the same time. So
git whatchanged -p arch/ia64 include/asm-ia64
will track the ia64-specific changes.
Newer git versions (ie 1.3.x+) support this in "git log" too (it worked on
older gits, but it was unacceptably slow, so you might as well consider it
"nonworking"). So
git log [-p] <filespec>
is your friend.
Finally, as usual, "gitk" is just a fancier log viewer. So just do
gitk arch/ia64 include/asm-ia64
and enjoy.
You really shouldn't go to gitweb. The history view of gitweb is much less
capable than any local view.
Linus
^ permalink raw reply
* [PATCH] gitk: Display commit messages with word wrap (try 2)
From: Sergey Vlasov @ 2006-05-15 15:13 UTC (permalink / raw)
To: Paul Mackerras; +Cc: git
In-Reply-To: <17511.48749.631725.358279@cargo.ozlabs.ibm.com>
Some people put very long strings into commit messages, which then
become invisible in gitk (word wrapping in the commit details window is
turned off, and there is no horizontal scroll bar). Enabling word wrap
for just the commit message looks much better.
Wrapping is controlled by the "wrapcomment" option in ~/.gitk. By
default this option is set to "none", which disables wrapping; setting
it to "word" enables word wrap for commit messages.
Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
---
gitk | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
The text about the "comment" variable IMHO just does not fit in the
commit message above - if you prefer, I'll just make two separate
patches, the first which leaves the "comment" name in place (ignoring the
fact that the variable is no longer holding the comment text), and the
second which just renames it to "headers".
f23c00577c9a4379c794313f8e54132a159f7f43
diff --git a/gitk b/gitk
index 4aa57c0..8d046af 100755
--- a/gitk
+++ b/gitk
@@ -380,7 +380,7 @@ proc makewindow {} {
global findtype findtypemenu findloc findstring fstring geometry
global entries sha1entry sha1string sha1but
global maincursor textcursor curtextcursor
- global rowctxmenu mergemax
+ global rowctxmenu mergemax wrapcomment
menu .bar
.bar add cascade -label "File" -menu .bar.file
@@ -527,6 +527,7 @@ proc makewindow {} {
pack $ctext -side left -fill both -expand 1
.ctop.cdet add .ctop.cdet.left
+ $ctext tag conf comment -wrap $wrapcomment
$ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
$ctext tag conf hunksep -fore blue
$ctext tag conf d0 -fore red
@@ -696,7 +697,7 @@ proc savestuff {w} {
global stuffsaved findmergefiles maxgraphpct
global maxwidth
global viewname viewfiles viewargs viewperm nextviewnum
- global cmitmode
+ global cmitmode wrapcomment
if {$stuffsaved} return
if {![winfo viewable .]} return
@@ -709,6 +710,7 @@ proc savestuff {w} {
puts $f [list set maxgraphpct $maxgraphpct]
puts $f [list set maxwidth $maxwidth]
puts $f [list set cmitmode $cmitmode]
+ puts $f [list set wrapcomment $wrapcomment]
puts $f "set geometry(width) [winfo width .ctop]"
puts $f "set geometry(height) [winfo height .ctop]"
puts $f "set geometry(canv1) [expr {[winfo width $canv]-2}]"
@@ -3222,11 +3224,11 @@ proc commit_descriptor {p} {
# append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
-proc appendwithlinks {text} {
+proc appendwithlinks {text tags} {
global ctext commitrow linknum curview
set start [$ctext index "end - 1c"]
- $ctext insert end $text
+ $ctext insert end $text $tags
$ctext insert end "\n"
set links [regexp -indices -all -inline {[0-9a-f]{40}} $text]
foreach l $links {
@@ -3354,7 +3356,7 @@ proc selectline {l isnew} {
$ctext insert end "\n"
}
- set comment {}
+ set headers {}
set olds [lindex $parentlist $l]
if {[llength $olds] > 1} {
set np 0
@@ -3365,23 +3367,22 @@ proc selectline {l isnew} {
set tag m$np
}
$ctext insert end "Parent: " $tag
- appendwithlinks [commit_descriptor $p]
+ appendwithlinks [commit_descriptor $p] {}
incr np
}
} else {
foreach p $olds {
- append comment "Parent: [commit_descriptor $p]\n"
+ append headers "Parent: [commit_descriptor $p]\n"
}
}
foreach c [lindex $childlist $l] {
- append comment "Child: [commit_descriptor $c]\n"
+ append headers "Child: [commit_descriptor $c]\n"
}
- append comment "\n"
- append comment [lindex $info 5]
# make anything that looks like a SHA1 ID be a clickable link
- appendwithlinks $comment
+ appendwithlinks $headers {}
+ appendwithlinks [lindex $info 5] {comment}
$ctext tag delete Comments
$ctext tag remove found 1.0 end
@@ -4504,7 +4505,7 @@ proc showtag {tag isnew} {
} else {
set text "Tag: $tag\nId: $tagids($tag)"
}
- appendwithlinks $text
+ appendwithlinks $text {}
$ctext conf -state disabled
init_flist {}
}
@@ -4890,6 +4891,7 @@ set downarrowlen 7
set mingaplen 30
set flistmode "flat"
set cmitmode "patch"
+set wrapcomment "none"
set colors {green red blue magenta darkgrey brown orange}
--
1.3.2.g10c1
^ 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