What's cooking in git.git (Dec 2008, #02; Sun, 14)

What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Junio C Hamano]

Here are the topics that have been cooking.  Commits prefixed
with '-' are only in 'pu' while commits prefixed with '+' are
in 'next'.

The topics list the commits in reverse chronological order.  The topics
meant to be merged to the maintenance series have "maint-" in their names.

As we have already passed -rc2, things queued in 'next' let alone 'pu' are
unlikely to be merged to 'master' by the end of year unless otherwise
noted.

----------------------------------------------------------------
[New Topics]

* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits
 + Add 'g' command to go to a hunk
 + Add subroutine to display one-line summary of hunks

* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
 - gitweb: cache $parent_commit info in git_blame()
 - gitweb: A bit of code cleanup in git_blame()
 - gitweb: Move 'lineno' id from link to row element in git_blame

I've briefly looked at the resurrection of Ajaxy blame that comes on top
of this series and it looked promising.

* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
 - Add support for a pdf version of the user manual

I do not have a new enough combination of dblatex and asciidoc myself but
this would help interested people.

* np/auto-thread (Sat Dec 13 15:06:40 2008 -0500) 2 commits
 + pack-objects: don't use too many threads with few objects
 + autodetect number of CPUs by default when using threads

* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
 - gitweb: Optional grouping of projects by category
 - gitweb: Split git_project_list_body in two functions
 - gitweb: Modularized git_get_project_description to be more generic

----------------------------------------------------------------
[Post 1.6.1 items]

* gb/gitweb-patch (Sat Dec 6 16:02:35 2008 +0100) 3 commits
 - gitweb: link to patch(es) view from commit and log views
 - gitweb: add patches view
 - gitweb: add patch view

Updated series.  Reviews and Acks?

* lt/reset-merge (Wed Dec 3 18:00:12 2008 -0800) 2 commits
 + Document "git-reset --merge"
 + Add 'merge' mode to 'git reset'

With updated documents.

* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
 . In add --patch, Handle K,k,J,j slightly more gracefully.
 . Add / command in add --patch
 . git-add -i/-p: Change prompt separater from slash to comma

I am still holding onto this earlier topic to add '/' subcommand to allow
finding a hunk with given text, but I'd rather not merge/rebase it on top
of wp/add-p-goto series myself.  Waiting for a reroll.

* cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits
 - mergetool: Don't keep temporary merge files unless told to
 - mergetool: Add prompt to continue after failing to merge a file
 - Add -y/--no-prompt option to mergetool
 - Fix some tab/space inconsistencies in git-mergetool.sh

Updated series.  Waiting for comments from the original author (Ted) and
other interested parties.

----------------------------------------------------------------
[Graduated to "master"]

* jc/rm-i-t-a (Fri Nov 28 19:56:34 2008 -0800) 5 commits
 + git add --intent-to-add: do not let an empty blob be committed by
   accident
 + git add --intent-to-add: fix removal of cached emptiness
 + builtin-rm.c: explain and clarify the "local change" logic
 + Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
 + Extend index to save more flags

As intent-to-add index entry is a new feature for 1.6.1, it probably is a
good idea to merge this to 'master'.  Nitpicks and bugfixes are very much
appreciated.

* jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit
 + gitweb: Fix handling of non-ASCII characters in inserted HTML
   files.

A bugfix.

----------------------------------------------------------------
[Will merge to "master" soon]

What are you looking for?  We are in -rc ;-)

----------------------------------------------------------------
[On Hold]

* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
 + blame: show "previous" information in --porcelain/--incremental
   format
 + git-blame: refactor code to emit "porcelain format" output

* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
 - autoconf: Enable threaded delta search when pthreads are supported

Rebased to 'master', that introduced NO_PTHREADS.

* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits
 - bisect: add "--no-replace" option to bisect without using replace
   refs
 - rev-list: make it possible to disable replacing using "--no-
   bisect-replace"
 - bisect: use "--bisect-replace" options when checking merge bases
 - merge-base: add "--bisect-replace" option to use fixed up revs
 - commit: add "bisect_replace_all" prototype to "commit.h"
 - rev-list: add "--bisect-replace" to list revisions with fixed up
   history
 - Documentation: add "git bisect replace" documentation
 - bisect: add test cases for "git bisect replace"
 - bisect: add "git bisect replace" subcommand

I really hate the idea of introducing a potentially much more useful
replacement of the existing graft mechanism and tie it very tightly to
bisect, making it unusable from outside.

 (1) I do not think "bisect replace" workflow is a practical and usable
     one;

 (2) The underlying mechanism to express "this object replaces that other
     object" is much easier to work with than what the graft does which is
     "the parents of this commit are these", and idea to use the normal
     ref to point at them means this can potentially be used for
     transferring the graft information across repositories, which the
     current graft mechanism cannot do.

 (3) Because I like the aspect (2) of this series so much, it deeply
     disappoints and troubles me that this is implemented minimally near
     the surface, and that it is controlled by the "bisect" Porcelain
     alone, by explicitly passing command line arguments.

I think a mechanism like this should be added to replace grafts, but it
should always be enabled for normal revision traversal operation, while
always disabled for object enumeration and transfer operation (iow, fsck,
fetch and push should use the real ancestry information recorded in the
underlying objects, while rev-list, log, etc. should always use the
replaced objects).  I have a suspicion that even cat-file could honor it.

* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
 - wt-status: show sparse checkout info
 - Introduce default sparse patterns (core.defaultsparse)
 - checkout: add new options to support sparse checkout
 - clone: support sparse checkout with --sparse-checkout option
 - unpack_trees(): add support for sparse checkout
 - unpack_trees(): keep track of unmerged entries
 - Introduce "sparse patterns"
 - Merge branch 'master' into nd/narrow
 + t2104: touch portability fix
 + grep: skip files outside sparse checkout area
 + checkout_entry(): CE_NO_CHECKOUT on checked out entries.
 + Prevent diff machinery from examining worktree outside sparse
   checkout
 + ls-files: Add tests for --sparse and friends
 + update-index: add --checkout/--no-checkout to update
   CE_NO_CHECKOUT bit
 + update-index: refactor mark_valid() in preparation for new options
 + ls-files: add options to support sparse checkout
 + Introduce CE_NO_CHECKOUT bit

Kicked back to 'on hold' until 1.6.1 final by popular demand; will be
dropped from 'next' (see recent discussion on the interaction between the
checkout area and commands such as "grep").

* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits
 - clone: test the new HEAD detection logic
 - Merge commit 'HEAD@{2}' into HEAD
 - upload-pack: send the HEAD information
 - clone: find the current branch more explicitly
 - connect.c::read_extra_info(): find where HEAD points at
 - connect.c::read_extra_info(): prepare to receive more than server
   capabilities
 - get_remote_heads(): refactor code to read "server capabilities"

This is no way meant for 1.6.1, let alone next, yet.

* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit
 - "git push": tellme-more protocol extension

This seems to have a deadlock during communication between the peers.
Someone needs to pick up this topic and resolve the deadlock before it can
continue.

* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
 - diff: enable "too large a rename" warning when -M/-C is explicitly
   asked for

This would be the right thing to do for command line use,
but gitk will be hit due to tcl/tk's limitation, so I am holding
this back for now.

* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
 - git-am --forge: add Signed-off-by: line for the author
 - git-am: clean-up Signed-off-by: lines
 - stripspace: add --log-clean option to clean up signed-off-by:
   lines
 - stripspace: use parse_options()
 - Add "git am -s" test
 - git-am: refactor code to add signed-off-by line for the committer

Re: What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Johannes Schindelin]

Hi,

On Sun, 14 Dec 2008, Junio C Hamano wrote:

> * mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
>  - Add support for a pdf version of the user manual
> 
> I do not have a new enough combination of dblatex and asciidoc myself 
> but this would help interested people.

I haven't had a look at the patches, but isn't "pdflatex" supposed to be 
the common way to get .pdf files from LaTeX sources?

Ciao,
Dscho

Re: What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Jakub Narebski]

Junio C Hamano <gitster@pobox.com> writes:

> ----------------------------------------------------------------
> [New Topics]
> 
> * jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
>  - gitweb: cache $parent_commit info in git_blame()
>  - gitweb: A bit of code cleanup in git_blame()
>  - gitweb: Move 'lineno' id from link to row element in git_blame
> 
> I've briefly looked at the resurrection of Ajaxy blame that comes on top
> of this series and it looked promising.

AJAXy blame in my opinion is not yet ready.  Close, but not yet.
At minimal I'd have to remove or separate the 'time to generate'
patch.

I wonder if it should made into 1.6.1 for the performance improvements
in 'blame' view...
 
> * sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
>  - gitweb: Optional grouping of projects by category
>  - gitweb: Split git_project_list_body in two functions
>  - gitweb: Modularized git_get_project_description to be more generic

It shapes nicely, and I think with one more commit on top (or with
extending topmost commit) we can have categories sorted in given
order, and not hardcoded to always be in alphabetic order.

> ----------------------------------------------------------------
> [Post 1.6.1 items]
> 
> * gb/gitweb-patch (Sat Dec 6 16:02:35 2008 +0100) 3 commits
>  - gitweb: link to patch(es) view from commit and log views
>  - gitweb: add patches view
>  - gitweb: add patch view
> 
> Updated series.  Reviews and Acks?

I'll try to find time to review (and most probably Ack) later today.
 
> ----------------------------------------------------------------
> [Graduated to "master"]
>
> * jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit
>  + gitweb: Fix handling of non-ASCII characters in inserted HTML
>    files.
> 
> A bugfix.

What about

   + gitweb: Fix bug in insert_file() subroutine

Isn't it in the same topic branch?

I am very sorry for buginess of this patch series...

[...] 
> ----------------------------------------------------------------
> [On Hold]
> 
> * jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
>  - git-am --forge: add Signed-off-by: line for the author
>  - git-am: clean-up Signed-off-by: lines
>  - stripspace: add --log-clean option to clean up signed-off-by:
>    lines
>  - stripspace: use parse_options()
>  - Add "git am -s" test
>  - git-am: refactor code to add signed-off-by line for the committer

What happened to this series to be so stale^Wstalled?

-- 
Jakub Narebski
Poland
ShadeHawk on #git

Re: What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Jeff King]

On Sun, Dec 14, 2008 at 11:44:23AM +0100, Johannes Schindelin wrote:

> > * mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
> >  - Add support for a pdf version of the user manual
> > 
> > I do not have a new enough combination of dblatex and asciidoc myself 
> > but this would help interested people.
> 
> I haven't had a look at the patches, but isn't "pdflatex" supposed to be 
> the common way to get .pdf files from LaTeX sources?

But we don't have latex sources; we have docbook sources. Hence dblatex
(which does the conversion to PDF internally, so it is a bit of a
misnomer).

-Peff

Re: What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Jakub Narebski]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> On Sun, 14 Dec 2008, Junio C Hamano wrote:
> 
> > * mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
> >  - Add support for a pdf version of the user manual
> > 
> > I do not have a new enough combination of dblatex and asciidoc myself 
> > but this would help interested people.
> 
> I haven't had a look at the patches, but isn't "pdflatex" supposed to be 
> the common way to get .pdf files from LaTeX sources?

The problem is that AsciiDoc, from what I understand, by itself
generates only XML-ish formats, namely HTML, XHTML and DocBook, and
the rest of formats are generated in postprocessing step by extra
tools from DocBook format:
 * manpages require xmlto
 * info requires docbook2X and makeinfo
 * PDF requires dblatex (db = DocBook), or FOP and xmlto

So the answer is that AsciiDoc does not generate LaTeX, so pdflatex
would be not enough.

By the way, from the AsciiDoc page:

 NOTE: Owning to to other commitments, Benjamin is unable to maintain
       this backend. I don't have the expertise or time to take this
       on consequently the LaTeX backend has not been tested or
       updated since AsciiDoc version 8.2.7 and is currently
       unsupported.

-- 
Jakub Narebski
Poland
ShadeHawk on #git

Re: What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Johannes Schindelin]

Hi,

On Sun, 14 Dec 2008, Jeff King wrote:

> On Sun, Dec 14, 2008 at 11:44:23AM +0100, Johannes Schindelin wrote:
> 
> > > * mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit
> > >  - Add support for a pdf version of the user manual
> > > 
> > > I do not have a new enough combination of dblatex and asciidoc myself 
> > > but this would help interested people.
> > 
> > I haven't had a look at the patches, but isn't "pdflatex" supposed to be 
> > the common way to get .pdf files from LaTeX sources?
> 
> But we don't have latex sources; we have docbook sources. Hence dblatex
> (which does the conversion to PDF internally, so it is a bit of a
> misnomer).

Indeed, I was fooled.

Thanks for the clarification,
Dscho

Re: What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 683 bytes --]

On Sun, Dec 14, 2008 at 03:17:05AM -0800, Jakub Narebski <jnareb@gmail.com> wrote:
> So the answer is that AsciiDoc does not generate LaTeX, so pdflatex
> would be not enough.
> 
> By the way, from the AsciiDoc page:
> 
>  NOTE: Owning to to other commitments, Benjamin is unable to maintain
>        this backend. I don't have the expertise or time to take this
>        on consequently the LaTeX backend has not been tested or
>        updated since AsciiDoc version 8.2.7 and is currently
>        unsupported.

Yes, this is the LaTeX backend, which would allow not to use dblatex,
but generate tex directly from asciidoc. That's why my patch uses
dblatex instead.

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Junio C Hamano]

Jakub Narebski <jnareb@gmail.com> writes:

>> [New Topics]
>> 
>> * jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits
>>  - gitweb: cache $parent_commit info in git_blame()
>>  - gitweb: A bit of code cleanup in git_blame()
>>  - gitweb: Move 'lineno' id from link to row element in git_blame
>
> I wonder if it should made into 1.6.1 for the performance improvements
> in 'blame' view...

Does is addresses a grave bug?  I thought not.

>> [Post 1.6.1 items]
>> 
>> * gb/gitweb-patch (Sat Dec 6 16:02:35 2008 +0100) 3 commits
>> Updated series.  Reviews and Acks?
>
> I'll try to find time to review (and most probably Ack) later today.

Thanks.

>> * jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit
>>  + gitweb: Fix handling of non-ASCII characters in inserted HTML
>>    files.
>> 
>> A bugfix.
>
> What about
>
>    + gitweb: Fix bug in insert_file() subroutine

It already is part of 'master' for some time, isn't it?.

>> * jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
> ...
> What happened to this series to be so stale^Wstalled?

Mostly lack of positive feedbacks which is the same thing as "nobody but
the author is interested'.

Re: What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Daniel Barkalow]

On Sun, 14 Dec 2008, Junio C Hamano wrote:

> [On Hold]
> 
> * nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
>  - wt-status: show sparse checkout info
>  - Introduce default sparse patterns (core.defaultsparse)
>  - checkout: add new options to support sparse checkout
>  - clone: support sparse checkout with --sparse-checkout option
>  - unpack_trees(): add support for sparse checkout
>  - unpack_trees(): keep track of unmerged entries
>  - Introduce "sparse patterns"
>  - Merge branch 'master' into nd/narrow
>  + t2104: touch portability fix
>  + grep: skip files outside sparse checkout area
>  + checkout_entry(): CE_NO_CHECKOUT on checked out entries.
>  + Prevent diff machinery from examining worktree outside sparse
>    checkout

I think this patch (slightly reframed) would be good to have independantly 
of the series; it also means that we won't do weird things if someone 
changes a file in the worktree which is marked as CE_VALID, and may well 
may CE_VALID sufficient for the index representation of paths outside the 
checkout.

	-Daniel
*This .sig left intentionally blank*

Re: What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Nguyen Thai Ngoc Duy]

On 12/16/08, Daniel Barkalow <barkalow@iabervon.org> wrote:
>  >  + grep: skip files outside sparse checkout area
>  >  + Prevent diff machinery from examining worktree outside sparse
>  >    checkout
>
>
> I think this patch (slightly reframed) would be good to have independantly
>  of the series; it also means that we won't do weird things if someone
>  changes a file in the worktree which is marked as CE_VALID, and may well
>  may CE_VALID sufficient for the index representation of paths outside the
>  checkout.

I have made a fixup patch for CE_VALID. Unfortunately I have not had
time to write tests and finish it before submitting. I may have free
time this weekend to complete.
-- 
Duy

Re: What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Junio C Hamano]

Daniel Barkalow <barkalow@iabervon.org> writes:

> On Sun, 14 Dec 2008, Junio C Hamano wrote:
>
>> [On Hold]
>> 
>> * nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
>>  - wt-status: show sparse checkout info
>>  - Introduce default sparse patterns (core.defaultsparse)
>>  - checkout: add new options to support sparse checkout
>>  - clone: support sparse checkout with --sparse-checkout option
>>  - unpack_trees(): add support for sparse checkout
>>  - unpack_trees(): keep track of unmerged entries
>>  - Introduce "sparse patterns"
>>  - Merge branch 'master' into nd/narrow
>>  + t2104: touch portability fix
>>  + grep: skip files outside sparse checkout area
>>  + checkout_entry(): CE_NO_CHECKOUT on checked out entries.
>>  + Prevent diff machinery from examining worktree outside sparse
>>    checkout
>
> I think this patch (slightly reframed) would be good to have independantly 
> of the series; it also means that we won't do weird things if someone 
> changes a file in the worktree which is marked as CE_VALID, and may well 
> may CE_VALID sufficient for the index representation of paths outside the 
> checkout.

It is a bit unclear which one you meant by "this patch", sorry.

Re: What's cooking in git.git (Dec 2008, #02; Sun, 14)

[Daniel Barkalow]

On Mon, 15 Dec 2008, Junio C Hamano wrote:

> Daniel Barkalow <barkalow@iabervon.org> writes:
> 
> > On Sun, 14 Dec 2008, Junio C Hamano wrote:
> >
> >> [On Hold]
> >> 
> >> * nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits
> >>  - wt-status: show sparse checkout info
> >>  - Introduce default sparse patterns (core.defaultsparse)
> >>  - checkout: add new options to support sparse checkout
> >>  - clone: support sparse checkout with --sparse-checkout option
> >>  - unpack_trees(): add support for sparse checkout
> >>  - unpack_trees(): keep track of unmerged entries
> >>  - Introduce "sparse patterns"
> >>  - Merge branch 'master' into nd/narrow
> >>  + t2104: touch portability fix
> >>  + grep: skip files outside sparse checkout area
> >>  + checkout_entry(): CE_NO_CHECKOUT on checked out entries.
> >>  + Prevent diff machinery from examining worktree outside sparse
> >>    checkout
> >
> > I think this patch (slightly reframed) would be good to have independantly 
> > of the series; it also means that we won't do weird things if someone 
> > changes a file in the worktree which is marked as CE_VALID, and may well 
> > may CE_VALID sufficient for the index representation of paths outside the 
> > checkout.
> 
> It is a bit unclear which one you meant by "this patch", sorry.

"Prevent diff machinery from examining worktree outside sparse checkout", 
which (possibly in the next version) will prevent the diff machinery from 
examining worktree files for paths that are CE_VALID in the index.

	-Daniel
*This .sig left intentionally blank*