hgitaly 18.4.2__tar.gz → 18.4.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.4.2
+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.2 → 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(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.4.2
+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.2 → 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.2/hgitaly/VERSION

@@ -1 +0,0 @@
-18.4.2