On Mon, Sep 05, 2011 at 02:14:57PM -0700, Shawn O. Pearce wrote:
> > Right. What I mean is, what should the bigger warning look like?
>
> Its a bikeshed. I refuse to paint bikesheds. :-)
Hmph. Somebody has to write the patch. :P
> > Also, you suggested caching to avoid looking through the whole reflog
> > each time. I think you could probably just sample the last 10 or so
> > reflog entries to get an idea.
>
> Good point. 10 or so last records might be representative of the
> branch's recent behavior, which is all that matters to the user who
> wants this warning.
Actually, because recent ones are near the end, it's much easier to say
"look at the last 4096 bytes of reflogs" rather than "look at exactly
10". For our purposes, it's about the same (actually 4096 is probably
more like 18-20, depending on the exact size of each entry. But it's a
page, so it's probably reasonable).
-- >8 --
Subject: fetch: bigger forced-update warnings
The default fetch refspec allows forced-updates. We already
print "forced update" in the status table, but it's easy to
miss. Let's make the warning a little more prominent.
Some branches are expected to rewind, so the prominent
warning would be annoying. However, git doesn't know what
the expectation is for a particular branch. We can have it
guess by peeking at the lost couple of reflog entries. If we
see all fast forwards, then a new forced-update is probably
noteworthy. If we see something that force-updates all the
time, it's probably boring and not worth displaying the big
warning (we keep the status table "forced update" note, of
course).
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
builtin/fetch.c | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 93c9938..93bfefa 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -208,6 +208,34 @@ static struct ref *get_ref_map(struct transport *transport,
return ref_map;
}
+struct update_counts {
+ unsigned fastforward;
+ unsigned forced;
+};
+
+static int count_updates(unsigned char *osha1, unsigned char *nsha1,
+ const char *email, unsigned long timestamp, int tz,
+ const char *message, void *data)
+{
+ struct update_counts *uc = data;
+ /* We could check the ancestry of osha1 and nsha1, but this is way
+ * cheaper */
+ if (!prefixcmp(message, "fetch: fast-forward"))
+ uc->fastforward++;
+ else if (!prefixcmp(message, "fetch: forced-update\n"))
+ uc->forced++;
+ return 0;
+}
+
+static int forced_update_is_uncommon(const char *ref)
+{
+ struct update_counts uc;
+ memset(&uc, 0, sizeof(&uc));
+ if (for_each_recent_reflog_ent(ref, count_updates, 4096, &uc) < 0)
+ for_each_reflog_ent(ref, count_updates, &uc);
+ return uc.fastforward && uc.forced <= 1; /* 1 for the one we just did */
+}
+
#define STORE_REF_ERROR_OTHER 1
#define STORE_REF_ERROR_DF_CONFLICT 2
@@ -239,7 +267,8 @@ static int s_update_ref(const char *action,
static int update_local_ref(struct ref *ref,
const char *remote,
- char *display)
+ char *display,
+ int *uncommon_forced_update)
{
struct commit *current = NULL, *updated;
enum object_type type;
@@ -336,6 +365,8 @@ static int update_local_ref(struct ref *ref,
TRANSPORT_SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote,
pretty_ref,
r ? _("unable to update local ref") : _("forced update"));
+ if (!r && forced_update_is_uncommon(ref->name))
+ *uncommon_forced_update = 1;
return r;
} else {
sprintf(display, "! %-*s %-*s -> %s %s",
@@ -355,6 +386,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
const char *what, *kind;
struct ref *rm;
char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD");
+ int uncommon_forced_update = 0;
fp = fopen(filename, "a");
if (!fp)
@@ -428,7 +460,8 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
fputc('\n', fp);
if (ref) {
- rc |= update_local_ref(ref, what, note);
+ rc |= update_local_ref(ref, what, note,
+ &uncommon_forced_update);
free(ref);
} else
sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
@@ -450,6 +483,8 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
error(_("some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting "
"branches"), remote_name);
+ if (uncommon_forced_update)
+ warning("HEY STUPID FIX YOUR TOPICS");
return rc;
}
--
1.7.6.10.g62f04
--
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