hgitaly 18.2.1__tar.gz → 18.2.2__tar.gz

{hgitaly-18.2.1/hgitaly.egg-info → hgitaly-18.2.2}/PKG-INFO

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

hgitaly-18.2.2/hgitaly/VERSION

@@ -0,0 +1 @@
+18.2.2

{hgitaly-18.2.1 → hgitaly-18.2.2}/hgitaly/service/operations.py

@@ -43,6 +43,7 @@ from ..revision import (
     changeset_by_commit_id_abort,
     gitlab_revision_changeset,
     validate_oid,
+    ZERO_SHA,
 )
 from ..servicer import HGitalyServicer
 
@@ -346,13 +347,18 @@ class OperationServicer(OperationServiceServicer, HGitalyServicer):
                       and repo.ui.configbool(b'experimental',
                                              b'topic.publish-bare-branch'))
 
+        old_oid = commit_header.expected_old_oid.encode('ascii')
         start_ctx = gitlab_revision_changeset(repo, start_rev)
         if start_ctx is None:
-            if len(repo) > 0:
+            if len(repo) > 0 and old_oid != ZERO_SHA:
                 context.abort(StatusCode.INTERNAL,
                               "Unresolvable start ref or commit")
             else:
                 repo_created = branch_created = True
+        # now that sanity checks are done, we can normalize to null
+        # changeset if needed.
+        if start_ctx is None and old_oid == ZERO_SHA:
+            start_ctx = repo[ZERO_SHA]
         if commit_header.branch_name:
             old_oid = commit_header.expected_old_oid.encode('ascii')
             if old_oid and start_ctx.hex() != old_oid:

{hgitaly-18.2.1 → hgitaly-18.2.2}/hgitaly/service/tests/test_operations.py

@@ -581,6 +581,26 @@ def test_user_commit_files(operations_fixture, tmpdir):
     )
     assert not resp.HasField('branch_update')
 
+    # Special case for NULL
+    # (this normally done at repo creation, for the README)
+    resp = commit_files(
+        branch_name=b'branch/newroot',
+        commit_message=b'starting from NULL',
+        expected_old_oid='0000' * 10,
+        actions=(dict(action=ActionType.CREATE,
+                      file_path=b'from_null',
+                      content=b"it is admissible",
+                      ),
+                 )
+    )
+    hex10 = resp.branch_update.commit_id.encode()
+    wrapper.reload()
+    ctx10 = wrapper.repo[hex10]
+    # without special provisions for old_oid, the changeset would be
+    # stacked on the previous head of default
+    assert ctx10.p1().rev() == -1
+    assert ctx10.branch() == b'newroot'
+
     #
     # Error cases
     #

{hgitaly-18.2.1 → hgitaly-18.2.2/hgitaly.egg-info}/PKG-INFO

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

hgitaly-18.2.1/hgitaly/VERSION

@@ -1 +0,0 @@
-18.2.1