git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 00/11] More preparatory work for multiparent tree-walker

From
Kirill Smelkov <kirr@mns.spb.ru>
Date
Feb 11, 2014, 08:17 UTC
Message-ID
<20140211081716.GA4455@tugrik.mns.mnsspb.ru>
In-Reply-To
<xmqqeh3aqyq6.fsf@gitster.dls.corp.google.com>
On Mon, Feb 10, 2014 at 04:28:33PM -0800, Junio C Hamano wrote:
Show 9 quoted lines
> Kirill Smelkov <kirr@mns.spb.ru> writes:
> 
> > Here I'm preparing tree-diff.c to be ready for the new tree-walker, so that the
> > final change is tractable and looks good and non noisy. Some small speedups
> > are gained along the way. The final bits are almost ready, but I don't want to
> > release them in a hurry.
> 
> No worries.  We are not in a hurry to apply non-regression-fix
> changes during a pre-release feature freeze period anyway.
I see.
> This seems to somehow conflict with other topics and does not
> cleanly apply on top of your other tree-diff topic, by the way.
Sorry for the confusion. Could you please do the following:

Patches should be applied over to ks/tree-diff-walk (74aa4a18). Before applying the patches, please cherry-pick

    c90483d9    (tree-diff: no need to manually verify that there is no
                 mode change for a path)
    ef4f0928    (tree-diff: no need to pass match to
                 skip_uninteresting())

into that branch, and drop them from ks/combine-diff - we'll have one branch reworking the diff tree-walker, and the other taking advantage of it for combine-diff.

Then apply sent-here patches, which, as I've verified this time, should apply cleanly.

Thanks and sorry again, Kirill

Previous: Junio C HamanoNext: Junio C Hamano
Message 17 of 21 in “More preparatory work for multiparent tree-walker”
  1. 00/11 More preparatory work for multiparent tree-walkerKirill Smelkov, Feb 7, 2014
  2. 01/11 tree-diff: show_tree() is not neededKirill Smelkov, Feb 7, 2014
  3. 02/11 tree-diff: consolidate code for emitting diffs and recursion in one placeKirill Smelkov, Feb 7, 2014
  4. Junio C HamanoFeb 13, 2014
  5. Kirill SmelkovFeb 13, 2014
  6. 03/11 tree-diff: don't assume compare_tree_entry() returns -1,0,1Kirill Smelkov, Feb 7, 2014
  7. 04/11 tree-diff: move all action-taking code out of compare_tree_entry()Kirill Smelkov, Feb 7, 2014
  8. 05/11 tree-diff: rename compare_tree_entry -> tree_entry_pathcmpKirill Smelkov, Feb 7, 2014
  9. 06/11 tree-diff: show_path prototype is not needed anymoreKirill Smelkov, Feb 7, 2014
  10. 07/11 tree-diff: simplify tree_entry_pathcmpKirill Smelkov, Feb 7, 2014
  11. 08/11 tree-diff: remove special-case diff-emitting code for empty-tree casesKirill Smelkov, Feb 7, 2014
  12. 09/11 tree-diff: rework diff_tree interface to be sha1 basedKirill Smelkov, Feb 7, 2014
  13. 10/11 tree-diff: no need to call "full" diff_tree_sha1 from show_path()Kirill Smelkov, Feb 7, 2014
  14. 11/11 tree-diff: reuse base str(buf) memory on sub-tree recursionKirill Smelkov, Feb 7, 2014
  15. Kirill SmelkovFeb 13, 2014
  16. Junio C HamanoFeb 11, 2014
  17. Kirill SmelkovFeb 11, 2014
  18. Junio C HamanoFeb 11, 2014
  19. Kirill SmelkovFeb 12, 2014
  20. Junio C HamanoFeb 12, 2014
  21. Kirill SmelkovFeb 13, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.