Re: [PATCH 16/23] expire_reflog(): move verbose to flags argument

2014-12-08 Thread Stefan Beller 
On Fri, Dec 05, 2014 at 12:08:28AM +0100, Michael Haggerty wrote:
 The policy objects don't care about --verbose. So move it to
 expire_reflog()'s flags parameter.
 
 Signed-off-by: Michael Haggerty mhag...@alum.mit.edu

Reviewed-by: Stefan Beller sbel...@google.com

 ---
  builtin/reflog.c | 24 
  1 file changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/builtin/reflog.c b/builtin/reflog.c
 index 1512b67..cc7a220 100644
 --- a/builtin/reflog.c
 +++ b/builtin/reflog.c
 @@ -20,11 +20,16 @@ static const char reflog_delete_usage[] =
  static unsigned long default_reflog_expire;
  static unsigned long default_reflog_expire_unreachable;
  
 +enum expire_reflog_flags {
 + EXPIRE_REFLOGS_DRY_RUN = 1  0,
 + EXPIRE_REFLOGS_UPDATE_REF = 1  1,
 + EXPIRE_REFLOGS_VERBOSE = 1  2
 +};
 +
  struct cmd_reflog_expire_cb {
   struct rev_info revs;
   int stalefix;
   int rewrite;
 - int verbose;
   unsigned long expire_total;
   unsigned long expire_unreachable;
   int recno;
 @@ -339,7 +344,7 @@ static int expire_reflog_ent(unsigned char *osha1, 
 unsigned char *nsha1,
message, policy_cb)) {
   if (!policy_cb-newlog)
   printf(would prune %s, message);
 - else if (policy_cb-cmd-verbose)
 + else if (cb-flags  EXPIRE_REFLOGS_VERBOSE)
   printf(prune %s, message);
   } else {
   if (policy_cb-newlog) {
 @@ -351,7 +356,7 @@ static int expire_reflog_ent(unsigned char *osha1, 
 unsigned char *nsha1,
   message);
   hashcpy(policy_cb-last_kept_sha1, nsha1);
   }
 - if (policy_cb-cmd-verbose)
 + if (cb-flags  EXPIRE_REFLOGS_VERBOSE)
   printf(keep %s, message);
   }
   return 0;
 @@ -421,11 +426,6 @@ static void reflog_expiry_cleanup(struct 
 expire_reflog_policy_cb *cb)
  
  static struct lock_file reflog_lock;
  
 -enum expire_reflog_flags {
 - EXPIRE_REFLOGS_DRY_RUN = 1  0,
 - EXPIRE_REFLOGS_UPDATE_REF = 1  1
 -};
 -
  static int expire_reflog(const char *refname, const unsigned char *sha1,
unsigned int flags, void *cb_data)
  {
 @@ -679,7 +679,7 @@ static int cmd_reflog_expire(int argc, const char **argv, 
 const char *prefix)
   else if (!strcmp(arg, --all))
   do_all = 1;
   else if (!strcmp(arg, --verbose))
 - cb.verbose = 1;
 + flags |= EXPIRE_REFLOGS_VERBOSE;
   else if (!strcmp(arg, --)) {
   i++;
   break;
 @@ -697,10 +697,10 @@ static int cmd_reflog_expire(int argc, const char 
 **argv, const char *prefix)
*/
   if (cb.stalefix) {
   init_revisions(cb.revs, prefix);
 - if (cb.verbose)
 + if (flags  EXPIRE_REFLOGS_VERBOSE)
   printf(Marking reachable objects...);
   mark_reachable_objects(cb.revs, 0, 0, NULL);
 - if (cb.verbose)
 + if (flags  EXPIRE_REFLOGS_VERBOSE)
   putchar('\n');
   }
  
 @@ -759,7 +759,7 @@ static int cmd_reflog_delete(int argc, const char **argv, 
 const char *prefix)
   else if (!strcmp(arg, --updateref))
   flags |= EXPIRE_REFLOGS_UPDATE_REF;
   else if (!strcmp(arg, --verbose))
 - cb.verbose = 1;
 + flags |= EXPIRE_REFLOGS_VERBOSE;
   else if (!strcmp(arg, --)) {
   i++;
   break;
 -- 
 2.1.3
 
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 16/23] expire_reflog(): move verbose to flags argument

2014-12-04 Thread Michael Haggerty 
The policy objects don't care about --verbose. So move it to
expire_reflog()'s flags parameter.

Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
 builtin/reflog.c | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 1512b67..cc7a220 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -20,11 +20,16 @@ static const char reflog_delete_usage[] =
 static unsigned long default_reflog_expire;
 static unsigned long default_reflog_expire_unreachable;
 
+enum expire_reflog_flags {
+   EXPIRE_REFLOGS_DRY_RUN = 1  0,
+   EXPIRE_REFLOGS_UPDATE_REF = 1  1,
+   EXPIRE_REFLOGS_VERBOSE = 1  2
+};
+
 struct cmd_reflog_expire_cb {
struct rev_info revs;
int stalefix;
int rewrite;
-   int verbose;
unsigned long expire_total;
unsigned long expire_unreachable;
int recno;
@@ -339,7 +344,7 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned 
char *nsha1,
 message, policy_cb)) {
if (!policy_cb-newlog)
printf(would prune %s, message);
-   else if (policy_cb-cmd-verbose)
+   else if (cb-flags  EXPIRE_REFLOGS_VERBOSE)
printf(prune %s, message);
} else {
if (policy_cb-newlog) {
@@ -351,7 +356,7 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned 
char *nsha1,
message);
hashcpy(policy_cb-last_kept_sha1, nsha1);
}
-   if (policy_cb-cmd-verbose)
+   if (cb-flags  EXPIRE_REFLOGS_VERBOSE)
printf(keep %s, message);
}
return 0;
@@ -421,11 +426,6 @@ static void reflog_expiry_cleanup(struct 
expire_reflog_policy_cb *cb)
 
 static struct lock_file reflog_lock;
 
-enum expire_reflog_flags {
-   EXPIRE_REFLOGS_DRY_RUN = 1  0,
-   EXPIRE_REFLOGS_UPDATE_REF = 1  1
-};
-
 static int expire_reflog(const char *refname, const unsigned char *sha1,
 unsigned int flags, void *cb_data)
 {
@@ -679,7 +679,7 @@ static int cmd_reflog_expire(int argc, const char **argv, 
const char *prefix)
else if (!strcmp(arg, --all))
do_all = 1;
else if (!strcmp(arg, --verbose))
-   cb.verbose = 1;
+   flags |= EXPIRE_REFLOGS_VERBOSE;
else if (!strcmp(arg, --)) {
i++;
break;
@@ -697,10 +697,10 @@ static int cmd_reflog_expire(int argc, const char **argv, 
const char *prefix)
 */
if (cb.stalefix) {
init_revisions(cb.revs, prefix);
-   if (cb.verbose)
+   if (flags  EXPIRE_REFLOGS_VERBOSE)
printf(Marking reachable objects...);
mark_reachable_objects(cb.revs, 0, 0, NULL);
-   if (cb.verbose)
+   if (flags  EXPIRE_REFLOGS_VERBOSE)
putchar('\n');
}
 
@@ -759,7 +759,7 @@ static int cmd_reflog_delete(int argc, const char **argv, 
const char *prefix)
else if (!strcmp(arg, --updateref))
flags |= EXPIRE_REFLOGS_UPDATE_REF;
else if (!strcmp(arg, --verbose))
-   cb.verbose = 1;
+   flags |= EXPIRE_REFLOGS_VERBOSE;
else if (!strcmp(arg, --)) {
i++;
break;
-- 
2.1.3

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html