Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mercurial-extension-hg-git for openSUSE:Factory checked in at 2022-12-12 18:59:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mercurial-extension-hg-git (Old) and /work/SRC/openSUSE:Factory/.mercurial-extension-hg-git.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial-extension-hg-git" Mon Dec 12 18:59:14 2022 rev:6 rq:1042424 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mercurial-extension-hg-git/mercurial-extension-hg-git.changes 2022-07-06 15:42:06.454526779 +0200 +++ /work/SRC/openSUSE:Factory/.mercurial-extension-hg-git.new.1835/mercurial-extension-hg-git.changes 2022-12-12 18:59:16.444008154 +0100 @@ -1,0 +2,17 @@ +Mon Dec 12 15:53:46 UTC 2022 - Andrei Dziahel <devel...@develop7.info> + +- Update to version 1.0.1 + + This is a minor release, focusing on bugs and compatibility. + + * Ignore any ``GIT_SSH_COMMAND`` environment variable, rather than + dying with an error. (#369) + * Fix bug with unusual progress lines from Azure Repo (#391) + * Fix incorrect use of localisation APIs (#387) + * Fix pushing with Dulwich 0.2.49 or later. + * Fix tests with Git 2.37. + * Fix bug with tags or remote refs in the local Git repository that + point to missing commits. + * Mark Mercurial 6.2 and 6.3 as supported and tested. + +------------------------------------------------------------------- Old: ---- hg-git-1.0.0.tar.gz New: ---- hg-git-1.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial-extension-hg-git.spec ++++++ --- /var/tmp/diff_new_pack.p2A2Iw/_old 2022-12-12 18:59:17.632014844 +0100 +++ /var/tmp/diff_new_pack.p2A2Iw/_new 2022-12-12 18:59:17.636014867 +0100 @@ -23,7 +23,7 @@ %endif Name: mercurial-extension-hg-git -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: Hg-Git Mercurial plugin License: GPL-2.0-only ++++++ hg-git-1.0.0.tar.gz -> hg-git-1.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/.gitlab-ci.yml new/hg-git-1.0.1/.gitlab-ci.yml --- old/hg-git-1.0.0/.gitlab-ci.yml 2022-04-02 20:49:16.000000000 +0200 +++ new/hg-git-1.0.1/.gitlab-ci.yml 2022-11-04 20:55:21.000000000 +0100 @@ -36,9 +36,9 @@ - &latest-versions PYTHON: - "3.6" - - "3.10" + - "3.11" HG: - - "6.1" + - "6.3" # This is the authoritative list of versions of Mercurial that this # extension is supported and tested with; it should be kept in sync @@ -67,13 +67,15 @@ - "5.8" - "5.9" - "6.0" + - "6.1" + - "6.2" # Test that it is possible to use and run hg-git on versions of Alpine # that include Dulwich, and with the oldest Dulwich supported. Alpine: stage: compat image: - name: alpine:$ALPINE + name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine:$ALPINE script: - apk add gnupg git unzip openssh mercurial py3-pip py3-pygments - | @@ -85,8 +87,6 @@ pip3 install dulwich==$DULWICH fi - pip3 install coverage - - hg --config extensions.hggit=./hggit debuginstall - - hg --config extensions.hggit=./hggit version -v - adduser -D test - chown -R test * - PYTHON=3 su test -c contrib/ci.sh @@ -103,6 +103,7 @@ - ALPINE: - "3.14" - "3.15" + - "3.16" # Test that the tests pass against the current branches Development: @@ -125,7 +126,7 @@ matrix: - &development-versions PYTHON: - - "3.10" + - "3.11" HG: - "stable" - "default" @@ -136,13 +137,13 @@ extends: Alpine stage: upcoming image: - name: alpine:edge + name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine:edge rules: *upcoming-rules parallel: Coverage: stage: .post - image: python:alpine + image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/python:alpine when: always allow_failure: true coverage: /^TOTAL.+?([.0-9]+\%)$/ @@ -157,7 +158,9 @@ paths: - htmlcov reports: - cobertura: coverage.xml + coverage_report: + coverage_format: cobertura + path: coverage.xml # Build images for the above tasks; this should be a scheduled job, as # it is quite unnecessary to run on every invocation. @@ -254,7 +257,7 @@ --destination registry.heptapod.net:443/mercurial/hg-git/git-server Wheels: - image: python + image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/python timeout: 15m stage: archives rules: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/.hgsigs new/hg-git-1.0.1/.hgsigs --- old/hg-git-1.0.0/.hgsigs 2022-04-02 20:51:23.000000000 +0200 +++ new/hg-git-1.0.1/.hgsigs 2022-11-04 21:01:18.000000000 +0100 @@ -22,3 +22,4 @@ bc5339fcea1e1b149602ffc2a06a3626dc44d2f4 0 iHUEABYIAB0WIQRBf9ypgVcBvOhGUkSirMgbQc9ONAUCYfGHqAAKCRCirMgbQc9ONLyzAP9ckjA5a2QaVKObjRxR5fjE27GRHfb5kM8OW62L/KrMdwD/U51ZwVTplaKk6FAGQGrnhHtpST1VjV63Pf4XIT3HmgA= 311e9a57959e5a725c1a0b73f95f2c80161760ef 0 iHUEABYIAB0WIQRBf9ypgVcBvOhGUkSirMgbQc9ONAUCYfGVyQAKCRCirMgbQc9ONIkKAQCt6+ejAUTeVNYQxT+pffrbzU6t+geViCV+s7PB7dMxbgEA9RYaaequsjWDUYrkyaQitjB2pKeqwq6h9ljrZ95sfQQ= d31a72cf70bd402aa5d3d4270871fff83ac47cd0 0 iHUEABYIAB0WIQRBf9ypgVcBvOhGUkSirMgbQc9ONAUCYioVGgAKCRCirMgbQc9ONNXKAP9vxsKN7H1cK45yewQ7hkbod1PQfrhfXKp+XJoonOaeuAEApfmJsYzh9nQQ6xfVX2RhFyjqEdKoCLEJPGcoE/FLRwA= +6f22e3887d8220863620664077c8554da9d487c4 0 iHUEABYIAB0WIQRBf9ypgVcBvOhGUkSirMgbQc9ONAUCYkiYYQAKCRCirMgbQc9ONJpxAQCJk/7x/461bgYzDVC/4ugU1KnlgKjOprn9GE4m7MuuBQD9EPkQsuP8hjJ3HvNX+xQhnBGlwlQf1EYQBSuSaTOw+Qg= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/.hgtags new/hg-git-1.0.1/.hgtags --- old/hg-git-1.0.0/.hgtags 2022-04-02 20:51:23.000000000 +0200 +++ new/hg-git-1.0.1/.hgtags 2022-11-04 21:01:18.000000000 +0100 @@ -45,3 +45,5 @@ 311e9a57959e5a725c1a0b73f95f2c80161760ef 1.0.0b1 d31a72cf70bd402aa5d3d4270871fff83ac47cd0 1.0.0b2 ff6274c7c614f0a6b1e6568c16c9f882ea7c4bc7 1.0.0b2.post1 +a6775b524ee1259619f28d6bee69c0962a543263 1.0.0 +6f22e3887d8220863620664077c8554da9d487c4 1.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/NEWS.rst new/hg-git-1.0.1/NEWS.rst --- old/hg-git-1.0.0/NEWS.rst 2022-04-02 16:53:58.000000000 +0200 +++ new/hg-git-1.0.1/NEWS.rst 2022-11-04 20:55:21.000000000 +0100 @@ -1,3 +1,21 @@ +hg-git 1.0.1 (2022-11-04) +========================= + +This is a minor release, focusing on bugs and compatibility. + +* Ignore any ``GIT_SSH_COMMAND`` environment variable, rather than + dying with an error. (#369) +* Fix bug with unusual progress lines from Azure Repo (#391) +* Fix incorrect use of localisation APIs (#387) +* Fix pushing with Dulwich 0.2.49 or later. +* Fix tests with Git 2.37. +* Fix bug with tags or remote refs in the local Git repository that + point to missing commits. +* Mark Mercurial 6.2 and 6.3 as supported and tested. + +Thanks to Pierre Augier and Aay Jay Chan for contributing to this +release! + hg-git 1.0.0 (2022-04-01) ========================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/PKG-INFO new/hg-git-1.0.1/PKG-INFO --- old/hg-git-1.0.0/PKG-INFO 2022-04-02 21:00:48.847140600 +0200 +++ new/hg-git-1.0.1/PKG-INFO 2022-11-04 21:15:37.675323700 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: hg-git -Version: 1.0.0 +Version: 1.0.1 Summary: push to and pull from a Git repository using Mercurial Home-page: http://foss.heptapod.net/mercurial/hg-git Author: Scott Chacon, Augie Fackler, Kevin Bullock and others @@ -8,7 +8,6 @@ Maintainer-email: hg-...@googlegroups.com License: GPLv2 Keywords: hg git mercurial -Platform: UNKNOWN Requires-Python: >=3.6 Description-Content-Type: text/x-rst License-File: COPYING @@ -54,18 +53,17 @@ Installing ========== -Clone this repository somewhere and make the 'extensions' section in -your ``~/.hgrc`` file look something like this:: +We recommend installing the plugin using your a package manager, such +as pip:: - [extensions] - hggit = [path-to]/hg-git/hggit - -That will enable the Hg-Git extension for you. + python -m pip install hg-git -You can also install the plugin using your favourite package manager, -e.g. pip:: +Alternatively, you can clone this repository somewhere and install it +from the directory:: - pip3 install hggit + hg clone https://foss.heptapod.net/mercurial/hg-git/ + cd hg-git + python -m pip install . And enable it from somewhere in your ``$PYTHONPATH``:: @@ -439,5 +437,3 @@ Possible values are ``keep``, ``skip`` or ``abort``. Prior to 1.0, the default was ``abort``. - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/README.rst new/hg-git-1.0.1/README.rst --- old/hg-git-1.0.0/README.rst 2022-04-02 16:53:58.000000000 +0200 +++ new/hg-git-1.0.1/README.rst 2022-11-04 17:45:05.000000000 +0100 @@ -39,18 +39,17 @@ Installing ========== -Clone this repository somewhere and make the 'extensions' section in -your ``~/.hgrc`` file look something like this:: +We recommend installing the plugin using your a package manager, such +as pip:: - [extensions] - hggit = [path-to]/hg-git/hggit + python -m pip install hg-git -That will enable the Hg-Git extension for you. +Alternatively, you can clone this repository somewhere and install it +from the directory:: -You can also install the plugin using your favourite package manager, -e.g. pip:: - - pip3 install hggit + hg clone https://foss.heptapod.net/mercurial/hg-git/ + cd hg-git + python -m pip install . And enable it from somewhere in your ``$PYTHONPATH``:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/contrib/ci.sh new/hg-git-1.0.1/contrib/ci.sh --- old/hg-git-1.0.0/contrib/ci.sh 2022-03-28 09:33:03.000000000 +0200 +++ new/hg-git-1.0.1/contrib/ci.sh 2022-08-19 16:23:51.000000000 +0200 @@ -2,6 +2,10 @@ set -x +git version +hg debuginstall --config extensions.hggit=./hggit +hg version -v --config extensions.hggit=./hggit + exec python$PYTHON tests/run-tests.py \ --color=always \ --cover \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/contrib/docker/installhg.sh new/hg-git-1.0.1/contrib/docker/installhg.sh --- old/hg-git-1.0.0/contrib/docker/installhg.sh 2022-04-01 18:36:53.000000000 +0200 +++ new/hg-git-1.0.1/contrib/docker/installhg.sh 2022-11-04 20:55:21.000000000 +0100 @@ -6,11 +6,16 @@ RUNDEPENDS="git git-daemon unzip openssh gnupg" PIPDEPENDS="black==22.3 coverage dulwich pyflakes pygments pylint" +PIP="python -m pip --no-cache-dir" + set -xe apk add --no-cache $BUILDDEPENDS $RUNDEPENDS -python -m pip --no-cache-dir install --pre $PIPDEPENDS +# update pip itself, due to issue #11123 in pip +$PIP install -U pip setuptools wheel + +$PIP install $PIPDEPENDS # handle pre-release versions get_version() { @@ -25,10 +30,10 @@ if test -n "$hgversion" then - python -m pip install --pre mercurial==$hgversion + $PIP install mercurial==$hgversion else # unreleased, so fetch directly from Heptapod itself - python -m pip install \ + $PIP install \ https://foss.heptapod.net/octobus/mercurial-devel/-/archive/branch/$HG/hg.tar.bz2 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/hg_git.egg-info/PKG-INFO new/hg-git-1.0.1/hg_git.egg-info/PKG-INFO --- old/hg-git-1.0.0/hg_git.egg-info/PKG-INFO 2022-04-02 21:00:47.000000000 +0200 +++ new/hg-git-1.0.1/hg_git.egg-info/PKG-INFO 2022-11-04 21:15:36.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: hg-git -Version: 1.0.0 +Version: 1.0.1 Summary: push to and pull from a Git repository using Mercurial Home-page: http://foss.heptapod.net/mercurial/hg-git Author: Scott Chacon, Augie Fackler, Kevin Bullock and others @@ -8,7 +8,6 @@ Maintainer-email: hg-...@googlegroups.com License: GPLv2 Keywords: hg git mercurial -Platform: UNKNOWN Requires-Python: >=3.6 Description-Content-Type: text/x-rst License-File: COPYING @@ -54,18 +53,17 @@ Installing ========== -Clone this repository somewhere and make the 'extensions' section in -your ``~/.hgrc`` file look something like this:: +We recommend installing the plugin using your a package manager, such +as pip:: - [extensions] - hggit = [path-to]/hg-git/hggit - -That will enable the Hg-Git extension for you. + python -m pip install hg-git -You can also install the plugin using your favourite package manager, -e.g. pip:: +Alternatively, you can clone this repository somewhere and install it +from the directory:: - pip3 install hggit + hg clone https://foss.heptapod.net/mercurial/hg-git/ + cd hg-git + python -m pip install . And enable it from somewhere in your ``$PYTHONPATH``:: @@ -439,5 +437,3 @@ Possible values are ``keep``, ``skip`` or ``abort``. Prior to 1.0, the default was ``abort``. - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/hggit/__init__.py new/hg-git-1.0.1/hggit/__init__.py --- old/hg-git-1.0.0/hggit/__init__.py 2022-04-02 16:53:58.000000000 +0200 +++ new/hg-git-1.0.1/hggit/__init__.py 2022-11-04 20:55:21.000000000 +0100 @@ -162,7 +162,7 @@ b'collections', } -testedwith = b'5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1' +testedwith = b'5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3' minimumhgversion = b'5.2' buglink = b'https://foss.heptapod.net/mercurial/hg-git/issues' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/hggit/__version__.py new/hg-git-1.0.1/hggit/__version__.py --- old/hg-git-1.0.0/hggit/__version__.py 2022-04-02 21:00:47.000000000 +0200 +++ new/hg-git-1.0.1/hggit/__version__.py 2022-11-04 21:15:36.000000000 +0100 @@ -1,5 +1,5 @@ # coding: utf-8 # file generated by setuptools_scm # don't change, don't track in version control -version = '1.0.0' -version_tuple = (1, 0, 0) +__version__ = version = '1.0.1' +__version_tuple__ = version_tuple = (1, 0, 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/hggit/_ssh.py new/hg-git-1.0.1/hggit/_ssh.py --- old/hg-git-1.0.0/hggit/_ssh.py 2022-03-25 17:45:25.000000000 +0100 +++ new/hg-git-1.0.1/hggit/_ssh.py 2022-10-28 17:13:14.000000000 +0200 @@ -19,7 +19,9 @@ """ class _Vendor(SSHVendor): - def run_command(self, host, command, username=None, port=None): + def run_command( + self, host, command, username=None, port=None, **kwargs + ): assert isinstance(command, str) command = command.encode(SSHGitClient.DEFAULT_ENCODING) sshcmd = ui.config(b"ui", b"ssh", b"ssh") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/hggit/compat.py new/hg-git-1.0.1/hggit/compat.py --- old/hg-git-1.0.0/hggit/compat.py 2022-04-02 16:53:58.000000000 +0200 +++ new/hg-git-1.0.1/hggit/compat.py 2022-11-04 14:47:14.000000000 +0100 @@ -12,6 +12,17 @@ wireprotov1peer, ) +from dulwich import pack + +# dulwich 0.20.49 changed create_delta to a generator +def create_delta(base_buf, target_buf): + delta = pack.create_delta(base_buf, target_buf) + + if not isinstance(delta, bytes): + delta = b''.join(delta) + + return delta + # 5.9 and earlier used a future-based API if hasattr(wireprotov1peer, 'future'): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/hggit/git_handler.py new/hg-git-1.0.1/hggit/git_handler.py --- old/hg-git-1.0.0/hggit/git_handler.py 2022-04-02 16:53:58.000000000 +0200 +++ new/hg-git-1.0.1/hggit/git_handler.py 2022-11-04 20:55:21.000000000 +0100 @@ -9,7 +9,7 @@ from dulwich.errors import HangupException, GitProtocolError, ApplyDeltaError from dulwich.objects import Blob, Commit, Tag, Tree, parse_timezone -from dulwich.pack import create_delta, apply_delta +from dulwich.pack import apply_delta from dulwich.refs import ( ANNOTATED_TAG_SUFFIX, LOCAL_BRANCH_PREFIX, @@ -130,9 +130,11 @@ if determinate: pos, total = map(int, determinate.group(1, 2)) - else: + elif indeterminate: pos = int(indeterminate.group(1)) total = None + else: + continue self._progress.update(pos, total=total) @@ -314,7 +316,8 @@ if os.path.exists(self.vfs.join(self.tags_file)): for line in self.vfs(self.tags_file): sha, name = line.strip().split(b' ', 1) - self.tags[name] = sha + if sha in self.repo.unfiltered(): + self.tags[name] = sha def save_tags(self): with self.repo.lock(): @@ -339,8 +342,10 @@ for f in files: try: ref = root.replace(refdir + pycompat.ossep, b'') + b'/' - node = open(os.path.join(root, f), 'rb').read().strip() - self._remote_refs[ref + f] = bin(self._map_git[node]) + sha = open(os.path.join(root, f), 'rb').read().strip() + node = bin(self._map_git[sha]) + if node in self.repo.unfiltered(): + self._remote_refs[ref + f] = node except (KeyError, IOError): pass @@ -1166,7 +1171,7 @@ text = b'\n'.join(l.rstrip() for l in text.splitlines()).strip(b'\n') if text + b'\n' != origtext: - extra[b'message'] = create_delta(text + b'\n', origtext) + extra[b'message'] = compat.create_delta(text + b'\n', origtext) author = commit.author @@ -1187,7 +1192,7 @@ except UnicodeDecodeError: origauthor = author author = util.decode_guess(author, commit.encoding) - extra[b'author'] = create_delta(author, origauthor) + extra[b'author'] = compat.create_delta(author, origauthor) oldenc = util.swap_out_encoding() @@ -1855,12 +1860,12 @@ # only log additions on subsequent pulls if not self.is_clone: - self.ui.status(_("adding bookmark %s\n") % bm) + self.ui.status(_(b"adding bookmark %s\n") % bm) elif unfiltered[current_node].isancestorof(unfiltered[wanted_node]): # fast forward changes.append((bm, wanted_node)) - self.ui.status(_("updating bookmark %s\n") % bm) + self.ui.status(_(b"updating bookmark %s\n") % bm) elif unfiltered.obsstore and wanted_node in obsutil.foreground( unfiltered, [current_node] @@ -1870,11 +1875,11 @@ # a background thingy that is more efficient that # the foreground one.) changes.append((bm, wanted_node)) - self.ui.status(_("updating bookmark %s\n") % bm) + self.ui.status(_(b"updating bookmark %s\n") % bm) else: self.ui.status( - _("not updating diverged bookmark %s\n") % bm, + _(b"not updating diverged bookmark %s\n") % bm, ) if changes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/tests/hghave.py new/hg-git-1.0.1/tests/hghave.py --- old/hg-git-1.0.0/tests/hghave.py 2022-04-01 18:36:53.000000000 +0200 +++ new/hg-git-1.0.1/tests/hghave.py 2022-11-04 20:55:21.000000000 +0100 @@ -424,6 +424,8 @@ (0, 20, 0), (0, 20, 3), (0, 20, 4), + (0, 20, 37), + (0, 20, 44), ) ] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/tests/test-encoding.t new/hg-git-1.0.1/tests/test-encoding.t --- old/hg-git-1.0.0/tests/test-encoding.t 2022-03-25 17:45:26.000000000 +0100 +++ new/hg-git-1.0.1/tests/test-encoding.t 2022-11-04 20:55:21.000000000 +0100 @@ -33,10 +33,10 @@ $ . $TESTDIR/latin-1-encoding Warning: commit message (did|does) not conform to UTF-8. (re) You may want to amend it after fixing the message, or set the config - variable i18n.commitencoding to the encoding your project uses. + variable i18n.commit[eE]ncoding to the encoding your project uses. (re) Warning: commit message (did|does) not conform to UTF-8. (re) You may want to amend it after fixing the message, or set the config - variable i18n.commitencoding to the encoding your project uses. + variable i18n.commit[eE]ncoding to the encoding your project uses. (re) $ cd .. $ git init -q --bare repo.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/tests/test-pull-after-strip.t new/hg-git-1.0.1/tests/test-pull-after-strip.t --- old/hg-git-1.0.0/tests/test-pull-after-strip.t 2022-03-25 17:45:26.000000000 +0100 +++ new/hg-git-1.0.1/tests/test-pull-after-strip.t 2022-11-04 20:55:21.000000000 +0100 @@ -7,98 +7,76 @@ $ echo alpha > alpha $ git add alpha $ fn_git_commit -m 'add alpha' - - $ git tag alpha - - $ git checkout -b beta 2>&1 | sed s/\'/\"/g - Switched to a new branch "beta" $ echo beta > beta $ git add beta $ fn_git_commit -m 'add beta' + $ git tag thetag $ cd .. -clone a tag - $ hg clone -r alpha gitrepo hgrepo-a - importing 1 git commits - new changesets ff7a2f2d8d70 (1 drafts) - updating to branch default - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo-a log --graph - @ changeset: 0:ff7a2f2d8d70 - bookmark: master - tag: alpha - tag: default/master - tag: tip - user: test <t...@example.org> - date: Mon Jan 01 00:00:10 2007 +0000 - summary: add alpha - -clone a branch - $ hg clone -r beta gitrepo hgrepo-b + $ hg clone -U gitrepo hgrepo importing 2 git commits new changesets ff7a2f2d8d70:7fe02317c63d (2 drafts) - updating to branch default + $ cd hgrepo + $ hg up master 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R hgrepo-b log --graph + (activating bookmark master) + $ hg log --graph @ changeset: 1:7fe02317c63d - | bookmark: beta - | tag: default/beta + | bookmark: master + | tag: default/master + | tag: thetag | tag: tip | user: test <t...@example.org> | date: Mon Jan 01 00:00:11 2007 +0000 | summary: add beta | o changeset: 0:ff7a2f2d8d70 - bookmark: master - tag: alpha - tag: default/master user: test <t...@example.org> date: Mon Jan 01 00:00:10 2007 +0000 summary: add alpha - $ cd gitrepo + $ cd ../gitrepo $ echo beta line 2 >> beta $ git add beta $ fn_git_commit -m 'add to beta' $ cd .. - $ cd hgrepo-b + $ cd hgrepo $ hg strip tip 2>&1 | grep -v saving | grep -v backup 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg pull -r beta + $ hg pull pulling from $TESTTMP/gitrepo importing 1 git commits abort: you appear to have run strip - please run hg git-cleanup [255] + $ hg tags + tip 0:ff7a2f2d8d70 $ hg git-cleanup git commit map cleaned pull works after 'hg git-cleanup' -"adding remote bookmark" message was added in Mercurial 2.3 - $ hg pull -r beta | grep -v "adding remote bookmark" + $ hg pull pulling from $TESTTMP/gitrepo importing 2 git commits - updating bookmark beta + updating bookmark master new changesets 7fe02317c63d:cc1e605d90db (2 drafts) (run 'hg update' to get a working copy) $ hg log --graph o changeset: 2:cc1e605d90db - | bookmark: beta - | tag: default/beta + | bookmark: master + | tag: default/master | tag: tip | user: test <t...@example.org> | date: Mon Jan 01 00:00:12 2007 +0000 | summary: add to beta | o changeset: 1:7fe02317c63d + | tag: thetag | user: test <t...@example.org> | date: Mon Jan 01 00:00:11 2007 +0000 | summary: add beta | @ changeset: 0:ff7a2f2d8d70 - bookmark: master - tag: alpha - tag: default/master user: test <t...@example.org> date: Mon Jan 01 00:00:10 2007 +0000 summary: add alpha diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/tests/test-serve-ci.t new/hg-git-1.0.1/tests/test-serve-ci.t --- old/hg-git-1.0.0/tests/test-serve-ci.t 2022-03-25 17:45:26.000000000 +0100 +++ new/hg-git-1.0.1/tests/test-serve-ci.t 2022-10-28 17:13:14.000000000 +0200 @@ -67,6 +67,14 @@ updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved +..but also try SSH with GIT_SSH_COMMAND, which we just ignore: + + $ GIT_SSH_COMMAND="ignored" \ + > hg clone git@git-server:/srv/repo.git repo-ssh-2 + updating to branch default + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ rm -rf repo-ssh-2 + So, that went well; now push... $ cd repo-ssh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/tests/test-serve-dulwich.t new/hg-git-1.0.1/tests/test-serve-dulwich.t --- old/hg-git-1.0.0/tests/test-serve-dulwich.t 2022-03-25 17:45:26.000000000 +0100 +++ new/hg-git-1.0.1/tests/test-serve-dulwich.t 2022-10-31 12:05:56.000000000 +0100 @@ -27,12 +27,12 @@ $ echo bar > bar $ git add bar $ fn_git_commit -m test - $ $PYTHON $TESTDIR/testlib/dulwich-serve.py --port=$HGPORT + $ $PYTHON $TESTDIR/testlib/dulwich-serve.py --port=$HGPORT > $TESTTMP/dulwich.log $ cd .. Make sure that clone over unauthenticated HTTP doesn't break - $ hg clone -U git+http://localhost:$HGPORT copy 2>&1 + $ hg clone -U git+http://localhost:$HGPORT copy 2>&1 || cat $TESTTMP/dulwich.log \r (no-eol) (esc) counting objects 1 [ <=> ]\r (no-eol) (esc) (dulwich0204 !) counting objects 2 [ <=> ]\r (no-eol) (esc) (dulwich0204 !) @@ -53,6 +53,11 @@ HG:221dd250e933 GIT:3af9773036a9 HG:c4d188f6e13d GIT:b23744d34f97 + +#if dulwich02037 no-dulwich02044 +Broken due to bug #977 in Dulwich +#else + $ cd copy $ hg up master \r (no-eol) (esc) @@ -62,7 +67,7 @@ (activating bookmark master) $ echo baz > baz $ fn_hg_commit -A -m baz - $ hg push + $ hg push || cat $TESTTMP/dulwich.log \r (no-eol) (esc) searching commits 1/1 daf1ae153bf8 [=============>]\r (no-eol) (esc) \r (no-eol) (esc) @@ -81,6 +86,7 @@ updating reference refs/heads/master $ hg log -T 'HG:{node|short} GIT:{gitnode|short}\n' -r . HG:daf1ae153bf8 GIT:ab88565d0614 +#endif Prevent the test from hanging: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/tests/testlib/dulwich-serve.py new/hg-git-1.0.1/tests/testlib/dulwich-serve.py --- old/hg-git-1.0.0/tests/testlib/dulwich-serve.py 2022-03-25 17:45:26.000000000 +0100 +++ new/hg-git-1.0.1/tests/testlib/dulwich-serve.py 2022-08-19 16:23:52.000000000 +0200 @@ -15,7 +15,7 @@ "-m", "dulwich.web", ] + sys.argv[1:], - stderr=subprocess.DEVNULL, + stderr=subprocess.STDOUT, ) with open(os.getenv("DAEMON_PIDS"), "a") as fp: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hg-git-1.0.0/tests/testutil new/hg-git-1.0.1/tests/testutil --- old/hg-git-1.0.0/tests/testutil 2022-03-25 17:45:26.000000000 +0100 +++ new/hg-git-1.0.1/tests/testutil 2022-11-04 20:55:22.000000000 +0100 @@ -29,6 +29,8 @@ cat >> $TESTTMP/.gitconfig <<EOF [init] defaultBranch = master +[protocol.file] +allow = always EOF # Standard checks for external dependencies