Commit 0d8ff7d595e6abb49387494684cd73113df880c0

Stefan Sperling 2019-08-15T00:15:32

rename got_blame_incremental() to got_blame()

diff --git a/got/got.c b/got/got.c
index 228ca70..7de4b71 100644
--- a/got/got.c
+++ b/got/got.c
@@ -2425,8 +2425,7 @@ cmd_blame(int argc, char *argv[])
 	}
 	bca.repo = repo;
 
-	error = got_blame_incremental(in_repo_path, commit_id, repo,
-	    blame_cb, &bca);
+	error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca);
 	if (error)
 		goto done;
 done:
diff --git a/include/got_blame.h b/include/got_blame.h
index 6075cad..9258c77 100644
--- a/include/got_blame.h
+++ b/include/got_blame.h
@@ -31,7 +31,7 @@
  * If the callback returns any other error, the blame operation will be
  * aborted and the callback's error is returned from this function.
  */
-const struct got_error *got_blame_incremental(const char *,
+const struct got_error *got_blame(const char *,
     struct got_object_id *, struct got_repository *,
     const struct got_error *(*cb)(void *, int, int, struct got_object_id *),
     void *);
diff --git a/lib/blame.c b/lib/blame.c
index 87b1810..d7a5a56 100644
--- a/lib/blame.c
+++ b/lib/blame.c
@@ -412,7 +412,7 @@ done:
 }
 
 const struct got_error *
-got_blame_incremental(const char *path, struct got_object_id *commit_id,
+got_blame(const char *path, struct got_object_id *commit_id,
     struct got_repository *repo,
     const struct got_error *(*cb)(void *, int, int, struct got_object_id *),
     void *arg)
diff --git a/tog/tog.c b/tog/tog.c
index 6f4b607..a4136fe 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -3132,7 +3132,7 @@ blame_thread(void *arg)
 	struct tog_blame_cb_args *a = ta->cb_args;
 	int errcode;
 
-	err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
+	err = got_blame(ta->path, a->commit_id, ta->repo,
 	    blame_cb, ta->cb_args);
 
 	errcode = pthread_mutex_lock(&tog_mutex);