Revert "Merge pull request nodegit#1006 from nodegit/oid-leak-fix"

This reverts commit 206d27d.

Author: srajko

Diff for: generate/input/descriptor.json

@@ -73,11 +73,6 @@
   {
     "annotated_commit": {
       "functions": {
-        "git_annotated_commit_id": {
-          "return": {
-            "ownedByThis": true
-          }
-        }
       }
     },
     "attr": {
@@ -1007,11 +1002,6 @@
         "git_index_add_frombuffer": {
           "ignore": true
         },
-        "git_index_checksum": {
-          "return": {
-            "ownedByThis": true
-          }
-        },
         "git_index_clear": {
           "isAsync": true,
           "return": {
@@ -1208,11 +1198,6 @@
         "git_indexer_append": {
           "ignore": true
         },
-        "git_indexer_hash": {
-          "return": {
-            "ownedByThis": true
-          }
-        },
         "git_indexer_new": {
           "ignore": true
         }
@@ -1292,11 +1277,6 @@
             }
           }
         },
-        "git_note_id": {
-          "return": {
-            "ownedByThis": true
-          }
-        },
         "git_note_remove": {
           "isAsync": true,
           "return": {
@@ -1313,11 +1293,6 @@
     },
     "object": {
       "functions": {
-        "git_object_id": {
-          "return": {
-            "ownedByThis": true
-          }
-        },
         "git_object_short_id": {
           "args": {
             "out": {
@@ -1429,11 +1404,6 @@
             "cppClassName": "Wrapper",
             "jsClassName": "Buffer"
           }
-        },
-        "git_odb_object_id": {
-          "return": {
-            "ownedByThis": true
-          }
         }
       },
       "dependencies": [
@@ -1448,7 +1418,6 @@
       "ignore": true
     },
     "oid": {
-      "selfFreeing": "true",
       "cpyFunction": "git_oid_cpy",
       "freeFunctionName": "free",
       "shouldAlloc": true,
@@ -1510,11 +1479,6 @@
         "git_packbuilder_foreach": {
           "ignore": true
         },
-        "git_packbuilder_hash": {
-          "return": {
-            "ownedByThis": true
-          }
-        },
         "git_packbuilder_new": {
           "isAsync": false
         },
@@ -1758,20 +1722,6 @@
       "needsForwardDeclaration": false,
       "ignore": true
     },
-    "reflog_entry": {
-      "functions": {
-        "git_reflog_entry_id_new": {
-          "return": {
-            "ownedByThis": true
-          }
-        },
-        "git_reflog_entry_id_old": {
-          "return": {
-            "ownedByThis": true
-          }
-        }
-      }
-    },
     "refspec": {
       "cType": "git_refspec",
       "functions": {
@@ -2241,11 +2191,6 @@
             "isErrorCode": true
           }
         },
-        "git_submodule_head_id": {
-          "return": {
-            "ownedByThis": true
-          }
-        },
         "git_submodule_init": {
           "isAsync": true,
           "return": {
@@ -2266,16 +2211,6 @@
             "type": "int"
           }
         },
-        "git_submodule_index_id": {
-          "return": {
-            "ownedByThis": true
-          }
-        },
-        "git_submodule_wd_id": {
-          "return": {
-            "ownedByThis": true
-          }
-        },
         "git_submodule_location": {
           "isAsync": true,
           "args": {

Diff for: generate/input/libgit2-supplement.json

@@ -268,15 +268,6 @@
           "git_patch_convenient_from_diff"
         ]
       ],
-      [
-        "reflog_entry",
-        [
-          "git_reflog_entry_committer",
-          "git_reflog_entry_id_new",
-          "git_reflog_entry_id_old",
-          "git_reflog_entry_message"
-        ]
-      ],
       [
         "revwalk",
         [
@@ -714,14 +705,6 @@
         "git_merge_head_id"
       ]
     },
-    "reflog": {
-      "functions": [
-        "git_reflog_entry_committer",
-        "git_reflog_entry_id_new",
-        "git_reflog_entry_id_old",
-        "git_reflog_entry_message"
-      ]
-    },
     "status": {
       "functions": [
         "git_status_list_entrycount",

Diff for: generate/scripts/helpers.js

@@ -220,7 +220,6 @@ var Helpers = {
     field.jsFunctionName = utils.camelCase(field.name);
     field.cppClassName = Helpers.cTypeToCppName(field.type);
     field.jsClassName = utils.titleCase(Helpers.cTypeToJsName(field.type));
-    field.ownedByThis = true;
 
     if (Helpers.isCallbackFunction(field.cType)) {
       Helpers.processCallback(field);

Diff for: test/tests/commit.js

@@ -4,7 +4,6 @@ var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 
 var garbageCollect = require("../utils/garbage_collect.js");
-var leakTest = require("../utils/leak_test");
 
 var local = path.join.bind(path, __dirname);
 
@@ -368,11 +367,11 @@ describe("Commit", function() {
     }).then(function(reflog) {
       var reflogEntry = reflog.entryByIndex(0);
       assert.equal(
-        reflogEntry.message(),
+        NodeGit.Reflog.entryMessage(reflogEntry),
         customReflogMessage
       );
       assert.equal(
-        reflogEntry.idNew().toString(),
+        NodeGit.Reflog.entryIdNew(reflogEntry).toString(),
         oid
       );
       // only setTarget should have added to the entrycount
@@ -628,9 +627,30 @@ describe("Commit", function() {
   it("does not leak", function() {
     var test = this;
 
-    return leakTest(NodeGit.Commit, function() {
-        return NodeGit.Commit.lookup(test.repository, oid);
-    });
+    garbageCollect();
+    var Commit = NodeGit.Commit;
+    var startSelfFreeingCount = Commit.getSelfFreeingInstanceCount();
+    var startNonSelfFreeingCount = Commit.getNonSelfFreeingConstructedCount();
+
+    var resolve;
+    var promise = new Promise(function(_resolve) { resolve = _resolve; });
+
+    NodeGit.Commit.lookup(test.repository, oid)
+      .then(function() {
+        // get out of this promise chain to help GC get rid of the commit
+        setTimeout(resolve, 0);
+      });
+
+    return promise
+      .then(function() {
+        garbageCollect();
+        var endSelfFreeingCount = Commit.getSelfFreeingInstanceCount();
+        var endNonSelfFreeingCount = Commit.getNonSelfFreeingConstructedCount();
+        // any new self-freeing commits should have been freed
+        assert.equal(startSelfFreeingCount, endSelfFreeingCount);
+        // no new non-self-freeing commits should have been constructed
+        assert.equal(startNonSelfFreeingCount, endNonSelfFreeingCount);
+      });
   });
 
   it("duplicates signature", function() {

Diff for: test/tests/oid.js

@@ -2,8 +2,6 @@ var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
 
-var leakTest = require("../utils/leak_test");
-
 describe("Oid", function() {
   var NodeGit = require("../../");
   var Oid = NodeGit.Oid;
@@ -72,24 +70,4 @@ describe("Oid", function() {
     var oid2 = Oid.fromString("13c633665257696a3800b0a39ff636b4593f918f");
     assert(!this.oid.equal(oid2));
   });
-
-  it("does not leak constructed Oid", function() {
-    return leakTest(Oid, function() {
-      return Promise.resolve(
-        Oid.fromString("13c633665257696a3800b0a39ff636b4593f918f")
-      );
-    });
-  });
-
-  it("does not leak owned Oid", function() {
-    return leakTest(Oid, function() {
-      return NodeGit.Repository.open(local("../repos/workdir"))
-        .then(function(repo) {
-          return NodeGit.Commit.lookup(repo, oid);
-        })
-        .then(function(commit) {
-          return commit.id();
-        });
-    });
-  });
 });