065bfb6d2e · matheusbsbs/matheus-bagliano

@@ -0,0 +1,278 @@

1 +To: git@vger.kernel.org

2 +Subject: What's cooking in git.git (Jul 2009, #02; Sun, 26)

3 +X-master-at: d8f7be2ebcb7e3ec40269080a9ab9a28bc06ba17

4 +X-next-at: 2b05f9bd0a9944bbaab9f24d305932a57e4735d4

5 +

6 +What's cooking in git.git (Jul 2009, #02; Sun, 26)

7 +--------------------------------------------------

8 +

9 +These topics in 'next' (ones prefixed with '+') and 'pu' (ones prefixed

10 +with '.') will not be in 1.6.4 final, and are subject to be rewound once

11 +it happens.

12 +

13 +We have quite a few solid topics in 'next', so hopefully the next cycle

14 +would be shorter than usual. I'd propose to call it 1.6.5, and then make

15 +the one after that 1.7.0, which means that during the 1.6.5 cycle, 'next'

16 +will have the two incompatible "push" (actually, receive-pack) changes

17 +hitherto kept on hold in 'pu'.

18 +

19 +----------------------------------------------------------------

20 +[New Topics]

21 +

22 +* jk/show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits

23 + + show: add space between multiple items

24 + + show: suppress extra newline when showing annotated tag

25 +

26 +Didn't look bad at all, but is not pressing either.

27 +

28 +* sb/parse-options (Tue Jul 7 22:15:41 2009 -0700) 4 commits

29 + + prune-packed: migrate to parse-options

30 + + verify-pack: migrate to parse-options

31 + + verify-tag: migrate to parse-options

32 + + write-tree: migrate to parse-options

33 +

34 +* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit

35 + + grep: Add --max-depth option.

36 +

37 +* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits

38 + - gitweb: Create links leading to 'blame_incremental' using

39 + JavaScript

40 + - gitweb: Incremental blame (proof of concept)

41 + - gitweb: Add optional "time to generate page" info in footer

42 + - gitweb: Add -partial_query option to href() subroutine

43 + - gitweb: Use light/dark for class names also in 'blame' view

44 + - gitweb: Add author initials in 'blame' view, a la "git gui blame"

45 + - gitweb: Mark commits with no "previous" in 'blame' view

46 + - gitweb: Use "previous" header of git-blame -p in 'blame' view

47 + - gitweb: Mark boundary commits in 'blame' view

48 + - gitweb: Make .error style generic

49 +

50 +Still in flux/rfc.

51 +

52 +* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit

53 + + git init: optionally allow a directory argument

54 +

55 +Didn't look bad, but is not pressing either.

56 +

57 +* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit

58 + + apply: notice creation/removal patches produced by GNU diff

59 +

60 +* sb/pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits

61 + + pull: support rebased upstream + fetch + pull --rebase

62 + + t5520-pull: Test for rebased upstream + fetch + pull --rebase

63 +

64 +* db/transport-shim (Sat Jul 25 13:51:40 2009 -0400) 3 commits

65 + - git-http-fetch: not a builtin

66 + - Use an external program to implement fetching with curl

67 + - Add support for external programs for handling native fetches

68 +

69 +Interesting as a concept. I saw its ls-remote segfault on me, though.

70 +Hopefully will mature by 1.6.5 final.

71 +

72 +* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits

73 + + branch.c: if remote is not config'd for branch, don't try delete

74 + push config

75 + + branch, checkout: introduce autosetuppush

76 + + move deletion of merge configuration to branch.c

77 + + remote: add per-remote autosetupmerge and autosetuprebase

78 + configuration

79 + + introduce a struct tracking_config

80 + + branch: install_branch_config and struct tracking refactoring

81 + + config: allow false and true values for branch.autosetuprebase

82 +

83 +After some discussion, I suspect we may want to rewind this out of 'next'

84 +and start over with a fresh design.

85 +

86 +* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit

87 + + init-db: migrate to parse-options

88 +

89 +* tr/reset-checkout-patch (Sat Jul 25 23:29:34 2009 +0200) 5 commits

90 + - Implement 'git stash save --patch'

91 + - Implement 'git checkout --patch'

92 + - Implement 'git reset --patch'

93 + - builtin-add: refactor the meat of interactive_add()

94 + - git-apply--interactive: Refactor patch mode code

95 +

96 +Still in flux/rfc.

97 +

98 +----------------------------------------------------------------

99 +[Stalled and may need help and prodding to go forward]

100 +

101 +* gp/maint-rebase-p-onto (Wed Jul 22 12:38:58 2009 -0400) 1 commit

102 + . Fix rebase -p --onto

103 +

104 +I'd say we should take this even if it means Dscho needs his rebase -p

105 +rewrite. It is not very pressing, so perhaps do so immediately after

106 +1.6.4 final.

107 +

108 +* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits

109 + - Teach "-m <msg>" and "-F <file>" to "git notes edit"

110 + - Add an expensive test for git-notes

111 + - Speed up git notes lookup

112 + - Add a script to edit/inspect notes

113 + - Introduce commit notes

114 +

115 +Dscho asked about the performance implications of this; I do not think I

116 +saw any progress on that yet...

117 +

118 +Will drop after 1.6.4 unless any further progress is seen.

119 +

120 +* ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits

121 + - Fix for a merge where a branch has an F->D transition

122 + - Add a reminder test case for a merge with F/D transition

123 +

124 +Although the reported breakage is covered with the patch, Alex feels the

125 +solution unsatisfactory. Cleaning up D/F conflict handling in merge-recursive

126 +may be long overdue but seems to be a hard problem.

127 +

128 +* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit

129 + - blame.c: start libifying the blame infrastructure

130 +

131 +A few minor point remains in this initial one.

132 +

133 +Will drop after 1.6.4 unless any further progress is seen.

134 +

135 +* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit

136 + - Allow --date=local --date=other-format to work as expected

137 +

138 +The one I posted had a few corner-case bugs that was caught with the test

139 +suite; this one has them fixed. People did not like the UI so it is kept

140 +out of 'next'

141 +

142 +Will drop after 1.6.4 unless any further progress is seen.

143 +

144 +* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit

145 + - git-merge-file: allow converting the results for the work tree

146 +

147 +This is a feature waiting for a user.

148 +

149 +We did not give scripted Porcelains a way to say "this temporary file I am

150 +using for merging is for this path, so use the core.autocrlf and attributes

151 +rules for that final path". Instead, merge-file simply wrote out the

152 +data in the canonical repository representation.

153 +

154 +rerere has the same issue, but it is a lot worse. It reads the three

155 +files (preimage, postimage and thisimage) from the work tree in the work

156 +tree representation, merges them without converting them to the canonical

157 +representation first but inserts the conflict markers with the canonical

158 +representation and writes the resulting mess out. It needs to be fixed to

159 +read with convert_to_git(), merge them while they are still in the

160 +canonical representation and possibly add conflict markers, and then write

161 +the results out after convert_to_working_tree(). It also needs to write

162 +in binary mode as well.

163 +

164 +Will drop after 1.6.4 unless any further progress is seen.

165 +

166 +* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits

167 + - Add option for using a foreign VCS

168 + - Document details of transport function APIs

169 + - Allow late reporting of fetched hashes

170 +

171 +I have a feeling that the recent transport-shim series from the same

172 +author could supersede this one.

173 +

174 +* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits

175 + - t/t9600: remove exit after test_done

176 + - cvsimport: extend testcase about patchset order to contain

177 + branches

178 + - cvsimport: add test illustrating a bug in cvsps

179 + - Add a test of "git cvsimport"'s handling of tags and branches

180 + - Add some tests of git-cvsimport's handling of vendor branches

181 + - Test contents of entire cvsimported "master" tree contents

182 + - Use CVS's -f option if available (ignore user's ~/.cvsrc file)

183 + - Start a library for cvsimport-related tests

184 +

185 +----------------------------------------------------------------

186 +[Not actively cooking]

187 +

188 +* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 6 commits

189 + + receive-pack: remove unnecessary run_status report

190 + + run_command: report failure to execute the program, but optionally

191 + don't

192 + + run_command: encode deadly signal number in the return value

193 + + run_command: report system call errors instead of returning error

194 + codes

195 + + run_command: return exit code as positive value

196 + + MinGW: simplify waitpid() emulation macros

197 +

198 +Will merge after 1.6.4

199 +

200 +* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits

201 + - rebase -i: use "git sequencer--helper --make-patch"

202 + - sequencer: free memory used in "make_patch" function

203 + - sequencer: add "make_patch" function to save a patch

204 + - sequencer: add "builtin-sequencer--helper.c"

205 +

206 +* en/fast-export (Thu Jun 25 22:48:33 2009 -0600) 7 commits

207 + + fast-export: Document the fact that git-rev-list arguments are

208 + accepted

209 + + Add new fast-export testcases

210 + + fast-export: Add a --tag-of-filtered-object option for newly

211 + dangling tags

212 + + fast-export: Do parent rewriting to avoid dropping relevant

213 + commits

214 + + fast-export: Make sure we show actual ref names instead of

215 + "(null)"

216 + + fast-export: Omit tags that tag trees

217 + + fast-export: Set revs.topo_order before calling setup_revisions

218 +

219 +Shawn? Dscho?

220 +

221 +* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits

222 + + diff: Rename QUIET internal option to QUICK

223 + + diff: change semantics of "ignore whitespace" options

224 +

225 +Possibly merge during 1.6.5, or 1.7.0 since this is a semantics change.

226 +

227 +* sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits

228 + + read-tree: migrate to parse-options

229 + + read-tree: convert unhelpful usage()'s to helpful die()'s

230 +

231 +Will merge after 1.6.4

232 +

233 +* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit

234 + + Shift object enumeration out of upload-pack

235 +

236 +Will merge after 1.6.4

237 +

238 +* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits

239 + + t6050: check pushing something based on a replaced commit

240 + + Documentation: add documentation for "git replace"

241 + + Add git-replace to .gitignore

242 + + builtin-replace: use "usage_msg_opt" to give better error messages

243 + + parse-options: add new function "usage_msg_opt"

244 + + builtin-replace: teach "git replace" to actually replace

245 + + Add new "git replace" command

246 + + environment: add global variable to disable replacement

247 + + mktag: call "check_sha1_signature" with the replacement sha1

248 + + replace_object: add a test case

249 + + object: call "check_sha1_signature" with the replacement sha1

250 + + sha1_file: add a "read_sha1_file_repl" function

251 + + replace_object: add mechanism to replace objects found in

252 + "refs/replace/"

253 + + refs: add a "for_each_replace_ref" function

254 +

255 +* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit

256 + - receive-pack: default receive.denyDeleteCurrent to refuse

257 +

258 +* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit

259 + - Refuse updating the current branch in a non-bare repository via

260 + push

261 +

262 +These are for 1.7.0, but the messages when they trigger together may need

263 +to be rethought. Will be kept in 'next' during 1.6.5 cycle.

264 +

265 +----------------------------------------------------------------

266 +[Dropped]

267 +

268 +* ae/maint-mailinfo-rm-only-one-patch-marker (Mon Jun 29 11:55:51 2009 +0200) 1 commit

269 + - mailinfo: Remove only one set of square brackets

270 +

271 +* lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits

272 + . Add initial support for pathname conversion to UTF-8

273 + . read_directory(): infrastructure for pathname character set

274 + conversion

275 + . Add 'fill_directory()' helper function for directory traversal

276 +

277 +It appears that we may want to settle with a MacOS X specific conversion,

278 +if somebody really cares enough.