commitcloud: skip unnecessary rev convertion in upload

Summary: I spot some unnecessary `rev` <-> `node` translations. Just use `node` directly.

Reviewed By: zzl0

Differential Revision: D74679478

fbshipit-source-id: eabbbc1b621435de38104afc84e72c73a356c9e7

Author: quark-zju

eden/scm/sapling/edenapi_upload.py

@@ -187,13 +187,6 @@ def _gettrees(repo, nodes):
             yield treenode, p1, p2, treetext
 
 
-def _torevs(repo, uploadednodes, failednodes):
-    """Convert nodes back to revs"""
-    return set([repo[node].rev() for node in uploadednodes]), set(
-        [repo[node].rev() for node in failednodes]
-    )
-
-
 def filetypefromfile(f):
     if f.isexec():
         return "Executable"
@@ -214,8 +207,8 @@ def parentsfromctx(ctx):
         return None
 
 
-def uploadhgchangesets(repo, revs, force=False, skipknowncheck=False):
-    """Upload list of revs via EdenApi Uploads protocol
+def uploadhgchangesets(repo, nodes, force=False, skipknowncheck=False):
+    """Upload list of nodes via EdenApi Uploads protocol
 
     EdenApi Uploads API consists of the following:
 
@@ -243,11 +236,9 @@ def uploadhgchangesets(repo, revs, force=False, skipknowncheck=False):
     If ``skipknowncheck`` is True (the default is False) the lookup check isn't performed to filter out already uploaded commits.
     Assumed it is known already that they are missing on the server.
 
-    Returns newly uploaded revs and failed revs.
+    Returns newly uploaded nodes and failed nodes.
     """
 
-    nodes = [repo[r].node() for r in revs]
-
     # Build a queue of commits to upload
     uploadcommitqueue = (
         nodes if (force or skipknowncheck) else _filtercommits(repo, nodes)
@@ -350,4 +341,4 @@ def uploadhgchangesets(repo, revs, force=False, skipknowncheck=False):
         for mut in mutations
     ]
 
-    return _torevs(repo, *_uploadchangesets(repo, changesets, mutations))
+    return _uploadchangesets(repo, changesets, mutations)

eden/scm/sapling/ext/commitcloud/upload.py

@@ -78,28 +78,24 @@ def upload(repo, revs, force=False, localbackupstate=None):
             component="commitcloud",
         )
 
-    draftrevs = list(
-        repo.changelog.torevset(repo.dageval(lambda: draft() & ancestors(missingheads)))
-    )
+    draftnodes = list(repo.dageval(lambda: draft() & ancestors(missingheads)))
 
-    # If the only draft revs are the missing heads then we can skip the
+    # If the only draft nodes are the missing heads then we can skip the
     # known checks, as we know they are all missing.
-    skipknowncheck = len(draftrevs) == len(missingheads)
-    newuploaded, failed = edenapi_upload.uploadhgchangesets(
-        repo, draftrevs, force, skipknowncheck
+    skipknowncheck = len(draftnodes) == len(missingheads)
+    newuploaded, failednodes = edenapi_upload.uploadhgchangesets(
+        repo, draftnodes, force, skipknowncheck
     )
 
-    failednodes = {repo[r].node() for r in failed}
-
-    # Uploaded heads are all heads that have been filtered or uploaded and also heads of the 'newuploaded' revs.
+    # Uploaded heads are all heads that have been filtered or uploaded and also heads of the 'newuploaded' nodes.
 
     # Example (5e4faf031 must be included in uploadedheads):
     #  o  4bb40f883 (failed)
     #  │
     #  @  5e4faf031 (uploaded)
 
     uploadedheads = list(
-        repo.nodes("heads(%ld) + %ln - heads(%ln)", newuploaded, heads, failednodes)
+        repo.nodes("heads(%ln) + %ln - heads(%ln)", newuploaded, heads, failednodes)
     )
 
     if localbackupstate:

eden/scm/sapling/ext/snapshot/createremote.py

@@ -20,13 +20,11 @@
 def _backupparents(repo, wctx) -> None:
     """make sure this commit's ancestors are backed up in commitcloud"""
     parents = (wctx.p1().node(), wctx.p2().node())
-    draftrevs = repo.changelog.torevset(
-        # pyre-fixme[10]: Name `ancestors` is used but not defined.
-        # pyre-fixme[10]: Name `draft` is used but not defined.
-        repo.dageval(lambda: draft() & ancestors(parents))
-    )
+    # pyre-fixme[10]: Name `ancestors` is used but not defined.
+    # pyre-fixme[10]: Name `draft` is used but not defined.
+    draftnodes = repo.dageval(lambda: draft() & ancestors(parents))
 
-    (success, failed) = uploadhgchangesets(repo, draftrevs)
+    (success, failed) = uploadhgchangesets(repo, draftnodes)
     if failed:
         raise error.Abort(
             _("failed to upload ancestors to commit cloud: {}").format(