hgitaly 18.7.2__tar.gz → 18.7.3__tar.gz

{hgitaly-18.7.2/hgitaly.egg-info → hgitaly-18.7.3}/PKG-INFO

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

hgitaly-18.7.3/hgitaly/VERSION

@@ -0,0 +1 @@
+18.7.3

{hgitaly-18.7.2 → hgitaly-18.7.3}/hgitaly/scripts/load_tests.py

@@ -88,7 +88,6 @@ class LoadWorker:
             thresholds.append((current, meth))
             current += weight / total_weight
         cls.random_thresholds = thresholds
-        logger.warning("Random thresholds: %r", thresholds)
 
     @classmethod
     def random_method(cls):

{hgitaly-18.7.2 → hgitaly-18.7.3}/hgitaly/tests/test_workdir.py

@@ -14,6 +14,7 @@ import uuid
 import warnings
 
 from mercurial import (
+    cmdutil,
     error,
     hg,
 )
@@ -452,6 +453,52 @@ def test_working_directory_merge(wd_fixture, merge_result):
         # TODO clean status (provide in mercurial_testhelpers)
 
 
+def test_working_directory_interruped_rebase(wd_fixture):
+    wds_root, wrapper = wd_fixture
+    commit_file = wrapper.commit_file
+
+    # a simple merge setup with a conflicting topic
+    ctx0 = commit_file('foo')
+    cs_default = commit_file('foo', content="default")
+    cs_topic = commit_file('foo', parent=ctx0, topic='top', content="top")
+
+    # leaving failed rebase in a working directory
+    with working_directory(wds_root, wrapper.repo,
+                           client_id=CLIENT_ID,
+                           incarnation_id=INCARNATION_ID,
+                           changeset=cs_topic) as wd:
+        default_wd_id = wd.id
+        # in these tests, the extensions are not activated globally, hence
+        # not in the workdir unless we do it explicitly.
+        # We'll have to find a better way, but perhaps another day.
+        with open(wd.path / '.hg/hgrc', 'a') as hgrcf:
+            hgrcf.write('\n'.join(('[extensions]',
+                                   'rebase=',
+                                   'topic=',
+                                   'evolve=',
+                                   )))
+        wd_wrapper = LocalRepoWrapper.load(wd.path)
+        try:
+            wd_wrapper.command('rebase')
+        except error.Abort:
+            pass  # that is the point
+
+    # re-acquisition works because it cleans up remnants
+    # target changeset could be either cs_default or cs_topic,
+    # as only the persisten branch matters)
+    with working_directory(wds_root, wrapper.repo,
+                           client_id=CLIENT_ID,
+                           incarnation_id=INCARNATION_ID,
+                           changeset=cs_default) as wd:
+        assert wd.id == default_wd_id
+
+        wctx = wd.repo[None]
+        assert wctx.p1() == cs_default
+        assert wctx.p2().rev() == NULL_REVISION
+        # TODO clean status (provide in mercurial_testhelpers)
+        assert cmdutil.getunfinishedstate(wd.repo) is None
+
+
 @pytest.fixture
 def purge_fixture(wd_fixture):
     wds_root, wrapper = wd_fixture

{hgitaly-18.7.2 → hgitaly-18.7.3}/hgitaly/workdir.py

@@ -103,6 +103,12 @@ class WorkingDirectory:
         return cmd(repo.ui, repo, *args, **kwargs)
 
     def clean_update(self, target_rev):
+        unfinished = cmdutil.getunfinishedstate(self.repo)
+        if unfinished is not None:
+            opname = unfinished._opname
+            if opname == b'rebase':
+                self.command(b'rebase', abort=True)
+
         try:
             self.uncaught_update(target_rev, clean=True, hidden=True)
         except error.Abort as exc:

{hgitaly-18.7.2 → hgitaly-18.7.3/hgitaly.egg-info}/PKG-INFO

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

hgitaly-18.7.2/hgitaly/VERSION

@@ -1 +0,0 @@
-18.7.2