hgitaly 18.2.3__tar.gz → 18.2.4__tar.gz

{hgitaly-18.2.3/hgitaly.egg-info → hgitaly-18.2.4}/PKG-INFO

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

hgitaly-18.2.4/hgitaly/VERSION

@@ -0,0 +1 @@
+18.2.4

{hgitaly-18.2.3 → hgitaly-18.2.4}/hgitaly/service/operations.py

@@ -361,9 +361,14 @@ class OperationServicer(OperationServiceServicer, HGitalyServicer):
             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:
-                context.abort(StatusCode.INVALID_ARGUMENT,
-                              "wrong old oid")
+            if old_oid:
+                old_ctx = gitlab_revision_changeset(repo, gl_branch)
+                if (
+                        (old_ctx is None and old_oid != ZERO_SHA)
+                        or (old_ctx is not None and old_ctx.hex() != old_oid)
+                ):
+                    context.abort(StatusCode.INVALID_ARGUMENT,
+                                  "wrong old oid")
 
         if to_publish and self.heptapod_permission != 'publish':
             context.abort(

{hgitaly-18.2.3 → hgitaly-18.2.4}/hgitaly/service/tests/test_operations.py

@@ -24,6 +24,7 @@ from hgext3rd.heptapod.branch import (
     gitlab_branches,
 )
 
+from hgitaly.revision import ZERO_SHA_STR
 from hgitaly.stub.operations_pb2 import (
     OperationBranchUpdate,
     UserCommitFilesAction,
@@ -832,3 +833,49 @@ def test_user_commit_files(operations_fixture, tmpdir):
             UserCommitFilesRequest(action=UserCommitFilesAction())
         ])
     assert exc_info.value.code() == StatusCode.INVALID_ARGUMENT
+
+
+def test_user_commit_files_null_old_oid(operations_fixture, tmpdir):
+    fixture = operations_fixture
+    commit_files = fixture.user_commit_files
+    ActionType = UserCommitFilesActionHeader.ActionType
+
+    fixture.hg_native = True  # TODO just remove hg-git now
+    fixture.heptapod_permission = 'publish'
+    wrapper = fixture.repo_wrapper
+    with open(wrapper.path / '.hg/hgrc', 'a') as hgrcf:
+        # this is part of the normally included `required.hgrc` of
+        # py-heptapod
+        hgrcf.write('\n'.join((
+            "[experimental]",
+            "topic.publish-bare-branch = yes"
+            ""
+        )))
+
+    gl_topic = b'topic/default/zetop'
+    gl_branch = b'branch/default'
+
+    wrapper.commit_file('foo')  # first commit on `branch/default`
+
+    # now let's start a topic, passing explicitely old_oid indicating
+    # that is does not exist yet
+    two_lines = b"zz\nsecond proto message"
+    resp = commit_files(
+        branch_name=gl_topic,
+        start_branch_name=gl_branch,
+        commit_message=b'New topic',
+        expected_old_oid=ZERO_SHA_STR,
+        actions=(dict(action=ActionType.CREATE,
+                      file_path=b'intop',
+                      content=two_lines,
+                      ),
+                 )
+    )
+    hex1 = resp.branch_update.commit_id.encode()
+
+    wrapper.reload()
+    ctx1 = wrapper.repo[hex1]
+
+    assert ctx1.description() == b'New topic'
+    assert ctx1.branch() == b'default'
+    assert ctx1.topic() == b'zetop'

{hgitaly-18.2.3 → hgitaly-18.2.4/hgitaly.egg-info}/PKG-INFO

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

hgitaly-18.2.3/hgitaly/VERSION

@@ -1 +0,0 @@
-18.2.3