What's cooking (2011/04 #05)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 895ee5f54b9da5959a1e02fdd449f09b1ad6e0f8..0f6d61480617328bbfdf549b31101b0a06194bbd 100644 (file)
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,9 +1,9 @@
 To: git@vger.kernel.org
-Subject: What's cooking in git.git (Apr 2011, #04; Tue, 12)
-X-master-at: 9db19414582fdb154384ff1ca457cbf9095fef48
-X-next-at: d93e7e3f2508f46a0fb8be7796d959f6c18e83bb
+Subject: What's cooking in git.git (Apr 2011, #05; Tue, 19)
+X-master-at: 6ceb270ce6f65cf4bc2a22830f96e0cc838b3fec
+X-next-at: 63e4ee5f87eede11d1377370c385c26c5b90c6e7
 
-What's cooking in git.git (Apr 2011, #04; Tue, 12)
+What's cooking in git.git (Apr 2011, #05; Tue, 19)
 --------------------------------------------------
 
 Here are the topics that have been cooking.  Commits prefixed with '-' are
@@ -17,6 +17,105 @@ this list.
 --------------------------------------------------
 [New Topics]
 
+* cn/log-parse-opt (2011-04-14) 1 commit
+ - log: convert to parse-options
+
+* rr/rerere-clear-libify (2011-04-13) 1 commit
+ - rerere: Expose an API corresponding to 'clear' functionality
+
+Jonathan had good comments on moving the garbage collection interface as
+well. Perhaps needs a re-roll.
+
+* jk/format-patch-multiline-header (2011-04-14) 1 commit
+ - format-patch: wrap email addresses after long names
+
+* jn/format-patch-doc (2011-04-18) 6 commits
+ - Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
+ - Documentation: publicize hints for sending patches with GMail
+ - Documentation: publicize KMail hints for sending patches inline
+ - Documentation: hints for sending patches inline with Thunderbird
+ - Documentation: explain how to check for patch corruption
+ - Merge v1.7.5-rc2 into jn/format-patch-doc
+ (this branch uses jn/maint-format-patch-doc.)
+
+* jn/gitweb-js (2011-04-15) 13 commits
+ - 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 gitweb/static/js/lib/cookies.js
+ - 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
+ - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
+ - git-instaweb: Simplify build dependency on gitweb
+
+* jn/maint-format-patch-doc (2011-04-14) 1 commit
+ - Documentation: describe the format of messages with inline patches
+ (this branch is used by jn/format-patch-doc.)
+
+* jn/run-command-error-failure (2011-04-19) 1 commit
+ - run-command: write full error message in die_child
+
+* ss/cherry-pick-x-doc (2011-04-15) 1 commit
+ - doc: Clarify that "cherry-pick -x" does not use "git notes"
+
+* ss/doc-svn (2011-04-19) 1 commit
+ - remove noise and inaccuracies from git-svn docs
+
+* vr/merge-base-doc (2011-04-15) 2 commits
+ - Restructure documentation for git-merge-base.
+ - Documentation: update to git-merge-base --octopus
+
+--------------------------------------------------
+[Stalled]
+
+* jc/maint-add-p-overlapping-hunks (2011-04-06) 2 commits
+ - "add -p": work-around an old laziness that does not coalesce hunks
+ - add--interactive.perl: factor out repeated --recount option
+
+This came from http://thread.gmane.org/gmane.comp.version-control.git/170685/focus=171000;
+we may want to add tests before moving it forward.
+
+* mg/show-without-prune (2011-04-01) 1 commit
+ - builtin/show: do not prune by pathspec
+ (this branch uses mg/reflog-with-options.)
+
+I wanted to like this, but it still feels like too much magic.
+
+* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
+ - Look for password in both CVS and CVSNT password files.
+
+It seems that we need separate parsers for these two formats in order not
+to regress the users of the original cvs.
+
+* jc/index-pack (2011-02-25) 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, and will not be ready for 1.7.5. 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]
+
 * ef/maint-strbuf-init (2011-04-10) 2 commits
   (merged to 'next' on 2011-04-11 at 1dd34d9)
  + config: support values longer than 1023 bytes
@@ -36,7 +135,7 @@ release.
 Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
 releases.
 
-* jm/mergetool-submodules (2011-04-08) 1 commit
+* jm/mergetool-submodules (2011-04-13) 1 commit
  - mergetool: Teach about submodules
 
 Looked sane if inefficient when both branches have the submodule but was
@@ -52,7 +151,23 @@ reroll.
  - sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
  - Makefile: Use cgcc rather than sparse in the check target
 
-* ab/i18n-fixup (2011-04-12) 8 commits
+* ab/i18n-fixup (2011-04-14) 24 commits
+ - i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
+ - i18n: use test_i18n{grep,cmp} in t7508
+ - i18n: use test_i18ngrep in t7506
+ - i18n: use test_i18ngrep and test_i18ncmp in t7502
+ - i18n: use test_i18ngrep in t7501
+ - i18n: use test_i18ncmp in t7500
+ - i18n: use test_i18ngrep in t7201
+ - i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
+ - i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
+ - i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
+ - i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
+ - i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
+ - i18n: use test_i18ngrep in lib-httpd and t2019
+ - i18n: do not overuse C_LOCALE_OUTPUT (grep)
+ - i18n: use test_i18ncmp in t1200 and t2200
+ - i18n: .git file is not a human readable message (t5601)
   (merged to 'next' on 2011-04-12 at a94aa85)
  + i18n: do not overuse C_LOCALE_OUTPUT
  + i18n: mark init-db messages for translation
@@ -63,9 +178,10 @@ reroll.
  + i18n: mark merge "upstream" messages for translation
  + i18n: mark merge "Could not read from" message for translation
 
-It would be nice to have this before 1.7.5 final; even if we didn't, we
-would have to force people to build on top of this, not on 1.7.5, which
-would essentially mean that we would commit to this series anyway.
+Fix-up patches queued near the tip avoid excessive use of C_LOCALE_OUTPUT
+to skip the entire tests. They skip only the parts that need to be skipped
+without changing the sequence of commands that are run under GETTEXT_POISON
+mode, which should be a big gain.
 
 * cn/format-patch-quiet (2011-04-12) 2 commits
   (merged to 'next' on 2011-04-12 at 915a915)
@@ -75,57 +191,6 @@ would essentially mean that we would commit to this series anyway.
 Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
 release.
 
---------------------------------------------------
-[Stalled]
-
-* jc/maint-add-p-overlapping-hunks (2011-04-06) 2 commits
- - "add -p": work-around an old laziness that does not coalesce hunks
- - add--interactive.perl: factor out repeated --recount option
-
-This came from http://thread.gmane.org/gmane.comp.version-control.git/170685/focus=171000;
-we may want to add tests before moving it forward.
-
-* jh/gitweb-localtime (2011-03-23) 1 commit
- - gitweb: javascript ability to adjust time based on timezone
-
-Re-roll posted on the list, but I haven't picked it up.
-
-* mg/show-without-prune (2011-04-01) 1 commit
- - builtin/show: do not prune by pathspec
- (this branch uses mg/reflog-with-options.)
-
-I wanted to like this, but it still feels like too much magic.
-
-* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
- - Look for password in both CVS and CVSNT password files.
-
-It seems that we need separate parsers for these two formats in order not
-to regress the users of the original cvs.
-
-* jc/index-pack (2011-02-25) 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, and will not be ready for 1.7.5. 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]
-
 * dm/stash-k-i-p (2011-04-07) 2 commits
   (merged to 'next' on 2011-04-11 at 8349531)
  + stash: ensure --no-keep-index and --patch can be used in any order
@@ -275,7 +340,9 @@ Should graduate soon after 1.7.5 ships.
 
 Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release.
 
-* jk/notes-ui-updates (2011-03-30) 7 commits
+* jk/notes-ui-updates (2011-04-14) 8 commits
+  (merged to 'next' on 2011-04-14 at b9f1b13)
+ + contrib/completion: --notes, --no-notes
   (merged to 'next' on 2011-04-11 at 313d6c4)
  + log/pretty-options: Document --[no-]notes and deprecate old notes options
  + revision.c: make --no-notes reset --notes list
@@ -413,3 +480,9 @@ I am not happy with these magic band aids.  Will hold.
 
 These attempt "add -u" migration plans (two versions), but then revert
 both of them at the end where they are merged to 'next'.
+
+* jh/gitweb-localtime (2011-03-23) 1 commit
+ . gitweb: javascript ability to adjust time based on timezone
+
+
+