Merge master for a new release

--HG--
branch : release

Author: kazssym

.hgtags

@@ -1,2 +1,4 @@
 91d2ec54cf909ab56b0de299730171fbe1a18226 release/1a1
 244657cb77ec52ebd9829bb06f76ea97b0bbbc95 release/1a2
+bbc1637021c22706c8ccbe76eb6f71bf48f4126a release/1.0
+bba7efe4f12f4148e1481b105316dd2bf7f6f912 release/1.1

.vscode/settings.json

@@ -7,5 +7,10 @@
         "**/*.rej": true,
         "**/*.orig": true,
         "**/*~": true
-    }
+    },
+    "python.testing.unittestEnabled": true,
+    "python.testing.unittestArgs": [
+        "-s",
+        "test"
+    ]
 }

.vscode/tasks.json

@@ -7,9 +7,10 @@
             "command": "${config:python.pythonPath}",
             "args": [
                 "./setup.py",
-                "test"
+                "build"
             ],
-            "group": "build"
+            "group": "build",
+            "problemMatcher": []
         },
         {
             "label": "Rebuild",
@@ -18,9 +19,10 @@
             "args": [
                 "./setup.py",
                 "clean",
-                "test"
+                "build"
             ],
-            "group": "build"
+            "group": "build",
+            "problemMatcher": []
         },
         {
             "label": "Clean",

azure-pipelines.yml

@@ -14,23 +14,34 @@ stages:
     jobs:
       - job: Build
         pool:
-          vmImage: ubuntu-latest
+          vmImage: ubuntu-16.04
+        container: kazssym/python-prcs:3
         steps:
-          - task: UsePythonVersion@0
           - bash: |
-              pip install "setuptools>=38.6" wheel
+              pip install \
+                  "setuptools>=38.6" \
+                  unittest-xml-reporting \
+                  wheel
             displayName: Install dependencies
           - bash: |
-              python ./setup.py test
+              python ./setup.py build
+            displayName: Build
+          - bash: |
+              #python test/prepare.py test/testproject.prcs.b64
+              python -m xmlrunner discover -s test -o test-reports
             displayName: Test
+            env:
+              PRCS_REPOSITORY: $(Agent.TempDirectory)/PRCS
           - task: PublishTestResults@2
+            condition: succeededOrFailed()
           - bash: |
               python ./setup.py sdist bdist_wheel
             displayName: Create archives
           - publish: dist
             artifact: dist
   - stage: Release
-    condition: >-
+    dependsOn: Default
+    condition:
       and(succeeded(),
         startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))
     jobs:

hgext3rd/__init__.py

@@ -0,0 +1,23 @@
+# __init__.py - initialization of the 'hgext3rd' package
+# Copyright (C) 2020 Kaz Nishimura
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+"""
+empty package
+
+This file is not for installation.
+"""

hgext3rd/convert_prcs/__init__.py

@@ -24,6 +24,7 @@
 """
 
 from __future__ import absolute_import, unicode_literals
+
 from hgext.convert import convcmd
 from .prcs import prcs_source
 
@@ -32,7 +33,7 @@
 
 def extsetup(ui):
     """
-    set up the 'convert_prcs' extension
+    Set up the 'convert_prcs' extension.
     """
     convcmd.source_converters.append(
         (b"prcs", prcs_source, b"branchsort")

hgext3rd/convert_prcs/prcs.py

@@ -21,10 +21,10 @@
 """
 
 from __future__ import absolute_import, unicode_literals
+
 import re
-import os
-import sys
 from hgext.convert.common import NoRepo, commit, converter_source
+from mercurial.util import unlinkpath
 from prcslib import PrcsVersion, PrcsProject, PrcsError
 
 # Regular expression pattern that checks for main branches.
@@ -43,7 +43,7 @@ def __init__(self, ui, scm, path, revs=None):
 
         try:
             self._project = PrcsProject(path.decode())
-            self._revisions = self._project.versions()
+            self._versions = self._project.versions()
         except PrcsError:
             raise NoRepo(b"%s does not look like a PRCS project" % path)
 
@@ -66,7 +66,7 @@ def _nearest_ancestor(self, version):
             version = PrcsVersion(version)
 
         deleted = False
-        while self._revisions[str(version)]['deleted']:
+        while self._versions[str(version)]['deleted']:
             self.ui.note(version, " is deleted\n")
             deleted = True
             version = PrcsVersion(version.major(), version.minor() - 1)
@@ -82,61 +82,81 @@ def getheads(self):
         return all the head versions of the PRCS source
         """
         last_minors = {}
-        for key in self._revisions:
-            if not self._revisions[key]["deleted"]:
+        for key in self._versions:
+            if not self._versions[key]["deleted"]:
                 version = PrcsVersion(key)
                 if last_minors.get(version.major(), 0) < version.minor():
                     last_minors[version.major()] = version.minor()
         return map(
             lambda item: str(PrcsVersion(*item)).encode(),
             last_minors.items())
 
-    def getfile(self, name, version):
+    def getfile(self, name, rev):
         """
-        get the content of a file
+        Return the content and mode of a file as a 'tuple' value
         """
-        version = version.decode()
-        descriptor = self._descriptor(version)
+        if rev is None:
+            return None, None
+
+        rev = rev.decode()
+        descriptor = self._descriptor(rev)
         files = descriptor.files()
-        if name.decode() in files:
-            attr = files[name.decode()]
-            if "symlink" in attr:
-                return attr["symlink"].encode(), b"l"
+        if not name.decode() in files:
+            self.ui.debug(b"%s not found for %s" % (name, rev.encode()))
+            return None, None
 
-            self._project.checkout(version, files=[name.decode()])
+        attr = files[name.decode()]
+        if "symlink" in attr:
+            return attr["symlink"].encode(), b"l"
 
+        self._project.checkout(rev, files=[name.decode()])
+
+        try:
             with open(name, "rb") as stream:
                 content = stream.read()
+        finally:
+            unlinkpath(name)
 
-            # NOTE: Win32 does not always releases the file name.
-            if sys.platform != "win32":
-                os.unlink(name)
-                dir = os.path.dirname(name)
-                if dir:
-                    os.removedirs(dir)
-
-            return content, b"x" if attr["mode"] & (0x1 << 6) else b""
+        return content, b"x" if attr["mode"] & (0x1 << 6) else b""
 
-        # The file with the specified name was deleted.
-        return None, None
+    def _removedfiles(self, files, parentfiles):
+        """
+        Return a (files, copies) tuple for removed or renamed files.
+        """
+        changes = []
+        copies = {}
+        pnamebyid = {}
+        for pname, pa in parentfiles.items():
+            if pname not in files:
+                changes.append((pname.encode(), None))
+            if "symlink" not in pa:
+                pnamebyid[pa['id']] = pname
+        # To process renamed files for copies.
+        for name, attr in files.items():
+            if not "symlink" in attr and attr['id'] in pnamebyid:
+                pname = pnamebyid[attr['id']]
+                if name != pname:
+                    self.ui.note(b"%s was renamed to %s\n" % \
+                        (pname.encode(), name.encode()))
+                    copies[name.encode()] = pname.encode()
+        return changes, copies
 
     def getchanges(self, version, full=False):
         version = version.decode()
-        revision = self._revisions[version]
         descriptor = self._descriptor(version)
 
         files = []
         copies = {}
         f = descriptor.files()
-        p = descriptor.parentversion()
+        parent = descriptor.parent()
         # Preparing for a deleted parent.
-        p = self._nearest_ancestor(p)
-        if full or p is None:
+        parent = self._nearest_ancestor(parent)
+        if full or parent is None:
             # This is the initial checkin so all files are affected.
             for name in f:
                 files.append((name.encode(), version.encode()))
         else:
-            pf = self._descriptor(p).files()
+            pf = self._descriptor(parent).files()
             # Handling added or changed files.
             for name, a in f.items():
                 if name in pf:
@@ -155,34 +175,22 @@ def getchanges(self, version, full=False):
                 else:
                     # Added.
                     files.append((name.encode(), version.encode()))
-            # Handling deleted or renamed files.
-            pnamebyid = {}
-            for pname, pa in pf.items():
-                if pname not in f:
-                    # Removed (or renamed).
-                    files.append((pname.encode(), version.encode()))
-                if "symlink" not in pa:
-                    pnamebyid[pa['id']] = pname
-            # Handling renamed files for copies.
-            for name, a in f.items():
-                if "symlink" not in a and a['id'] in pnamebyid:
-                    pname = pnamebyid[a['id']]
-                    if name != pname:
-                        self.ui.note(b"%s was renamed to %s\n" % (pname.encode(), name.encode()))
-                        copies[name.encode()] = pname.encode()
+            # To process removed or renamed files.
+            removes, copies = self._removedfiles(f, pf)
+            files.extend(removes)
         return files, copies, set()
 
     def getcommit(self, version):
         version = version.decode()
-        revision = self._revisions[version]
+        revision = self._versions[version]
         descriptor = self._descriptor(version)
 
         parents = []
-        p = descriptor.parentversion()
+        parent = descriptor.parent()
         # Preparing for a deleted parent.
-        p = self._nearest_ancestor(p)
-        if p is not None:
-            parents.append(str(p).encode())
+        parent = self._nearest_ancestor(parent)
+        if not parent is None:
+            parents.append(str(parent).encode())
         for mp in descriptor.mergeparents():
             # Preparing for a deleted merge parent.
             mp = self._nearest_ancestor(mp)
@@ -196,6 +204,12 @@ def getcommit(self, version):
             revision['author'].encode(), revision['date'].isoformat().encode(),
             descriptor.message().encode(), parents, branch)
 
+    def numcommits(self):
+        """
+        Return the number of commits.
+        """
+        return len(self._versions)
+
     def gettags(self):
         """Return an empty dictionary since PRCS has no tags."""
         return {}

setup.py

@@ -21,14 +21,15 @@
 """
 
 from __future__ import absolute_import
+
 from os import path
 from setuptools import setup
 
 # Package name.
 PACKAGE_NAME = "hg-convert-prcs-extension"
 
 # Package version.
-PACKAGE_VERSION = "1.0"
+PACKAGE_VERSION = "2.0.0"
 
 def long_description():
     """
@@ -50,7 +51,7 @@ def long_description():
         description="PRCS source for the Mercurial convert extension.",
         url="https://vx68k.bitbucket.io/hg-convert-prcs/",
         project_urls={
-            "GitHub": "https://github.com/vx68k/hg-convert-prcs-extension",
+            "Source": "https://github.com/vx68k/hg-convert-prcs-extension",
         },
         author="Kaz Nishimura",
         author_email="kazssym@linuxfront.com",
@@ -65,12 +66,11 @@ def long_description():
         python_requires=">=2.7",
         install_requires=[
             "mercurial>=4.7",
-            "prcslib>=2"
+            "prcslib>=4.1"
         ],
         zip_safe=True,
 
         packages=[
             "hgext3rd.convert_prcs"
         ],
-        test_suite="testsuite",
     )