All of lore.kernel.org
 help / color / mirror / Atom feed
* What's cooking in git.git (May 2011, #11; Tue, 24)
@ 2011-05-24 21:45 Junio C Hamano
  2011-05-25  6:25 ` Johannes Sixt
  2011-05-26  3:28 ` David Aguilar
  0 siblings, 2 replies; 7+ messages in thread
From: Junio C Hamano @ 2011-05-24 21:45 UTC (permalink / raw)
  To: git

What's cooking in git.git (May 2011, #11; Tue, 24)
--------------------------------------------------

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.

We are at the beginning of week #5 of this cycle. Let's plan to tag -rc0
with what is in 'master' at the end of the month.

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

* jc/fix-config-environment-passing (2011-05-24) 1 commit
 - Allow built-ins to also use -c var=val via alias

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

* jl/read-tree-m-dry-run (2011-05-11) 1 commit
 - Teach read-tree the -n|--dry-run option

Waiting for a reroll.

* mg/diff-stat-count (2011-05-03) 2 commits
 - diff-options.txt: describe --stat-{width,name-width,count}
 - diff: introduce --stat-count to limit the stat lines

There was a miscounting spotted.  Need another round.

* 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]

* da/git-prefix-everywhere (2011-05-23) 3 commits
 - git-mergetool--lib: Make vimdiff retain the current directory
 - git: Remove handling for GIT_PREFIX
 - setup: Provide GIT_PREFIX to built-ins

Is everybody happy with this?
Will merge to "next".

* 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.

* 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.

Will merge to "master" by the end of week #5.

* 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.

Will merge to "master" by the end of week #5.

* 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

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.

Will merge to "master" by the end of week #5.

* 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

Will merge to "master" by the end of week #5.

* 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.
Will merge to "master" by the end of week #5.

* 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

Will merge to "master" by the end of week #5.

* 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

Trivially correct and not intrusive, but the real value unknown.
Will merge to "master" by the end of week #5.

* jc/streaming-filter (2011-05-21) 6 commits
 - 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/bigfile, jc/streaming and jc/streaming.)

Trivial lf-to-crlf and ident conversions can be performed without reading
everything in-core first. Cascading is probably still broken.  Will not
merge before 1.7.6.

* 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

Will merge to "master" by the end of week #5.

* jc/git-handle-options-miscount (2011-05-24) 1 commit
 - handle_options(): do not miscount how many arguments were used

Updated with a trivial test, which turned out to uncover an unrelated bug
(see jc/fix-config-environment-passing topic).

* 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

Will merge to "master" by the end of month.

* jc/advice-about-to-lose-commit (2011-05-24) 1 commit
 - checkout: make advice when reattaching the HEAD less loud

Re-rolled and resurrected from "Stalled" status.
Will merge to "next".

* js/log-abbrev-commit-config (2011-05-18) 2 commits
  (merged to 'next' on 2011-05-23 at 4e7e932)
 + Add log.abbrevCommit config variable
 + "git log -h": typofix misspelled 'suppress'

Should be fine after several rounds of reviews.
Will merge to "master" by the middle of week #5.

* jc/streaming (2011-05-20) 13 commits
  (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 and jc/streaming-filter; uses jc/bigfile.)

* jc/bigfile (2011-05-13) 3 commits
  (merged to 'next' on 2011-05-15 at 0ee7144)
 + Bigfile: teach "git add" to send a large file straight to a pack
 + index_fd(): split into two helper functions
 + index_fd(): turn write_object and format_check arguments into one flag
 (this branch is used by jc/streaming and jc/streaming-filter.)

This covers the entry point for a big file to the system. Other parts that
need to know about them are the exit point (i.e. write_entry()), packing
and repacking (as long as bigfilethreshold is sane this should work),
diffs and status (avoid slurping large binary in core only to do nothing,
which we already should), and transport (receive-pack/fetch-pack call
either unpack-objects or index-pack, which still want to hold the full
object in-core and need to be fixed).

Will merge to "master" by the middle of week #5.

* 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.

* 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

Will merge to "master" by the middle of week #5.

--------------------------------------------------
[Discarded]

* hg/add-i-qq (2011-05-17) 1 commit
 . add-interactive: add 'Quit' shortcut to add hunk and quit

The question "why is y+q any more deserving for a short-cut than d+q" was
raised late in the discussion, and I think it a very valid concern.

* jc/add-delete-default (2011-04-27) 1 commit
 . git add: notice removal of tracked paths by default

This is ill-thought out. When the user does want to say "take all changes
into account, not just addition", they can easily say "add -u" (update).

* jc/dotdot-is-parent-directory (2011-05-04) 1 commit
 . specifying ranges: we did not mean to make ".." an empty set

Updated documentation, but I do not feel a strong enough annoyance to push
this forward.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: What's cooking in git.git (May 2011, #11; Tue, 24)
  2011-05-24 21:45 What's cooking in git.git (May 2011, #11; Tue, 24) Junio C Hamano
@ 2011-05-25  6:25 ` Johannes Sixt
  2011-05-25  9:36   ` Ævar Arnfjörð Bjarmason
  2011-05-25 15:04   ` Junio C Hamano
  2011-05-26  3:28 ` David Aguilar
  1 sibling, 2 replies; 7+ messages in thread
From: Johannes Sixt @ 2011-05-25  6:25 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Ævar Arnfjörð Bjarmason

Am 5/24/2011 23:45, schrieb Junio C Hamano:
> * ab/i18n-scripts (2011-05-21) 48 commits
>   (merged to 'next' on 2011-05-23 at 69164a3)
>  ...
> 
> Rerolled.

I see you promoted ab/i18n-scripts-basic to master. What are your plans
with this topic? In its current form, git-submodule breaks in an obvious
way on Windows, and other pitfalls may hide elsewhere.

I don't have enough energy to help out with this issue, particularly
because i18n is not exactly my own itch. Personally, I wouldn't mind the
fate of the topic if there were a NO_GETTEXT switch that simply avoids all
the problems on Windows. Is there such a switch?

-- Hannes

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: What's cooking in git.git (May 2011, #11; Tue, 24)
  2011-05-25  6:25 ` Johannes Sixt
@ 2011-05-25  9:36   ` Ævar Arnfjörð Bjarmason
  2011-05-25 10:29     ` Johannes Sixt
  2011-05-25 15:04   ` Junio C Hamano
  1 sibling, 1 reply; 7+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2011-05-25  9:36 UTC (permalink / raw)
  To: Johannes Sixt; +Cc: Junio C Hamano, git

On Wed, May 25, 2011 at 08:25, Johannes Sixt <j.sixt@viscovery.net> wrote:
> Am 5/24/2011 23:45, schrieb Junio C Hamano:
>> * ab/i18n-scripts (2011-05-21) 48 commits
>>   (merged to 'next' on 2011-05-23 at 69164a3)
>>  ...
>>
>> Rerolled.
>
> I see you promoted ab/i18n-scripts-basic to master. What are your plans
> with this topic? In its current form, git-submodule breaks in an obvious
> way on Windows, and other pitfalls may hide elsewhere.

Aren't you confusing ab/i18n-scripts-basic with ab/i18n-scripts? The
former just adds the infrastructure, the latter adds some eval_gettext
invocations that break on Windows while I haven't submitted some fixup
patches for what's now in *next*, not master.

If anything's breaking on Windows in master it would be the
t/t0201-gettext-fallbacks.sh test which uses some eval_gettext()
calls, but nothing else uses it currently.

> I don't have enough energy to help out with this issue, particularly
> because i18n is not exactly my own itch. Personally, I wouldn't mind the
> fate of the topic if there were a NO_GETTEXT switch that simply avoids all
> the problems on Windows. Is there such a switch?

There isn't and can't be without major re-organizations because
shellscripts don't have something like the C preprocessor.

But I'll just fix the Windows issue soon and submit a new series for
inclusion in next.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: What's cooking in git.git (May 2011, #11; Tue, 24)
  2011-05-25  9:36   ` Ævar Arnfjörð Bjarmason
@ 2011-05-25 10:29     ` Johannes Sixt
  2011-05-25 11:46       ` Ævar Arnfjörð Bjarmason
  0 siblings, 1 reply; 7+ messages in thread
From: Johannes Sixt @ 2011-05-25 10:29 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason; +Cc: Junio C Hamano, git

Am 5/25/2011 11:36, schrieb Ævar Arnfjörð Bjarmason:
> Aren't you confusing ab/i18n-scripts-basic with ab/i18n-scripts?

No, I'm aware of the difference and purposes of the two topics.

>> ... if there were a NO_GETTEXT switch that simply avoids all
>> the problems on Windows. Is there such a switch?
> 
> There isn't and can't be without major re-organizations because
> shellscripts don't have something like the C preprocessor.

Well, we do preprocess the shell scripts. Wouldn't it be a matter of

if test -z '@@NO_GETTEXT@@'
then
	... regular eval_gettext definition ...
else
	... dummy eval_gettext definition ...
fi

with a corresponding extension of the sed script in the Makefile?

> But I'll just fix the Windows issue soon and submit a new series for
> inclusion in next.

Thanks! I just wanted to be sure that ab/i18n-scripts does not end up in
master in a state that leaves Windows in limbo.

-- Hannes

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: What's cooking in git.git (May 2011, #11; Tue, 24)
  2011-05-25 10:29     ` Johannes Sixt
@ 2011-05-25 11:46       ` Ævar Arnfjörð Bjarmason
  0 siblings, 0 replies; 7+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2011-05-25 11:46 UTC (permalink / raw)
  To: Johannes Sixt; +Cc: Junio C Hamano, git

On Wed, May 25, 2011 at 12:29, Johannes Sixt <j.sixt@viscovery.net> wrote:
> Am 5/25/2011 11:36, schrieb Ævar Arnfjörð Bjarmason:

>> But I'll just fix the Windows issue soon and submit a new series for
>> inclusion in next.
>
> Thanks! I just wanted to be sure that ab/i18n-scripts does not end up in
> master in a state that leaves Windows in limbo.

Me neither. I just read from your mail that master was in limbo now.

I'll fix the Windows issues before the i18n-ification of the scripts
lands in master.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: What's cooking in git.git (May 2011, #11; Tue, 24)
  2011-05-25  6:25 ` Johannes Sixt
  2011-05-25  9:36   ` Ævar Arnfjörð Bjarmason
@ 2011-05-25 15:04   ` Junio C Hamano
  1 sibling, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2011-05-25 15:04 UTC (permalink / raw)
  To: Johannes Sixt; +Cc: git, Ævar Arnfjörð Bjarmason

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

> Am 5/24/2011 23:45, schrieb Junio C Hamano:
>> * ab/i18n-scripts (2011-05-21) 48 commits
>>   (merged to 'next' on 2011-05-23 at 69164a3)
>>  ...
>> 
>> Rerolled.
>
> I see you promoted ab/i18n-scripts-basic to master. What are your plans
> with this topic? In its current form, git-submodule breaks in an obvious
> way on Windows, and other pitfalls may hide elsewhere.

The plan is exactly the same as any other topic. Keep in "next" to cook so
that parties that do care can try it out, list the topic in the regular
"What's cooking" message, so that parties that do care have enough chance
to find possible issues before it causes problems to people by hitting
"master". And get annoyed to hear issues only after the topic graduates to
"master". Because somethings things happen, try not to be too upset when
that happens. Instead, help people to fix issues before the release.

At least that has been the plan for me personally.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: What's cooking in git.git (May 2011, #11; Tue, 24)
  2011-05-24 21:45 What's cooking in git.git (May 2011, #11; Tue, 24) Junio C Hamano
  2011-05-25  6:25 ` Johannes Sixt
@ 2011-05-26  3:28 ` David Aguilar
  1 sibling, 0 replies; 7+ messages in thread
From: David Aguilar @ 2011-05-26  3:28 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

On Tue, May 24, 2011 at 02:45:46PM -0700, Junio C Hamano wrote:
> [Cooking]
> 
> * da/git-prefix-everywhere (2011-05-23) 3 commits
>  - git-mergetool--lib: Make vimdiff retain the current directory
>  - git: Remove handling for GIT_PREFIX
>  - setup: Provide GIT_PREFIX to built-ins
> 
> Is everybody happy with this?
> Will merge to "next".

I have v2 of these patches that I'm about to send out.
The three changes were from the original series:

When setup_git_directory_gently() return NULL
set GIT_PREFIX to an empty string.

Avoid #!/bin/sh calling printf with \n in the test.

Resolve GIT_PREFIX unconditionally in mergetool--lib.


I'll be sending the updated patches in a few minutes.
-- 
					David

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2011-05-26  3:28 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-24 21:45 What's cooking in git.git (May 2011, #11; Tue, 24) Junio C Hamano
2011-05-25  6:25 ` Johannes Sixt
2011-05-25  9:36   ` Ævar Arnfjörð Bjarmason
2011-05-25 10:29     ` Johannes Sixt
2011-05-25 11:46       ` Ævar Arnfjörð Bjarmason
2011-05-25 15:04   ` Junio C Hamano
2011-05-26  3:28 ` David Aguilar

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.