Re: [PATCH v2 8/8] log --remerge-diff: show what the conflict resolution changed
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 27, 2014, 00:40 UTC
- Message-ID
- <xmqqbnxt1j7l.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <75c29215c6a61fe1dc3f088f0fcd9acfa54f24fa.1393059605.git.tr@thomasrast.ch>
Thomas Rast <tr@thomasrast.ch> writes:
Show 22 quoted lines
> diff --git a/log-tree.c b/log-tree.c
> index 30b3063..9b831e9 100644
> --- a/log-tree.c
> +++ b/log-tree.c
> @@ -11,6 +11,8 @@
> #include "gpg-interface.h"
> #include "sequencer.h"
> #include "line-log.h"
> +#include "cache-tree.h"
> +#include "merge-recursive.h"
>
> struct decoration name_decoration = { "object names" };
>
> @@ -723,6 +725,300 @@ static int do_diff_combined(struct rev_info *opt, struct commit *commit)
> }
>
> /*
> + * Helpers for make_asymmetric_conflict_entries() below.
> + */
> +static char *load_cache_entry_blob(struct cache_entry *entry,
> + unsigned long *size)
> +{I briefly wondered if this helper need to know about contents conversions (e.g. smudge/clean or crlf), but not doing any of that *is* the right thing to do. IOW, I agree with what this part of the patch does.
But it feels, at least to me, that this helper function ...
> +static void strbuf_append_cache_entry_blob(struct strbuf *sb,
> + struct cache_entry *entry)
> +{... and this one are overly specific. Why should they know about (and limit themselves to operate on) cache-entry type? Isn't it too much to ask for the caller to say "entry->sha1" instead of "entry"?
I do not have an issue with a "load_blob()" helper that makes sure what it reads is a blob, though, of course.
Show 26 quoted lines
> +static void assemble_conflict_entry(struct strbuf *sb,
> + const char *branch1,
> + const char *branch2,
> + struct cache_entry *entry1,
> + struct cache_entry *entry2)
> +{
> + strbuf_addf(sb, "<<<<<<< %s\n", branch1);
> + strbuf_append_cache_entry_blob(sb, entry1);
> + strbuf_addstr(sb, "=======\n");
> + strbuf_append_cache_entry_blob(sb, entry2);
> + strbuf_addf(sb, ">>>>>>> %s\n", branch2);
> +}
> +
> +/*
> + * For --remerge-diff, we need conflicted (<<<<<<< ... >>>>>>>)
> + * representations of as many conflicts as possible. Default conflict
> + * generation only applies to files that have all three stages.
> + *
> + * This function generates conflict hunk representations for files
> + * that have only one of stage 2 or 3. The corresponding side in the
> + * conflict hunk format will be empty. A stage 1, if any, will be
> + * dropped in the process.
> + */
> +static void make_asymmetric_conflict_entries(const char *branch1,
> + const char *branch2)
> +{I should comment on this one in a separate message after I read it over once again.
Show 9 quoted lines
> +} > + > +/* > + * --remerge-diff doesn't currently handle entries that cannot be > + * turned into a stage0 conflicted-file format blob. So this routine > + * clears the corresponding entries from the index. This is > + * suboptimal; we should eventually handle them _somehow_. > +*/ > +static void drop_non_stage0()
"static void drop_non_stage0(void)"