On Monday 23 November 2009, Junio C Hamano wrote: > * jh/notes (2009-11-20) 10 commits > - Add more testcases to test fast-import of notes > - Rename t9301 to t9350, to make room for more fast-import tests > - fast-import: Proper notes tree manipulation using the notes API > - Refactor notes concatenation into a flexible interface for combining notes > - Notes API: Allow multiple concurrent notes trees with new struct notes_tree > - Notes API: for_each_note(): Traverse the entire notes tree with a callback > - Notes API: get_note(): Return the note annotating the given object > - Notes API: add_note(): Add note objects to the internal notes tree structure > - Notes API: init_notes(): Initialize the notes tree from the given notes ref > - Notes API: get_commit_notes() -> format_note() + remove the commit restriction > > Early part has been lived in 'next' for a while and has graduated. This > is a reroll of the remainder. Is everybody happy with merging this to > 'next'? I really want an Ack from Shawn on the fast-import patch (patch 8/10) before putting this in 'next'. The rest of the series is good AFAICS, although there might be some changes needed if I need to rework the fast-import patch. > I saw some checkpatch style violations, but didn't find anything > objectionable in the logic. Ok. I fixed most of them locally, but there are still some remaining in fast-import.c, where I'd rather follow fast-import.c's existing style, which seems to disagree somewhat with checkpatch. The style fixes will be part of the next iteration (which will also include the rebase back onto the early part of the jh/notes series). I'll wait for Shawn's comments before resending, though. > [...] > > * sr/vcs-helper (2009-11-18) 12 commits > - Add Python support library for remote helpers > - Basic build infrastructure for Python scripts > - Allow helpers to report in "list" command that the ref is unchanged > - Fix various memory leaks in transport-helper.c > - Allow helper to map private ref names into normal names > - Add support for "import" helper command > - Allow specifying the remote helper in the url > - Add a config option for remotes to specify a foreign vcs > - Allow fetch to modify refs > - Use a function to determine whether a remote is valid > - Allow programs to not depend on remotes having urls > - Fix memory leak in helper method for disconnect > > Replaced again. Is everybody happy with merging this to 'next'? Yep, assuming Daniel is happy with the transport layer parts. For the record, you can add this to the last patch of the series: Signed-off-by: Johan Herland <johan@xxxxxxxxxxx> Have fun! :) ...Johan -- Johan Herland, <johan@xxxxxxxxxxx> www.herland.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html