What's cooking in git.git (May 2011, #13; Mon, 30)

What's cooking in git.git (May 2011, #13; Mon, 30)

[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 main part of this cycle is expected to run thru May, aiming for a
feature freeze in early June.

Week #6 of this cycle is just about to begin.

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

* bc/maint-status-z-to-use-porcelain (2011-05-29) 2 commits
 - builtin/commit.c: set status_format _after_ option parsing
 - t7508: demonstrate status's failure to use --porcelain format with -z

Will cook a bit longer.

* jk/format-patch-am (2011-05-26) 5 commits
  (merged to 'next' on 2011-05-30 at 29d5dac)
 + format-patch: preserve subject newlines with -k
 + clean up calling conventions for pretty.c functions
 + pretty: add pp_commit_easy function for simple callers
 + mailinfo: always clean up rfc822 header folding
 + t: test subject handling in format-patch / am pipeline

Will cook a bit longer.

* jk/maint-remote-mirror-safer (2011-05-26) 1 commit
  (merged to 'next' on 2011-05-30 at dc260ff)
 + remote: allow "-t" with fetch mirrors

Will merge to "master".

* jk/read-in-full-stops-on-error (2011-05-26) 1 commit
  (merged to 'next' on 2011-05-30 at 102a220)
 + read_in_full: always report errors

Will merge to "master".

* ef/maint-win-verify-path (2011-05-27) 3 commits
 - verify_path: consider dos drive prefix
 - real_path: do not assume '/' is the path seperator
 - A Windows path starting with a backslash is absolute

J6t had a reasonable question in the discussion.

* jc/apply-nsbp (2011-05-27) 4 commits
 - War on nbsp: teach "git apply" to check and fix nbsp
 - War on nbsp: Add "nbsp" whitespace breakage class
 - War on nbsp: a bit of retreat
 - ws.c: add a helper to format comma separated messages

Will probably drop.
It was fun to write, though.

* jc/log-quiet-fix (2011-05-28) 1 commit
  (merged to 'next' on 2011-05-30 at dcbdbc0)
 + log: --quiet should serve as synonym to -s

Will merge to "master".

* jk/maint-docs (2011-05-26) 4 commits
  (merged to 'next' on 2011-05-30 at 0ed19d6)
 + docs: fix some antique example output
 + docs: make sure literal "->" isn't converted to arrow
 + docs: update status --porcelain format
 + docs: minor grammar fixes to git-status

Will merge to "master".

* jk/rebase-head-reflog (2011-05-27) 2 commits
  (merged to 'next' on 2011-05-30 at 97f02df)
 + rebase: write a reflog entry when finishing
 + rebase: create HEAD reflog entry when aborting

Will merge to "master".

* jn/gitweb-js-blame (2011-05-27) 3 commits
 - gitweb.js: use setTimeout rather than setInterval in blame_incremental.js
 - gitweb.js: No need for loop in blame_incremental's handleResponse()
 - gitweb.js: No need for inProgress in blame_incremental.js

Will cook a bit longer.

* kk/maint-prefix-in-config-mak (2011-05-27) 1 commit
  (merged to 'next' on 2011-05-30 at 35b8752)
 + config.mak.in: allow "configure --sysconfdir=/else/where"

Will merge to "master".

* ab/i18n-envsubst-doc-fix (2011-05-30) 1 commit
 - git-sh-i18n--envsubst: add SYNOPSIS section to the documentation

Will merge to "next" and then soon to "master".

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

* bc/maint-api-doc-parked (2011-05-26) 1 commit
 + Documentation/technical/api-diff.txt: correct name of diff_unmerge()

* bc/maint-submodule-fix-parked (2011-05-26) 1 commit
 + git-submodule.sh: separate parens by a space to avoid confusing some shells

* jc/notes-batch-removal (2011-05-19) 4 commits
  (merged to 'next' on 2011-05-23 at 5bd78a6)
 + show: --ignore-missing
 + notes remove: --stdin reads from the standard input
 + notes remove: --ignore-missing
 + notes remove: allow removing more than one

* jc/require-work-tree-exists (2011-05-24) 1 commit
  (merged to 'next' on 2011-05-24 at 6dbbf00)
 + require-work-tree wants more than what its name says

Rerolled _without_ any in-tree users, just to make sure that we can easily
adapt scripts when necessary in the future.

* jk/fetch-mark-complete-optimization (2011-05-19) 1 commit
  (merged to 'next' on 2011-05-23 at b56fb81)
 + fetch: avoid repeated commits in mark_complete

Trivially correct.

* jk/haves-from-alternate-odb (2011-05-19) 3 commits
  (merged to 'next' on 2011-05-23 at 53b4735)
 + receive-pack: eliminate duplicate .have refs
 + bisect: refactor sha1_array into a generic sha1 list
 + refactor refs_from_alternate_cb to allow passing extra data

* jm/maint-misc-fix (2011-05-26) 3 commits
 + read_gitfile_gently: use ssize_t to hold read result
 + remove tests of always-false condition
 + rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'

* jn/ctags-more (2011-04-29) 3 commits
  (merged to 'next' on 2011-05-24 at 41b50be)
 + gitweb: Optional grouping of projects by category
 + gitweb: Modularized git_get_project_description to be more generic
 + gitweb: Split git_project_list_body in two functions

* jn/gitweb-js (2011-05-24) 11 commits
  (merged to 'next' on 2011-05-24 at c385b9d)
 + gitweb: Make JavaScript ability to adjust timezones configurable
 + gitweb.js: Add UI for selecting common timezone to display dates
 + gitweb: JavaScript ability to adjust time based on timezone
 + gitweb: Unify the way long timestamp is displayed
 + gitweb: Refactor generating of long dates into format_timestamp_html
 + gitweb.js: Provide getElementsByClassName method (if it not exists)
 + gitweb.js: Introduce code to handle cookies from JavaScript
 + gitweb.js: Extract and improve datetime handling
 + gitweb.js: Provide default values for padding in padLeftStr and padLeft
 + gitweb.js: Update and improve comments in JavaScript files
 + gitweb: Split JavaScript for maintability, combining on build

Rebased on top of a more recent "master" that already has the two bottom
commits in the previous round of series.

As nobody seems to be helping gitweb maintenance, I'll merge the above two
series to "master" and see if anybody screams. That seems to be the only
way to make any progress.

* jn/userdiff-perl-updates (2011-05-23) 8 commits
  (merged to 'next' on 2011-05-23 at 2595ae1)
 + userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters
 + tests: make test_expect_code quieter on success
 + userdiff/perl: catch sub with brace on second line
 + userdiff/perl: match full line of POD headers
 + userdiff/perl: anchor "sub" and "package" patterns on the left
 + t4018 (funcname patterns): minor cleanups
 + t4018 (funcname patterns): make configuration easier to track
 + t4018 (funcname patterns): make .gitattributes state easier to track

* mk/grep-pcre (2011-05-23) 13 commits
  (merged to 'next' on 2011-05-23 at fbd4877)
 + git-grep: Update tests (mainly for -P)
  (merged to 'next' on 2011-05-16 at 0c6c25e)
 + Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
 + git-grep: update tests now regexp type is "last one wins"
  (merged to 'next' on 2011-05-15 at d110135)
 + git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
 + git-grep: Bail out when -P is used with -F or -E
 + grep: Add basic tests
 + configure: Check for libpcre
 + git-grep: Learn PCRE
 + grep: Extract compile_regexp_failed() from compile_regexp()
 + grep: Fix a typo in a comment
  (merged to 'next' on 2011-05-08 at 5d3bede)
 + grep: Put calls to fixmatch() and regmatch() into patmatch()
 + contrib/completion: --line-number to git grep
 + Documentation: Add --line-number to git-grep synopsis

* rg/no-gecos-in-pwent (2011-05-19) 1 commit
  (merged to 'next' on 2011-05-23 at d2c4c33)
 + ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwd

--------------------------------------------------
[Stalled]

* jk/maint-merge-rename-create (2011-03-25) 3 commits
 - merge: turn on rewrite detection
 - merge: handle renames with replacement content
 - t3030: fix accidental success in symlink rename

Peff wanted to reroll this.

* jc/index-pack (2011-02-27) 5 commits
 - index-pack --verify: read anomalous offsets from v2 idx file
 - write_idx_file: need_large_offset() helper function
 - index-pack: --verify
 - write_idx_file: introduce a struct to hold idx customization options
 - index-pack: group the delta-base array entries also by type

Still a WIP. Need to put histogram output into index-pack --verify to
really kill verify-pack.

* jk/tag-contains (2010-07-05) 4 commits
 - Why is "git tag --contains" so slow?
 - default core.clockskew variable to one day
 - limit "contains" traversals based on commit timestamp
 - tag: speed up --contains calculation

The idea of the bottom one is probably Ok, except that the use of object
flags needs to be rethought, or at least the helper needs to be moved to
builtin/tag.c to make it clear that it should not be used outside the
current usage context.

--------------------------------------------------
[Cooking]

* mg/diff-stat-count (2011-05-27) 4 commits
 - diff --stat-count: finishing touches
 - diff-options.txt: describe --stat-{width,name-width,count}
 - diff: introduce --stat-lines to limit the stat lines
 - diff.c: omit hidden entries from namelen calculation with --stat

Will cook a bit longer.

* jc/fmt-req-fix (2011-05-25) 1 commit
  (merged to 'next' on 2011-05-25 at 9f46ca0)
 + userformat_find_requirements(): find requirement for the correct format

Will merge to "master".

* jk/maint-config-alias-fix (2011-05-24) 4 commits
  (merged to 'next' on 2011-05-25 at 25b86e4)
 + handle_options(): do not miscount how many arguments were used
 + config: always parse GIT_CONFIG_PARAMETERS during git_config
 + git_config: don't peek at global config_parameters
 + config: make environment parsing routines static

Will merge to "master".

* jl/read-tree-m-dry-run (2011-05-25) 2 commits
  (merged to 'next' on 2011-05-30 at 42febaf)
 + Teach read-tree the -n|--dry-run option
 + unpack-trees: add the dry_run flag to unpack_trees_options

Will merge to "master".

* da/git-prefix-everywhere (2011-05-26) 3 commits
  (merged to 'next' on 2011-05-30 at 9480900)
 + git-mergetool--lib: Make vimdiff retain the current directory
 + git: Remove handling for GIT_PREFIX
 + setup: Provide GIT_PREFIX to built-ins

Will cook a bit longer.

* jh/receive-count-limit (2011-05-23) 10 commits
 - receive-pack: Allow server to refuse pushes with too many objects
 - pack-objects: Estimate pack size; abort early if pack size limit is exceeded
 - send-pack/receive-pack: Allow server to refuse pushing too large packs
 - pack-objects: Allow --max-pack-size to be used together with --stdout
 - send-pack/receive-pack: Allow server to refuse pushes with too many commits
 - pack-objects: Teach new option --max-commit-count, limiting #commits in pack
 - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities
 - Tighten rules for matching server capabilities in server_supports()
 - send-pack: Attempt to retrieve remote status even if pack-objects fails
 - Update technical docs to reflect side-band-64k capability in receive-pack

Would need another round to separate per-pack and per-session limits.
Not urgent. Will not merge before 1.7.6.

* jc/streaming-filter (2011-05-26) 8 commits
 - t0021: test application of both crlf and ident
 - t0021-conversion.sh: fix NoTerminatingSymbolAtEOF test
 - streaming: filter cascading
 - streaming filter: ident filter
 - Add LF-to-CRLF streaming conversion
 - stream filter: add "no more input" to the filters
 - Add streaming filter API
 - convert.h: move declarations for conversion from cache.h
 (this branch uses jc/streaming.)

Trivial lf-to-crlf and ident conversions can be performed without reading
everything in-core first.

Not urgent. Will not merge before 1.7.6.

* jk/combine-diff-binary-etc (2011-05-24) 5 commits
  (merged to 'next' on 2011-05-24 at 07cf180)
 + combine-diff: respect textconv attributes
 + refactor get_textconv to not require diff_filespec
 + combine-diff: handle binary files as binary
 + combine-diff: calculate mode_differs earlier
 + combine-diff: split header printing into its own function

Not urgent. Will not merge before 1.7.6.

* jc/advice-about-to-lose-commit (2011-05-24) 1 commit
  (merged to 'next' on 2011-05-30 at 42385cc)
 + checkout: make advice when reattaching the HEAD less loud

Not urgent. Will not merge before 1.7.6.

* jc/streaming (2011-05-26) 14 commits
  (merged to 'next' on 2011-05-26 at 7fdda8d)
 + sha1_file: use the correct type (ssize_t, not size_t) for read-style function
  (merged to 'next' on 2011-05-23 at 7fd0b52)
 + streaming: read loose objects incrementally
 + sha1_file.c: expose helpers to read loose objects
 + streaming: read non-delta incrementally from a pack
 + streaming_write_entry(): support files with holes
 + convert: CRLF_INPUT is a no-op in the output codepath
 + streaming_write_entry(): use streaming API in write_entry()
 + streaming: a new API to read from the object store
 + write_entry(): separate two helper functions out
 + unpack_object_header(): make it public
 + sha1_object_info_extended(): hint about objects in delta-base cache
 + sha1_object_info_extended(): expose a bit more info
 + packed_object_info_detail(): do not return a string
 + Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming
 (this branch is used by jc/streaming-filter.)

Not urgent. Will not merge before 1.7.6.

* ab/i18n-scripts (2011-05-21) 48 commits
  (merged to 'next' on 2011-05-23 at 69164a3)
 + i18n: git-bisect bisect_next_check "You need to" message
 + i18n: git-bisect [Y/n] messages
 + i18n: git-bisect bisect_replay + $1 messages
 + i18n: git-bisect bisect_reset + $1 messages
 + i18n: git-bisect bisect_run + $@ messages
 + i18n: git-bisect die + eval_gettext messages
 + i18n: git-bisect die + gettext messages
 + i18n: git-bisect echo + eval_gettext message
 + i18n: git-bisect echo + gettext messages
 + i18n: git-bisect gettext + echo message
 + i18n: git-bisect add git-sh-i18n
 + i18n: git-stash drop_stash say/die messages
 + i18n: git-stash "unknown option" message
 + i18n: git-stash die + eval_gettext $1 messages
 + i18n: git-stash die + eval_gettext $* messages
 + i18n: git-stash die + eval_gettext messages
 + i18n: git-stash die + gettext messages
 + i18n: git-stash say + gettext messages
 + i18n: git-stash echo + gettext message
 + i18n: git-stash add git-sh-i18n
 + i18n: git-submodule "blob" and "submodule" messages
 + i18n: git-submodule "path not initialized" message
 + i18n: git-submodule "[...] path is ignored" message
 + i18n: git-submodule "Entering [...]" message
 + i18n: git-submodule $errmsg messages
 + i18n: git-submodule "Submodule change[...]" messages
 + i18n: git-submodule "cached cannot be used" message
 + i18n: git-submodule $update_module say + die messages
 + i18n: git-submodule die + eval_gettext messages
 + i18n: git-submodule say + eval_gettext messages
 + i18n: git-submodule echo + eval_gettext messages
 + i18n: git-submodule add git-sh-i18n
 + i18n: git-pull eval_gettext + warning message
 + i18n: git-pull eval_gettext + die message
 + i18n: git-pull die messages
 + i18n: git-pull add git-sh-i18n
 + i18n: git-am printf(1) message to eval_gettext
 + i18n: git-am core say messages
 + i18n: git-am "Falling back" say message
 + i18n: git-am "Apply?" message
 + i18n: git-am clean_abort messages
 + i18n: git-am cannot_fallback messages
 + i18n: git-am die messages
 + i18n: git-am gettext + gettext to stderr message
 + i18n: git-am eval_gettext messages
 + i18n: git-am multi-line getttext $msg; echo
 + i18n: git-am one-line gettext $msg; echo
 + i18n: git-am add git-sh-i18n

Rerolled.
Will cook a bit longer.

Re: What's cooking in git.git (May 2011, #13; Mon, 30)

[Ævar Arnfjörð Bjarmason]

On Mon, May 30, 2011 at 10:16, Junio C Hamano <gitster@pobox.com> wrote:

> * ab/i18n-scripts (2011-05-21) 48 commits
>  (merged to 'next' on 2011-05-23 at 69164a3)
> [...]
> Rerolled.
> Will cook a bit longer.

This being ready for master is waiting on Johannes Sixt's patches to
supply a fallback getenv() on Win32.

Johannes, what's the status of that, and is there anything I can do to
help with that?

Re: What's cooking in git.git (May 2011, #13; Mon, 30)

[Johannes Sixt]

Am 5/30/2011 14:08, schrieb Ævar Arnfjörð Bjarmason:
> On Mon, May 30, 2011 at 10:16, Junio C Hamano <gitster@pobox.com> wrote:
> 
>> * ab/i18n-scripts (2011-05-21) 48 commits
>>  (merged to 'next' on 2011-05-23 at 69164a3)
>> [...]
>> Rerolled.
>> Will cook a bit longer.
> 
> This being ready for master is waiting on Johannes Sixt's patches to
> supply a fallback getenv() on Win32.
> 
> Johannes, what's the status of that, and is there anything I can do to
> help with that?

I've started with something I thought would be trivial, but I early
tripped over a pitfall where getenv is asked to look for "PATH", and it is
expected to find "Path" when we only have the latter in the environment.
Sigh. I think that's solvable.

Another worry is that the home-grown getenv is not thread-safe. I think it
does not matter today, but who knows...

Anyway, I've at most an hour of quality git time during the week, so it
will take some time...

-- Hannes

Re: What's cooking in git.git (May 2011, #13; Mon, 30)

[Ævar Arnfjörð Bjarmason]

On Mon, May 30, 2011 at 14:19, Johannes Sixt <j.sixt@viscovery.net> wrote:
> Am 5/30/2011 14:08, schrieb Ævar Arnfjörð Bjarmason:
>> On Mon, May 30, 2011 at 10:16, Junio C Hamano <gitster@pobox.com> wrote:
>>
>>> * ab/i18n-scripts (2011-05-21) 48 commits
>>>  (merged to 'next' on 2011-05-23 at 69164a3)
>>> [...]
>>> Rerolled.
>>> Will cook a bit longer.
>>
>> This being ready for master is waiting on Johannes Sixt's patches to
>> supply a fallback getenv() on Win32.
>>
>> Johannes, what's the status of that, and is there anything I can do to
>> help with that?
>
> I've started with something I thought would be trivial, but I early
> tripped over a pitfall where getenv is asked to look for "PATH", and it is
> expected to find "Path" when we only have the latter in the environment.
> Sigh. I think that's solvable.

Great.

> Another worry is that the home-grown getenv is not thread-safe. I think it
> does not matter today, but who knows...

Doesn't matter for git-sh-i18n--envsubst at least, but if we want to
use it everywhere it might.

We could just start with git-sh-i18n--envsubst and maybe use it for
other stuff later.

> Anyway, I've at most an hour of quality git time during the week, so it
> will take some time...

No problem.

Re: What's cooking in git.git (May 2011, #13; Mon, 30)

[Junio C Hamano]

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> On Mon, May 30, 2011 at 10:16, Junio C Hamano <gitster@pobox.com> wrote:
>
>> * ab/i18n-scripts (2011-05-21) 48 commits
>>  (merged to 'next' on 2011-05-23 at 69164a3)
>> [...]
>> Rerolled.
>> Will cook a bit longer.
>
> This being ready for master is waiting on Johannes Sixt's patches to
> supply a fallback getenv() on Win32.

That getenv thing by itself is actually a non blocker for git.git itself,
as mingw folks fork from my "next" anyway, I think.

I want to cook this a bit longer independently from that issue, as it
touches quite a many files.

Re: What's cooking in git.git (May 2011, #13; Mon, 30)

[Johannes Sixt]

Am 5/30/2011 20:17, schrieb Junio C Hamano:
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> 
>> On Mon, May 30, 2011 at 10:16, Junio C Hamano <gitster@pobox.com> wrote:
>>
>>> * ab/i18n-scripts (2011-05-21) 48 commits
>>>  (merged to 'next' on 2011-05-23 at 69164a3)
>>> [...]
>>> Rerolled.
>>> Will cook a bit longer.
>>
>> This being ready for master is waiting on Johannes Sixt's patches to
>> supply a fallback getenv() on Win32.
> 
> That getenv thing by itself is actually a non blocker for git.git itself,
> as mingw folks fork from my "next" anyway, I think.

Things are not that simple. I think there are (a few) Windows people,
including myself, who follow master[*] and do not depend on an msysgit
release. But as far as I am concerned, I do not mind backing out changes
that break on Windows until a solution is found.

[*] I do include cooking topics where I think that there is a chance that
they break on Windows.

-- Hannes

Re: What's cooking in git.git (May 2011, #13; Mon, 30)

[Junio C Hamano]

Johannes Sixt <j.sixt@viscovery.net> writes:

> ... But as far as I am concerned, I do not mind backing out changes
> that break on Windows until a solution is found.
>
> [*] I do include cooking topics where I think that there is a chance that
> they break on Windows.

Very much appreciated. We want more people to help keeping the tip of
"master" stable by running "next", or selected topics in it that may
affect you in the future, like you do. Hearing that "master" is broken
due to recent merge of topic X is, while better than hearing the same
after the tip of "master" is tagged, a bit saddening, as the reason "next"
exists in the first place is exactly to prevent such accidents by catching
buggy topics while they are in "next".

Thanks.