What's cooking (2009/09 #03)
Junio C Hamano committed
Sep 13, 2009 at 03:07 UTC
70360a0d866074e416f50410376cb83d30dda75a
1 file changed
+125
-186
whats-cooking.txt
+125
-186
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2009, #02; Mon, 07)
3
-X-master-at: 5ad9dce7e691106fecde413de8cc321b937367a6
4
-X-next-at: 5f6b0ffff13f5cd762d0a5a4e1c4dede58e8a537
2
+Subject: What's cooking in git.git (Sep 2009, #03; Sun, 13)
3
+X-master-at: eaf1c941bbc10f5aa67fcf64e316fb548b910cfe
4
+X-next-at: ad50cbaea8afd009cb843c743b248c53ed6285ee
5
6
-What's cooking in git.git (Sep 2009, #02; Mon, 07)
6
+What's cooking in git.git (Sep 2009, #03; Sun, 13)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -53,153 +53,77 @@ backward compatible. Currently planeed changes are:
53
54
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
55
56
-I tagged and pushed out 1.6.5-rc0. There are still some topics cooking in
57
-'next' I would rather not leave out, but I've been hoping to keep this
58
-cycle short, and I'm also hoping to tag the real 1.6.5 before I vanish for
59
-about a week and half later in the month. so in the worst case there may
60
-have to be a 1.6.6 to include the leftover topics.
56
+I tagged and pushed out 1.6.5-rc1. As far as I am concered, all the big
57
+topics eligible for 1.6.5 are now in, except for possibly gfi-options
58
+series from Sverre. Updates to subsystems (svn, gitk, gui, and gitweb)
59
+may still need to be merged in.
60
+
61
+I've been hoping to keep this cycle short, and I'm also hoping to tag the
62
+real 1.6.5 before I vanish for about a week and half later in the
63
+month. so it looks like there may have to be a 1.6.6 to include the
64
+leftover topics.
65
66
--------------------------------------------------
67
[Graduated to "master"]
68
65
-* np/maint-1.6.3-deepen (2009-09-03) 2 commits
66
- (merged to 'next' on 2009-09-06 at d597fba)
67
- + pack-objects: free preferred base memory after usage
68
- + make shallow repository deepening more network efficient
69
-
70
-Further optimization and fixing of the object transfer around the "shallow
71
-repository" codepaths.
69
+* jc/merge-saner-messages (2009-09-07) 1 commit
70
+ + merge-recursive: give less scary messages when merge did not start
71
73
-* js/stash-dwim (2009-07-27) 1 commit.
74
- (merged to 'next' on 2009-08-16 at 67896c4)
75
- + Make 'git stash -k' a short form for 'git stash save --keep-index'
76
- (this branch is used by tr/reset-checkout-patch.)
72
+* rc/maint-http-no-head-pack-check (2009-09-09) 1 commit.
73
+ + http.c: remove verification of remote packs
74
78
-* tr/reset-checkout-patch (2009-08-18) 10 commits.
79
- (merged to 'next' on 2009-09-03 at d4f2ed7)
80
- + stash: simplify defaulting to "save" and reject unknown options
81
- (merged to 'next' on 2009-08-27 at d314281)
82
- + Make test case number unique
83
- (merged to 'next' on 2009-08-18 at e465bb3)
84
- + tests: disable interactive hunk selection tests if perl is not available
85
- (merged to 'next' on 2009-08-16 at 67896c4)
86
- + DWIM 'git stash save -p' for 'git stash -p'
87
- + Implement 'git stash save --patch'
88
- + Implement 'git checkout --patch'
89
- + Implement 'git reset --patch'
90
- + builtin-add: refactor the meat of interactive_add()
91
- + Add a small patch-mode testing library
92
- + git-apply--interactive: Refactor patch mode code
93
- (this branch uses js/stash-dwim.)
94
-
95
-DWIMmery of the two series tightened for safety a few days ago. Otherwise
96
-the same as what have been cooking in 'next' for a few weeks.
97
-
98
-* jc/upload-pack-hook (2009-08-28) 2 commits
99
- (merged to 'next' on 2009-08-31 at f9933a5)
100
- + upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
101
- + upload-pack: add a trigger for post-upload-pack hook
102
-
103
-* jk/clone-b (2009-08-26) 1 commit
104
- (merged to 'next' on 2009-08-30 at 10a68d1)
105
- + clone: add --branch option to select a different HEAD
106
-
107
-* jc/mailinfo-scissors (2009-08-26) 5 commits
108
- (merged to 'next' on 2009-08-30 at 5fc6248)
109
- + mailinfo.scissors: new configuration
110
- + am/mailinfo: Disable scissors processing by default
111
- + Documentation: describe the scissors mark support of "git am"
112
- + Teach mailinfo to ignore everything before -- >8 -- mark
113
- + builtin-mailinfo.c: fix confusing internal API to mailinfo()
114
-
115
-I didn't pick up the patch to simplify the definition of scissors. I do
116
-not have strong opinion on it either way, and nobody on the list seemed to
117
-care too much either.
75
+* db/vcs-helper (2009-09-03) 16 commits
76
+ + Use a clearer style to issue commands to remote helpers
77
+ + Make the "traditionally-supported" URLs a special case
78
+ (merged to 'next' on 2009-08-07 at f3533ba)
79
+ + Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
80
+ + Makefile: do not link three copies of git-remote-* programs
81
+ + Makefile: git-http-fetch does not need expat
82
+ + http-fetch: Fix Makefile dependancies
83
+ + Add transport native helper executables to .gitignore
84
+ + git-http-fetch: not a builtin
85
+ + Use an external program to implement fetching with curl
86
+ + Add support for external programs for handling native fetches
87
119
---------------------------------------------------
120
-[New Topics]
88
+Up to the part that eject -lcurl from the main "git" binary cleanly are
89
+now in 'master', with a few fix-ups from Jim Mayering.
90
91
* cb/maint-1.6.3-grep-relative-up (2009-09-05) 2 commits.
123
- (merged to 'next' on 2009-09-07 at f9b5b48)
92
+ grep: accept relative paths outside current working directory
93
+ grep: fix exit status if external_grep() punts
94
127
-1.6.5 material.
128
-
129
-* jk/1.7.0-status (2009-09-05) 5 commits
130
- - docs: note that status configuration affects only long format
131
- (merged to 'next' on 2009-09-07 at 8a7c563)
132
- + commit: support alternate status formats
133
- + status: add --porcelain output format
134
- + status: refactor format option parsing
135
- + status: refactor short-mode printing to its own function
136
- (this branch uses jc/1.7.0-status.)
137
-
138
-Gives the --short output format to post 1.7.0 "git commit --dry-run" that
139
-is similar to that of post 1.7.0 "git status".
140
-
141
-It might be a good idea to make the --short format part of 1.6.6 without
142
-waiting for 1.7.0; it would require some branch shuffling to bring the
143
-short-status patch earlier than the one that makes "status" different from
144
-"commit --dry-run", though.
145
-
146
-* jk/unwanted-advices (2009-09-06) 2 commits
147
- - status: make "how to stage" messages optional
148
- - push: make non-fast-forward help message configurable
149
-
150
-Post 1.3.0 "newbie friendliness drive" introduced a lot of "helpful"
151
-advice messages that are sometimes found to be irritating once the user
152
-got used to working with git. This series introduces a general mechanism
153
-to allow us to make them less loud using the config mechanism. The config
154
-option hierarchy in these two are "message.*" but it is planned to be
155
-renamed to "advice.*".
156
-
157
-* jn/gitweb-show-size (2009-09-07) 1 commit
158
- - gitweb: Add 'show-sizes' feature to show blob sizes in tree view
95
+* jk/unwanted-advices (2009-09-09) 2 commits
96
+ + status: make "how to stage" messages optional
97
+ + push: make non-fast-forward help message configurable
98
99
* jt/pushinsteadof (2009-09-07) 2 commits
161
- - Add url.<base>.pushInsteadOf: URL rewriting for push only
162
- - Wrap rewrite globals in a struct in preparation for adding another set
100
+ + Add url.<base>.pushInsteadOf: URL rewriting for push only
101
+ + Wrap rewrite globals in a struct in preparation for adding another set
102
164
-Probably 1.6.5 material.
103
+* pk/fast-import-tars (2009-09-03) 1 commit
104
+ + import-tars: Allow per-tar author and commit message.
105
166
-* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
167
- - Prepare 'traverse_trees()' for D/F conflict lookahead
106
+* pk/fast-import-dirs (2009-09-03) 1 commit
107
+ + Add script for importing bits-and-pieces to Git.
108
169
-Beginning of the fix to a rather nasty longstanding issue of merging trees
170
-with ("a" "a-b"), ("a/b" "a-b") and just ("a-b").
109
+--------------------------------------------------
110
+[New Topics]
111
172
-* ne/rev-cache (2009-09-07) 7 commits
173
- . support for commit grafts, slight change to general mechanism
174
- . support for path name caching in rev-cache
175
- . full integration of rev-cache into git, completed test suite
176
- . administrative functions for rev-cache, start of integration into git
177
- . support for non-commit object caching in rev-cache
178
- . basic revision cache system, no integration or features
179
- . man page and technical discussion for rev-cache
112
+* db/vcs-helper-rest (2009-09-03) 6 commits
113
+ - Allow helpers to report in "list" command that the ref is unchanged
114
+ - Add support for "import" helper command
115
+ - Add a config option for remotes to specify a foreign vcs
116
+ - Allow programs to not depend on remotes having urls
117
+ - Allow fetch to modify refs
118
+ - Use a function to determine whether a remote is valid
119
+ (this branch is used by jh/cvs-helper.)
120
181
-Replaced but I do not think this is ready for 'pu' yet.
121
+This is not exactly new. It holds the remainder of the db/vcs-helper
122
+topic.
123
124
--------------------------------------------------
125
[Stalled]
126
186
-* jh/notes (2009-08-27) 12 commits.
187
- - Add '%N'-format for pretty-printing commit notes
188
- - Add flags to get_commit_notes() to control the format of the note string
189
- - notes.c: Implement simple memory pooling of leaf nodes
190
- - Selftests verifying semantics when loading notes trees with various fanouts
191
- - Teach the notes lookup code to parse notes trees with various fanout schemes
192
- - t3302-notes-index-expensive: Speed up create_repo()
193
- - fast-import: Add support for importing commit notes
194
- - Teach "-m <msg>" and "-F <file>" to "git notes edit"
195
- - Add an expensive test for git-notes
196
- - Speed up git notes lookup
197
- - Add a script to edit/inspect notes
198
- - Introduce commit notes
199
-
200
-I heard the cvs-helper series depends on this one. It seems that the
201
-fan-out strategy is being rethought?
202
-
127
* je/send-email-no-subject (2009-08-05) 1 commit
128
(merged to 'next' on 2009-08-30 at b6455c2)
129
+ send-email: confirm on empty mail subjects
@@ -210,32 +134,6 @@ subject", the message is sent) of this feature, but the feature itself
134
needs its own test to verify the negative case (i.e. does it correctly
135
stop if the user says "no"?)
136
213
-* db/vcs-helper (2009-09-03) 16 commits
214
- - Allow helpers to report in "list" command that the ref is unchanged
215
- - Add support for "import" helper command
216
- - Add a config option for remotes to specify a foreign vcs
217
- - Allow programs to not depend on remotes having urls
218
- - Allow fetch to modify refs
219
- - Use a function to determine whether a remote is valid
220
- - Use a clearer style to issue commands to remote helpers
221
- - Make the "traditionally-supported" URLs a special case
222
- (merged to 'next' on 2009-08-07 at f3533ba)
223
- + Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
224
- + Makefile: do not link three copies of git-remote-* programs
225
- + Makefile: git-http-fetch does not need expat
226
- (merged to 'next' on 2009-08-06 at 15da79d)
227
- + http-fetch: Fix Makefile dependancies
228
- + Add transport native helper executables to .gitignore
229
- (merged to 'next' on 2009-08-05 at 33d491e)
230
- + git-http-fetch: not a builtin
231
- + Use an external program to implement fetching with curl
232
- + Add support for external programs for handling native fetches
233
- (this branch is used by jh/cvs-helper.)
234
-
235
-I'd really want to have this in 1.6.5 so that we can eject -lcurl from the
236
-main "git" binary. The patches in 'pu' got some review comments, and I
237
-thought Daniel's responses were sensible. Comments?
238
-
137
* jh/cvs-helper (2009-08-18) 8 commits
138
- More fixes to the git-remote-cvs installation procedure
139
- Fix the Makefile-generated path to the git_remote_cvs package in git-remote-cvs
@@ -245,36 +143,52 @@ thought Daniel's responses were sensible. Comments?
143
- 1/2: Add Python support library for CVS remote helper
144
- Basic build infrastructure for Python scripts
145
- Allow helpers to request marks for fast-import
248
- (this branch uses db/vcs-helper.)
146
+ (this branch uses db/vcs-helper-rest.)
147
148
Builds on db/vcs-helper. There is a re-roll planned.
149
252
-* cc/sequencer-rebase-i (2009-08-28) 15 commits
253
- - rebase -i: use "git sequencer--helper --cherry-pick"
254
- - sequencer: add "--cherry-pick" option to "git sequencer--helper"
255
- - sequencer: add "do_commit()" and related functions working on "next_commit"
256
- - pick: libify "pick_help_msg()"
257
- - revert: libify cherry-pick and revert functionnality
258
- - rebase -i: use "git sequencer--helper --fast-forward"
259
- - sequencer: let "git sequencer--helper" callers set "allow_dirty"
260
- - sequencer: add "--fast-forward" option to "git sequencer--helper"
261
- - sequencer: add "do_fast_forward()" to perform a fast forward
262
- - rebase -i: use "git sequencer--helper --reset-hard"
263
- - sequencer: add "--reset-hard" option to "git sequencer--helper"
264
- - sequencer: add "reset_almost_hard()" and related functions
265
- - rebase -i: use "git sequencer--helper --make-patch"
266
- - sequencer: add "make_patch" function to save a patch
267
- - sequencer: add "builtin-sequencer--helper.c"
150
+* ne/rev-cache (2009-09-07) 7 commits
151
+ . support for commit grafts, slight change to general mechanism
152
+ . support for path name caching in rev-cache
153
+ . full integration of rev-cache into git, completed test suite
154
+ . administrative functions for rev-cache, start of integration into git
155
+ . support for non-commit object caching in rev-cache
156
+ . basic revision cache system, no integration or features
157
+ . man page and technical discussion for rev-cache
158
269
-Migrating "rebase -i" bit by bit to C.
270
-Not a 1.6.5 material yet.
159
+Replaced but I do not think this is ready for 'pu' yet.
160
161
--------------------------------------------------
162
[Cooking]
163
275
-* pk/fast-import-tars (2009-09-03) 1 commit
276
- (merged to 'next' on 2009-09-07 at 8fbf027)
277
- + import-tars: Allow per-tar author and commit message.
164
+* jh/notes (2009-09-12) 13 commits
165
+ - Selftests verifying semantics when loading notes trees with various fanouts
166
+ - Teach the notes lookup code to parse notes trees with various fanout schemes
167
+ - notes.[ch] fixup: avoid old-style declaration
168
+ - Teach notes code to free its internal data structures on request.
169
+ - Add '%N'-format for pretty-printing commit notes
170
+ - Add flags to get_commit_notes() to control the format of the note string
171
+ - t3302-notes-index-expensive: Speed up create_repo()
172
+ - fast-import: Add support for importing commit notes
173
+ - Teach "-m <msg>" and "-F <file>" to "git notes edit"
174
+ - Add an expensive test for git-notes
175
+ - Speed up git notes lookup
176
+ - Add a script to edit/inspect notes
177
+ - Introduce commit notes
178
+ (this branch uses sr/gfi-options.)
179
+
180
+Rerolled and queued.
181
+
182
+* jn/gitweb-show-size (2009-09-07) 1 commit
183
+ - gitweb: Add 'show-sizes' feature to show blob sizes in tree view
184
+
185
+* lt/maint-traverse-trees-fix (2009-09-06) 1 commit.
186
+ - Prepare 'traverse_trees()' for D/F conflict lookahead
187
+
188
+Beginning of the fix to a rather nasty longstanding issue of merging trees
189
+with ("a" "a-b"), ("a/b" "a-b") and just ("a-b"), but my reading of it is
190
+that it is just the first step to demonstrate one-entry lookahead and not
191
+a full solution yet.
192
193
* jc/maint-1.6.0-blank-at-eof (2009-09-05) 10 commits.
194
(merged to 'next' on 2009-09-07 at 165dc3c)
@@ -289,16 +203,8 @@ Not a 1.6.5 material yet.
203
+ apply --whitespace=fix: detect new blank lines at eof correctly
204
+ apply --whitespace=fix: fix handling of blank lines at the eof
205
292
-Hopefully in 1.6.5
293
-
294
-* pk/fast-import-dirs (2009-09-03) 1 commit
295
- (merged to 'next' on 2009-09-07 at 836cba2)
296
- + Add script for importing bits-and-pieces to Git.
297
-
298
-With an updated key-value quoting rules, which I haven't carefully looked
299
-at. I have to wonder if there are standard libraries to do this sort of
300
-thing without having to hand-roll these logic every time. But perhaps I
301
-shouldn't be too picky on contrib/ material.
206
+This started a bit late in the cycle, and I'd rather hold it back during
207
+this feature freeze and push it out after 1.6.5 final.
208
209
* jn/gitweb-blame (2009-09-01) 5 commits
210
- gitweb: Minify gitweb.js if JSMIN is defined
@@ -318,6 +224,7 @@ Ajax-y blame.
224
+ fast-import: add feature command
225
+ fast-import: put marks reading in it's own function
226
+ fast-import: put option parsing code in separate functions
227
+ (this branch is used by jh/notes.)
228
229
Perhaps 1.6.5 material but I wasn't sure.
230
@@ -345,6 +252,18 @@ Perhaps 1.6.5 material but I wasn't sure.
252
--------------------------------------------------
253
[For 1.7.0]
254
255
+* jk/1.7.0-status (2009-09-05) 5 commits
256
+ - docs: note that status configuration affects only long format
257
+ (merged to 'next' on 2009-09-07 at 8a7c563)
258
+ + commit: support alternate status formats
259
+ + status: add --porcelain output format
260
+ + status: refactor format option parsing
261
+ + status: refactor short-mode printing to its own function
262
+ (this branch uses jc/1.7.0-status.)
263
+
264
+Gives the --short output format to post 1.7.0 "git commit --dry-run" that
265
+is similar to that of post 1.7.0 "git status".
266
+
267
* jc/1.7.0-status (2009-09-05) 4 commits
268
(merged to 'next' on 2009-09-06 at 19d4beb)
269
+ status: typo fix in usage
@@ -395,3 +314,23 @@ Maybe some people care about this. I dunno.
314
. Add initial support for pathname conversion to UTF-8
315
. read_directory(): infrastructure for pathname character set conversion
316
. Add 'fill_directory()' helper function for directory traversal
317
+
318
+* cc/sequencer-rebase-i (2009-08-28) 15 commits
319
+ - rebase -i: use "git sequencer--helper --cherry-pick"
320
+ - sequencer: add "--cherry-pick" option to "git sequencer--helper"
321
+ - sequencer: add "do_commit()" and related functions working on "next_commit"
322
+ - pick: libify "pick_help_msg()"
323
+ - revert: libify cherry-pick and revert functionnality
324
+ - rebase -i: use "git sequencer--helper --fast-forward"
325
+ - sequencer: let "git sequencer--helper" callers set "allow_dirty"
326
+ - sequencer: add "--fast-forward" option to "git sequencer--helper"
327
+ - sequencer: add "do_fast_forward()" to perform a fast forward
328
+ - rebase -i: use "git sequencer--helper --reset-hard"
329
+ - sequencer: add "--reset-hard" option to "git sequencer--helper"
330
+ - sequencer: add "reset_almost_hard()" and related functions
331
+ - rebase -i: use "git sequencer--helper --make-patch"
332
+ - sequencer: add "make_patch" function to save a patch
333
+ - sequencer: add "builtin-sequencer--helper.c"
334
+
335
+This was to be replaced with multiple bite-sized smaller topics. We've
336
+seen one such topic for "git reset" on the list.