Commit f2e80f4b6d7a56834b6c44f055317c88c833d277
2018-09-15T13:05:16
move far indented parts of print_commits() to separate function
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90
diff --git a/got/got.c b/got/got.c
index dc93773..35b21af 100644
--- a/got/got.c
+++ b/got/got.c
@@ -370,6 +370,39 @@ print_commit(struct got_commit_object *commit, struct got_object_id *id,
}
static const struct got_error *
+detect_change(int *changed, struct got_object_id *commit_id,
+ struct got_object *obj, const char *path, struct got_repository *repo)
+{
+ const struct got_error *err = NULL;
+ struct got_object_id *id, *pid;
+ struct got_object *pobj;
+
+ err = got_object_open_by_path(&pobj, repo, commit_id, path);
+ if (err) {
+ if (err->code != GOT_ERR_NO_OBJ)
+ return err;
+ *changed = 1;
+ return NULL;
+ }
+
+ id = got_object_get_id(obj);
+ if (id == NULL)
+ return got_error_from_errno();
+ pid = got_object_get_id(pobj);
+ if (pid == NULL) {
+ err = got_error_from_errno();
+ free(id);
+ return err;
+ }
+
+ *changed = (got_object_id_cmp(id, pid) != 0);
+ got_object_close(pobj);
+ free(id);
+ free(pid);
+ return NULL;
+}
+
+static const struct got_error *
print_commits(struct got_object *root_obj, struct got_object_id *root_id,
struct got_repository *repo, char *path, int show_patch, int limit,
int first_parent_traversal)
@@ -433,39 +466,13 @@ print_commits(struct got_object *root_obj, struct got_object_id *root_id,
found_obj = 1;
pid = SIMPLEQ_FIRST(&commit->parent_ids);
- if (pid != NULL) {
- struct got_object *pobj;
- err = got_object_open_by_path(&pobj, repo,
- pid->id, path);
+ if (pid) {
+ err = detect_change(&changed, pid->id, obj,
+ path, repo);
if (err) {
- if (err->code != GOT_ERR_NO_OBJ) {
- got_object_close(obj);
- got_object_commit_close(commit);
- break;
- }
- err = NULL;
- changed = 1;
- } else {
- struct got_object_id *id, *pid;
- id = got_object_get_id(obj);
- if (id == NULL) {
- err = got_error_from_errno();
- got_object_close(obj);
- break;
- }
- pid = got_object_get_id(pobj);
- if (pid == NULL) {
- err = got_error_from_errno();
- free(id);
- got_object_close(obj);
- got_object_close(pobj);
- break;
- }
- changed =
- (got_object_id_cmp(id, pid) != 0);
- got_object_close(pobj);
- free(id);
- free(pid);
+ got_object_close(obj);
+ got_object_commit_close(commit);
+ break;
}
}
got_object_close(obj);