hgitaly 18.4.1__tar.gz → 18.4.3__tar.gz

{hgitaly-18.4.1/hgitaly.egg-info → hgitaly-18.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.4.1
+Version: 18.4.3
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet

hgitaly-18.4.3/hgitaly/VERSION

@@ -0,0 +1 @@
+18.4.3

{hgitaly-18.4.1 → hgitaly-18.4.3}/hgitaly/scripts.py

@@ -197,6 +197,7 @@ def stats():  # pragma no cover
     incomplete = total_requests - sum(len(succ) for succ in succeeded.values())
 
     stats = []
+    all_total_ms = 0
     for req, count in called.items():
         percent = round(count * 100 / total_requests)
         succ = succeeded[req]
@@ -208,10 +209,12 @@ def stats():  # pragma no cover
                          )
         stats.append((req, req_stats))
         if nb_succ > 0:
+            req_total = sum(s for s in succ)
+            all_total_ms += req_total
             timing = req_stats['completion_stats_ms'] = dict(
                 mean=statistics.mean(succ),
                 median=statistics.median(succ),
-                total=sum(s for s in succ),
+                total=req_total,
             )
             if nb_succ > 1:
                 timing['standard_deviation'] = statistics.pstdev(succ)
@@ -246,6 +249,7 @@ def stats():  # pragma no cover
 
     print(f"TOTAL Requests since {first_timestamp}: {total_requests} \n"
           f"      {incomplete} incomplete (cancelled or failed)")
+    print("Total wall time: %d seconds" % int(all_total_ms / 1000))
     print("Breakdown:")
     for req, details in stats.items():
         percent = '%4.1f' % details['percent']

{hgitaly-18.4.1 → hgitaly-18.4.3}/hgitaly/service/commit.py

@@ -148,7 +148,7 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
         try:
             ancestor = repo[request.ancestor_id.encode()]
             child = repo[request.child_id.encode()]
-        except error.RepoLookupError as exc:
+        except (error.RepoLookupError, error.ProgrammingError) as exc:
             # Gitaly just returns False. This is probably an inconsistency
             # in the client, so let's log it to help.
             logger.warning(
@@ -925,7 +925,7 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
             sort_key = b'-topo' if reverse else b'topo'
         elif request.order == Order.DATE:
             # See docstring about this approximative choice
-            sort_key = b'-date' if reverse else b'date'
+            sort_key = b'date' if reverse else b'-date'
 
         revset = b'sort(%s, %s)' % (revset, sort_key)
 

{hgitaly-18.4.1 → hgitaly-18.4.3}/hgitaly/service/tests/test_commit.py

@@ -1362,8 +1362,9 @@ def test_list_commits(commit_fixture_empty_repo):
     # orderings
     Order = ListCommitsRequest.Order
     assert list_commits(sha4, order=Order.TOPO) == [sha4, sha3, sha2, sha0]
-    # having no explicit date, ctx0 looks to be the most recent one.
-    assert list_commits(sha4, order=Order.DATE) == [sha2, sha3, sha4, sha0]
+    # being the only one with no explicit date, ctx0 looks to be
+    # the most recent one.
+    assert list_commits(sha4, order=Order.DATE) == [sha0, sha4, sha3, sha2]
 
     # no result
     assert list_commits(sha4, caret(ctx4)) == []

{hgitaly-18.4.1 → hgitaly-18.4.3/hgitaly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.4.1
+Version: 18.4.3
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet

{hgitaly-18.4.1 → hgitaly-18.4.3}/tests_with_gitaly/test_commit.py

@@ -347,12 +347,23 @@ def test_compare_commit_is_ancestor(gitaly_rhgitaly_comparison, hg_server):
         request_cls=CommitIsAncestorRequest,
         request_sha_attrs=['ancestor_id', 'child_id'],
         )
+    rpc_helper.feature_flags = [('rhgitaly-commit-is-ancestor', True)]
     for ancestor, child in (('base', 'other'),
                             ('other', 'top1'),
                             ('top1', 'top2')):
         rpc_helper.assert_compare(ancestor_id=chgs[ancestor].hex().decode(),
                                   child_id=chgs[child].hex().decode())
 
+    # unknown case
+    unknown_sha = 'de43ad12' * 5
+    rpc_helper.assert_compare(ancestor_id=unknown_sha,
+                              child_id=base.hex().decode())
+    rpc_helper.assert_compare(ancestor_id=base.hex().decode(),
+                              child_id=unknown_sha)
+    # same with an id too short, the method only wants full SHAs
+    rpc_helper.assert_compare(ancestor_id=base.hex().decode(),
+                              child_id=chgs['other'].hex()[:10].decode())
+
 
 def test_compare_list_files(gitaly_comparison):
     fixture = gitaly_comparison

hgitaly-18.4.1/hgitaly/VERSION

@@ -1 +0,0 @@
-18.4.1