Rename get_commit to get_commit_hash

skt/__init__.py

@@ -204,8 +204,7 @@ def get_commit_date(self, ref=None):
 
         return int(stdout.rstrip())
 
-    # FIXME Rename to say the hash is being retrieved
-    def get_commit(self, ref=None):
+    def get_commit_hash(self, ref=None):
         """
         Get the full hash of the commit pointed at by the specified reference,
         or of the currently checked-out commit, if not specified.
@@ -260,7 +259,7 @@ def checkout(self):
         self.git_cmd("checkout", "-q", "--detach", dstref)
         self.git_cmd("reset", "--hard", dstref)
 
-        head = self.get_commit()
+        head = self.get_commit_hash()
         self.info.append(("base", self.uri, head))
         logging.info("baserepo %s: %s", self.ref, head)
         return str(head).rstrip()
@@ -320,7 +319,7 @@ def merge_git_ref(self, uri, ref="master"):
                 logging.getLogger().level > logging.DEBUG else {}
 
             self.git_cmd("merge", "--no-edit", dstref, **grargs)
-            head = self.get_commit(dstref)
+            head = self.get_commit_hash(dstref)
             self.info.append(("git", uri, head))
             logging.info("%s %s: %s", rname, ref, head)
         except subprocess.CalledProcessError:

skt/executable.py

@@ -181,7 +181,7 @@ def cmd_merge(cfg):
 
     kpath = ktree.getpath()
     buildinfo = ktree.dumpinfo()
-    buildhead = ktree.get_commit()
+    buildhead = ktree.get_commit_hash()
 
     save_state(cfg, {'workdir': kpath,
                      'buildinfo': buildinfo,