Update add-and-commit.js

julien-c · julien-c · commit fb56e129aed7 · 2020-10-09T16:04:31.000+02:00
diff --git a/examples/add-and-commit.js b/examples/add-and-commit.js
@@ -1,69 +1,48 @@
-var nodegit = require("../");
-var path = require("path");
-var fse = require("fs-extra");
-var fileName = "newfile.txt";
-var fileContent = "hello world";
-var directoryName = "salad/toast/strangerinastrangeland/theresnowaythisexists";
+const nodegit = require("../");
+const path = require("path");
+const fs = require("fs");
+const fileName = "newfile.txt";
+const fileContent = "hello world";
+const directoryName = "salad/toast/strangerinastrangeland/theresnowaythisexists";
 
 /**
  * This example creates a certain file `newfile.txt`, adds it to the git
  * index and commits it to head. Similar to a `git add newfile.txt`
  * followed by a `git commit`
 **/
 
-var repo;
-var index;
-var oid;
 
-nodegit.Repository.open(path.resolve(__dirname, "../.git"))
-.then(function(repoResult) {
-  repo = repoResult;
-  return fse.ensureDir(path.join(repo.workdir(), directoryName));
-}).then(function(){
-  return fse.writeFile(path.join(repo.workdir(), fileName), fileContent);
-})
-.then(function() {
-  return fse.writeFile(
+(async () => {
+  const repo = await nodegit.Repository.open(path.resolve(__dirname, "../.git"));
+  
+  await fs.promises.mkdir(path.join(repo.workdir(), directoryName), {
+    recursive: true,
+  });
+  
+  await fs.promises.writeFile(path.join(repo.workdir(), fileName), fileContent);
+  await fs.promises.writeFile(
     path.join(repo.workdir(), directoryName, fileName),
     fileContent
   );
-})
-.then(function() {
-  return repo.refreshIndex();
-})
-.then(function(indexResult) {
-  index = indexResult;
-})
-.then(function() {
+  
+  const index = await repo.refreshIndex();
+  
   // this file is in the root of the directory and doesn't need a full path
-  return index.addByPath(fileName);
-})
-.then(function() {
+  await index.addByPath(fileName);
   // this file is in a subdirectory and can use a relative path
-  return index.addByPath(path.posix.join(directoryName, fileName));
-})
-.then(function() {
+  await index.addByPath(path.posix.join(directoryName, fileName));
   // this will write both files to the index
-  return index.write();
-})
-.then(function() {
-  return index.writeTree();
-})
-.then(function(oidResult) {
-  oid = oidResult;
-  return nodegit.Reference.nameToId(repo, "HEAD");
-})
-.then(function(head) {
-  return repo.getCommit(head);
-})
-.then(function(parent) {
-  var author = nodegit.Signature.now("Scott Chacon",
+  await index.write();
+  
+  const oid = await index.writeTree();
+  
+  const parent = await repo.getHeadCommit();
+  const author = nodegit.Signature.now("Scott Chacon",
     "schacon@gmail.com");
-  var committer = nodegit.Signature.now("Scott A Chacon",
+  const committer = nodegit.Signature.now("Scott A Chacon",
     "scott@github.com");
 
-  return repo.createCommit("HEAD", author, committer, "message", oid, [parent]);
-})
-.done(function(commitId) {
+  const commitId = await repo.createCommit("HEAD", author, committer, "message", oid, [parent]);
+
   console.log("New Commit: ", commitId);
-});
+})();
