revision: split some overly-long lines
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
May 25, 2013 at 11:08 UTC
ff5f5f268fd36b6db059c06d124305866ecaa6ce
2 files changed
+35
-17
revision.c
+14
-6
@@ -70,7 +70,8 @@ static int show_path_truncated(FILE *out, const struct name_path *path)
70
return ours || emitted;
71
}
72
73
-void show_object_with_name(FILE *out, struct object *obj, const struct name_path *path, const char *component)
73
+void show_object_with_name(FILE *out, struct object *obj,
74
+ const struct name_path *path, const char *component)
75
{
76
struct name_path leaf;
77
leaf.up = (struct name_path *)path;
@@ -186,7 +187,9 @@ void mark_parents_uninteresting(struct commit *commit)
187
}
188
}
189
189
-static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
190
+static void add_pending_object_with_mode(struct rev_info *revs,
191
+ struct object *obj,
192
+ const char *name, unsigned mode)
193
{
194
if (!obj)
195
return;
@@ -209,7 +212,8 @@ static void add_pending_object_with_mode(struct rev_info *revs, struct object *o
212
add_object_array_with_mode(obj, name, &revs->pending, mode);
213
}
214
212
-void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
215
+void add_pending_object(struct rev_info *revs,
216
+ struct object *obj, const char *name)
217
{
218
add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
219
}
@@ -226,7 +230,9 @@ void add_head_to_pending(struct rev_info *revs)
230
add_pending_object(revs, obj, "HEAD");
231
}
232
229
-static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
233
+static struct object *get_reference(struct rev_info *revs, const char *name,
234
+ const unsigned char *sha1,
235
+ unsigned int flags)
236
{
237
struct object *object;
238
@@ -247,7 +253,8 @@ void add_pending_sha1(struct rev_info *revs, const char *name,
253
add_pending_object(revs, object, name);
254
}
255
250
-static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
256
+static struct commit *handle_commit(struct rev_info *revs,
257
+ struct object *object, const char *name)
258
{
259
unsigned long flags = object->flags;
260
@@ -368,7 +375,8 @@ static void file_change(struct diff_options *options,
375
DIFF_OPT_SET(options, HAS_CHANGES);
376
}
377
371
-static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
378
+static int rev_compare_tree(struct rev_info *revs,
379
+ struct commit *parent, struct commit *commit)
380
{
381
struct tree *t1 = parent->tree;
382
struct tree *t2 = commit->tree;
revision.h
+21
-11
@@ -195,19 +195,23 @@ struct setup_revision_opt {
195
};
196
197
extern void init_revisions(struct rev_info *revs, const char *prefix);
198
-extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *);
198
+extern int setup_revisions(int argc, const char **argv, struct rev_info *revs,
199
+ struct setup_revision_opt *);
200
extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
200
- const struct option *options,
201
- const char * const usagestr[]);
201
+ const struct option *options,
202
+ const char * const usagestr[]);
203
#define REVARG_CANNOT_BE_FILENAME 01
204
#define REVARG_COMMITTISH 02
204
-extern int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt);
205
+extern int handle_revision_arg(const char *arg, struct rev_info *revs,
206
+ int flags, unsigned revarg_opt);
207
208
extern void reset_revision_walk(void);
209
extern int prepare_revision_walk(struct rev_info *revs);
210
extern struct commit *get_revision(struct rev_info *revs);
209
-extern char *get_revision_mark(const struct rev_info *revs, const struct commit *commit);
210
-extern void put_revision_mark(const struct rev_info *revs, const struct commit *commit);
211
+extern char *get_revision_mark(const struct rev_info *revs,
212
+ const struct commit *commit);
213
+extern void put_revision_mark(const struct rev_info *revs,
214
+ const struct commit *commit);
215
216
extern void mark_parents_uninteresting(struct commit *commit);
217
extern void mark_tree_uninteresting(struct tree *tree);
@@ -220,15 +224,19 @@ struct name_path {
224
225
char *path_name(const struct name_path *path, const char *name);
226
223
-extern void show_object_with_name(FILE *, struct object *, const struct name_path *, const char *);
227
+extern void show_object_with_name(FILE *, struct object *,
228
+ const struct name_path *, const char *);
229
230
extern void add_object(struct object *obj,
231
struct object_array *p,
232
struct name_path *path,
233
const char *name);
234
230
-extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
231
-extern void add_pending_sha1(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags);
235
+extern void add_pending_object(struct rev_info *revs,
236
+ struct object *obj, const char *name);
237
+extern void add_pending_sha1(struct rev_info *revs,
238
+ const char *name, const unsigned char *sha1,
239
+ unsigned int flags);
240
241
extern void add_head_to_pending(struct rev_info *);
242
@@ -238,7 +246,9 @@ enum commit_action {
246
commit_error
247
};
248
241
-extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
242
-extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
249
+extern enum commit_action get_commit_action(struct rev_info *revs,
250
+ struct commit *commit);
251
+extern enum commit_action simplify_commit(struct rev_info *revs,
252
+ struct commit *commit);
253
254
#endif