From: Jonathan Tan <jonathantanmy@google.com>
To: newren@gmail.com
Cc: jonathantanmy@google.com, git@vger.kernel.org
Subject: Re: [PATCH v2 13/20] merge-ort: step 1 of tree writing -- record basenames, modes, and oids
Date: Thu, 12 Nov 2020 12:39:04 -0800 [thread overview]
Message-ID: <20201112203904.3443874-1-jonathantanmy@google.com> (raw)
In-Reply-To: <CABPp-BGr4kpjyZc3Rbh+8StPbWWqo36Kg0P=dgqctwX0SCGPxw@mail.gmail.com>
> On Wed, Nov 11, 2020 at 12:01 PM Jonathan Tan <jonathantanmy@google.com> wrote:
> >
> > > +struct directory_versions {
> > > + struct string_list versions;
> >
> > Maybe comment that this is an unordered list of basenames to <whatever
> > the type of ci->merged.result is>.
>
> There actually is an order, and it's important. It's reverse
> lexicographic order of full pathnames (the ordering comes from the
> fact that process_entries() iterates paths in that order). The
> reasons for that ordering are (1) all the basenames within a directory
> are adjacent so that I can write out a tree for a directory as soon as
> it is done, and (2) paths within a directory are listed before the
> directory itself so that I get the necessary info for subtrees before
> trying to write out their parent trees.
>
> It's not until later patches that I take advantage of this ordering
> (and when I do I have a very long commit message to describe it all),
> but I can add a comment that this is a list of basenames to
> merge_info.
Ah, yes you're right. I'm not sure what I was thinking of.
next prev parent reply other threads:[~2020-11-12 20:39 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 20:43 [PATCH v2 00/20] fundamentals of merge-ort implementation Elijah Newren
2020-11-02 20:43 ` [PATCH v2 01/20] merge-ort: setup basic internal data structures Elijah Newren
2020-11-06 22:05 ` Jonathan Tan
2020-11-06 22:45 ` Elijah Newren
2020-11-09 20:55 ` Jonathan Tan
2020-11-02 20:43 ` [PATCH v2 02/20] merge-ort: add some high-level algorithm structure Elijah Newren
2020-11-02 20:43 ` [PATCH v2 03/20] merge-ort: port merge_start() from merge-recursive Elijah Newren
2020-11-11 13:52 ` Derrick Stolee
2020-11-11 16:22 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 04/20] merge-ort: use histogram diff Elijah Newren
2020-11-11 13:54 ` Derrick Stolee
2020-11-11 16:47 ` Elijah Newren
2020-11-11 16:51 ` Derrick Stolee
2020-11-11 17:03 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 05/20] merge-ort: add an err() function similar to one from merge-recursive Elijah Newren
2020-11-11 13:58 ` Derrick Stolee
2020-11-11 17:07 ` Elijah Newren
2020-11-11 17:10 ` Derrick Stolee
2020-11-02 20:43 ` [PATCH v2 06/20] merge-ort: implement a very basic collect_merge_info() Elijah Newren
2020-11-06 22:19 ` Jonathan Tan
2020-11-06 23:10 ` Elijah Newren
2020-11-09 20:59 ` Jonathan Tan
2020-11-11 14:38 ` Derrick Stolee
2020-11-11 17:02 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 07/20] merge-ort: avoid repeating fill_tree_descriptor() on the same tree Elijah Newren
2020-11-11 14:51 ` Derrick Stolee
2020-11-11 17:13 ` Elijah Newren
2020-11-11 17:21 ` Eric Sunshine
2020-11-02 20:43 ` [PATCH v2 08/20] merge-ort: compute a few more useful fields for collect_merge_info Elijah Newren
2020-11-06 22:52 ` Jonathan Tan
2020-11-06 23:41 ` Elijah Newren
2020-11-09 22:04 ` Jonathan Tan
2020-11-09 23:05 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 09/20] merge-ort: record stage and auxiliary info for every path Elijah Newren
2020-11-06 22:58 ` Jonathan Tan
2020-11-07 0:26 ` Elijah Newren
2020-11-09 22:09 ` Jonathan Tan
2020-11-09 23:08 ` Elijah Newren
2020-11-11 15:26 ` Derrick Stolee
2020-11-11 18:16 ` Elijah Newren
2020-11-11 22:06 ` Elijah Newren
2020-11-12 18:23 ` Derrick Stolee
2020-11-12 18:39 ` Derrick Stolee
2020-11-02 20:43 ` [PATCH v2 10/20] merge-ort: avoid recursing into identical trees Elijah Newren
2020-11-11 15:31 ` Derrick Stolee
2020-11-02 20:43 ` [PATCH v2 11/20] merge-ort: add a preliminary simple process_entries() implementation Elijah Newren
2020-11-11 19:51 ` Jonathan Tan
2020-11-12 1:48 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 12/20] merge-ort: have process_entries operate in a defined order Elijah Newren
2020-11-11 16:09 ` Derrick Stolee
2020-11-11 18:58 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 13/20] merge-ort: step 1 of tree writing -- record basenames, modes, and oids Elijah Newren
2020-11-11 20:01 ` Jonathan Tan
2020-11-11 20:24 ` Elijah Newren
2020-11-12 20:39 ` Jonathan Tan [this message]
2020-11-02 20:43 ` [PATCH v2 14/20] merge-ort: step 2 of tree writing -- function to create tree object Elijah Newren
2020-11-11 20:47 ` Jonathan Tan
2020-11-11 21:21 ` Elijah Newren
2020-11-02 20:43 ` [PATCH v2 15/20] merge-ort: step 3 of tree writing -- handling subdirectories as we go Elijah Newren
2020-11-12 20:15 ` Jonathan Tan
2020-11-12 22:30 ` Elijah Newren
2020-11-24 20:19 ` Elijah Newren
2020-11-25 2:07 ` Jonathan Tan
2020-11-26 18:13 ` Elijah Newren
2020-11-30 18:41 ` Jonathan Tan
2020-11-02 20:43 ` [PATCH v2 16/20] merge-ort: basic outline for merge_switch_to_result() Elijah Newren
2020-11-02 20:43 ` [PATCH v2 17/20] merge-ort: add implementation of checkout() Elijah Newren
2020-11-02 20:43 ` [PATCH v2 18/20] tree: enable cmp_cache_name_compare() to be used elsewhere Elijah Newren
2020-11-02 20:43 ` [PATCH v2 19/20] merge-ort: add implementation of record_unmerged_index_entries() Elijah Newren
2020-11-02 20:43 ` [PATCH v2 20/20] merge-ort: free data structures in merge_finalize() Elijah Newren
2020-11-03 14:49 ` [PATCH v2 00/20] fundamentals of merge-ort implementation Derrick Stolee
2020-11-03 16:36 ` Elijah Newren
2020-11-07 6:06 ` Elijah Newren
2020-11-07 15:02 ` Derrick Stolee
2020-11-07 19:39 ` Elijah Newren
2020-11-09 12:30 ` Derrick Stolee
2020-11-09 17:13 ` Elijah Newren
2020-11-09 19:51 ` Derrick Stolee
2020-11-09 22:44 ` Elijah Newren
2020-11-11 17:08 ` Derrick Stolee
2020-11-11 18:35 ` Elijah Newren
2020-11-11 20:48 ` Derrick Stolee
2020-11-11 21:18 ` Elijah Newren
-- strict thread matches above, loose matches on Subject: below --
2020-11-29 7:43 [PATCH " Elijah Newren via GitGitGadget
2020-12-04 20:47 ` [PATCH v2 " Elijah Newren via GitGitGadget
2020-12-04 20:48 ` [PATCH v2 13/20] merge-ort: step 1 of tree writing -- record basenames, modes, and oids Elijah Newren via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201112203904.3443874-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).