hgitaly 17.11.2__tar.gz → 17.11.4__tar.gz

{hgitaly-17.11.2 → hgitaly-17.11.4}/.hgtags

@@ -131,6 +131,7 @@ c9f24d13c3f7bbfc5453a4b92f33f0e96c212b51 2.7.2
 574bfafe236c29f35131537fb4b8616cfbecab95 2.9.0
 0f117ee61f169f9f9e56eadc340bdeeecb27259c 2.10.0
 7d3440ddf010e5860660e5b82444ca2defbd60d1 2.11.0
+cb9ce85c2136fd2c68f6cd7684c72ac33e659678 2.11.1
 d6cce24d89a8a37cd85398f063203d3075c1afd1 17.8.0
 646eb4769d16649b8daff17647e1e92ec81e68c8 17.8.1
 cb5acb3e763e63d908e6eec319b17a7faaabbe7c 17.8.2
@@ -143,3 +144,5 @@ c964e44bbddc2d8fd41fd72a685535dc7c793150 17.9.2
 fdf0201ab1df3afbb372f4dd1005009ca37be713 17.11.0a0
 035b7b7e03a1c34fea4bc7995d54d2c8d088c3f7 17.11.0
 82eb6e9f12cb5a63bcd6a1f5e9c5ff26fb17b0f6 17.11.1
+12035ca6dd36b033c1ef3ff0e1d8f3c954d00edf 17.11.2
+02fe8d2e369a2349531e3ff9735477cf37f95c72 17.11.3

{hgitaly-17.11.2 → hgitaly-17.11.4}/PKG-INFO

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

hgitaly-17.11.4/hgitaly/VERSION

@@ -0,0 +1 @@
+17.11.4

{hgitaly-17.11.2 → hgitaly-17.11.4}/hgitaly/scripts.py

@@ -159,6 +159,7 @@ def stats():  # pragma no cover
                                               'timing:median',
                                               'timing:worst_decile',
                                               'timing:worst_centile',
+                                              'timing:total',
                                               ),
                         default='calls')
 
@@ -210,6 +211,7 @@ def stats():  # pragma no cover
             timing = req_stats['completion_stats_ms'] = dict(
                 mean=statistics.mean(succ),
                 median=statistics.median(succ),
+                total=sum(s for s in succ),
             )
             if nb_succ > 1:
                 timing['standard_deviation'] = statistics.pstdev(succ)

{hgitaly-17.11.2 → hgitaly-17.11.4}/hgitaly/service/commit.py

@@ -903,6 +903,8 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
             context.abort(StatusCode.INTERNAL,
                           "Revision %r could not be resolved" % exc.args[0])
 
+        walk = not request.disable_walk
+
         if positive is VISIBLE_CHANGESETS:
             # do not switch to unfiltered view!
             if negative:
@@ -916,8 +918,10 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
             repo = repo.unfiltered()
             if negative:
                 revset = b'only(%ls, %ls)'
-            else:
+            elif walk:
                 revset = b'::%ls'
+            else:
+                revset = b'%ls'
 
         msg_patterns = request.commit_message_patterns
         ignore_case = request.ignore_case
@@ -930,6 +934,21 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
             else:
                 revset += b' and ' + greps[0]
 
+        after = request.after.ToSeconds()
+        before = request.before.ToSeconds()
+        date = getdate(after, before)
+        if date is not None:
+            revset += b" and date('%s')" % date.encode('ascii')
+
+        author = request.author
+        if author:
+            revset += b" and user(r're:%s')" % author
+
+        # no octopuses in Mercurial, hence max_parents > 1 does not filter
+        # anything
+        if request.max_parents == 1:
+            revset += b" and not merge()"
+
         Order = ListCommitsRequest.Order
         reverse = request.reverse
 

{hgitaly-17.11.2 → hgitaly-17.11.4}/hgitaly/service/tests/test_commit.py

@@ -1337,7 +1337,7 @@ def test_list_commits(commit_fixture_empty_repo):
     wrapper.update(ctx0.rev())
     wrapper.command(b'mv', wrapper.repo.root + b'/foo',
                     wrapper.repo.root + b'/zoo')
-    ts = int(time.time())
+    ts = int(time.time() - 50)
     sha2 = wrapper.commit([b'foo', b'zoo'],
                           message=b"rename foo to zoo",
                           utc_timestamp=ts - 10,).hex()
@@ -1346,7 +1346,9 @@ def test_list_commits(commit_fixture_empty_repo):
                                user='testuser <testuser@heptapod.test')
     sha3 = ctx3.hex()
     wrapper.update(2)
-    ctx4 = wrapper.merge_commit(ctx3, message=b'merge with stable')
+    ctx4 = wrapper.merge_commit(ctx3, message=b'merge with stable',
+                                utc_timestamp=ts+20)
+
     sha4 = ctx4.hex()
 
     def caret(ctx):
@@ -1365,11 +1367,15 @@ def test_list_commits(commit_fixture_empty_repo):
     # orderings
     Order = ListCommitsRequest.Order
     assert list_commits(sha4, order=Order.TOPO) == [sha4, sha3, sha2, sha0]
-    assert list_commits(sha4, order=Order.DATE) == [sha2, sha0, sha4, sha3]
+    # having no explicit date, ctx0 looks to be the most recent one.
+    assert list_commits(sha4, order=Order.DATE) == [sha2, sha3, sha4, sha0]
 
     # no result
     assert list_commits(sha4, caret(ctx4)) == []
 
+    # disable walk
+    assert list_commits(sha4, disable_walk=True) == [sha4]
+
     # message patterns
     assert list_commits(sha4, commit_message_patterns=[b'foo']) == [sha2]
     assert set(
@@ -1379,6 +1385,26 @@ def test_list_commits(commit_fixture_empty_repo):
                         commit_message_patterns=[b'FOO'],
                         ignore_case=True) == [sha2]
 
+    # max_parents
+    assert list_commits(sha4, max_parents=2) == list_commits(sha4)
+    assert list_commits(sha4, max_parents=3) == list_commits(sha4)
+    assert list_commits(sha4, max_parents=1) == [sha3, sha2, sha0]
+
+    # dates
+    date, date2 = Timestamp(), Timestamp()
+    date.FromSeconds(ts+10)
+    assert list_commits(sha4, before=date) == [sha3, sha2]
+    assert list_commits(sha4, after=date) == [sha4, sha3, sha0]
+    # gracinet: given that before is < and after is > I didn't expect
+    # after=before to return anything, but `hg help dates` says that
+    # the `to` range specifier is inclusive.
+    assert list_commits(sha4, after=date, before=date) == [sha3]
+    date2.FromSeconds(ts+40)
+    assert list_commits(sha4, after=date, before=date2) == [sha4, sha3]
+
+    # author regexp
+    assert list_commits(sha4, author=b't.stuser') == [sha3]
+
     # unknown revision, including special cases:
     for unknown in ('branch/unknown',
                     'f' * 39,  # wdir node id, prefix

{hgitaly-17.11.2 → hgitaly-17.11.4}/hgitaly/testing/ssh.py

@@ -9,6 +9,7 @@ from pathlib import Path
 import sys
 
 
+# TODO move up to hgitaly.testing
 def hg_exe_path():  # pragma no cover
     """Return a Mercurial executable path consistent with these tests.
 

{hgitaly-17.11.2 → hgitaly-17.11.4}/hgitaly.egg-info/PKG-INFO

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