Diff of the two buildlogs: -- --- b1/build.log 2025-10-21 22:21:00.327865022 +0000 +++ b2/build.log 2025-10-21 22:29:35.420525734 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Mon Nov 23 16:37:41 -12 2026 -I: pbuilder-time-stamp: 1795495061 +I: Current time: Wed Oct 22 12:21:02 +14 2025 +I: pbuilder-time-stamp: 1761085262 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/forky-reproducible-base.tgz] I: copying local configuration @@ -24,53 +24,85 @@ dpkg-source: info: applying 1001_testsuite_UTF-8.patch I: using fakeroot in build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/2474331/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/139113/tmp/hooks/D01_modify_environment starting +debug: Running on ionos1-amd64. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 Oct 21 22:21 /bin/sh -> /bin/bash +I: Setting pbuilder2's login shell to /bin/bash +I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other +I: user script /srv/workspace/pbuilder/139113/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/139113/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build/reproducible-path' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' - BUILD_ARCH='amd64' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=42 ' - DISTRIBUTION='forky' - HOME='/root' - HOST_ARCH='amd64' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="3" [2]="3" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu") + BASH_VERSION='5.3.3(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=amd64 + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=40 ' + DIRSTACK=() + DISTRIBUTION=forky + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=x86_64 + HOST_ARCH=amd64 IFS=' ' - INVOCATION_ID='f2354d04e5214f899efc7707922f70ba' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - MAIL='/var/mail/root' - OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' - PBCURRENTCOMMANDLINEOPERATION='build' - PBUILDER_OPERATION='build' - PBUILDER_PKGDATADIR='/usr/share/pbuilder' - PBUILDER_PKGLIBDIR='/usr/lib/pbuilder' - PBUILDER_SYSCONFDIR='/etc' - PPID='2474331' - PS1='# ' - PS2='> ' + INVOCATION_ID=904d4b68c75c4a3d9cdf4afdd475be53 + LANG=C + LANGUAGE=et_EE:et + LC_ALL=C + MACHTYPE=x86_64-pc-linux-gnu + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnu + PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path + PBCURRENTCOMMANDLINEOPERATION=build + PBUILDER_OPERATION=build + PBUILDER_PKGDATADIR=/usr/share/pbuilder + PBUILDER_PKGLIBDIR=/usr/lib/pbuilder + PBUILDER_SYSCONFDIR=/etc + PIPESTATUS=([0]="0") + POSIXLY_CORRECT=y + PPID=139113 PS4='+ ' - PWD='/' - SHELL='/bin/bash' - SHLVL='2' - SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.E5uuYXnj/pbuilderrc_FMRS --distribution forky --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/forky-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.E5uuYXnj/b1 --logfile b1/build.log git-remote-hg_1.0.5~ds-1.dsc' - SUDO_GID='111' - SUDO_HOME='/var/lib/jenkins' - SUDO_UID='106' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://213.165.73.152:3128' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.E5uuYXnj/pbuilderrc_rS90 --distribution forky --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/forky-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.E5uuYXnj/b2 --logfile b2/build.log git-remote-hg_1.0.5~ds-1.dsc' + SUDO_GID=110 + SUDO_HOME=/var/lib/jenkins + SUDO_UID=105 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://46.16.76.132:3128 I: uname -a - Linux ionos15-amd64 6.12.48+deb13-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.12.48-1 (2025-09-20) x86_64 GNU/Linux + Linux i-capture-the-hostname 6.12.48+deb13-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.12.48-1 (2025-09-20) x86_64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Aug 10 2025 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/2474331/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Aug 10 12:30 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/139113/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -235,7 +267,7 @@ Get: 109 http://deb.debian.org/debian forky/main amd64 sharness all 1.0.0-1.1 [28.6 kB] Get: 110 http://deb.debian.org/debian forky/main amd64 xsltproc amd64 1.1.43-0.2 [43.6 kB] Get: 111 http://deb.debian.org/debian forky/main amd64 xmlto amd64 0.0.29-2 [27.6 kB] -Fetched 51.3 MB in 1s (68.9 MB/s) +Fetched 51.3 MB in 1s (63.7 MB/s) Preconfiguring packages ... Selecting previously unselected package libexpat1:amd64. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 19898 files and directories currently installed.) @@ -609,8 +641,8 @@ Setting up tzdata (2025b-5) ... Current default time zone: 'Etc/UTC' -Local time is now: Tue Nov 24 04:38:53 UTC 2026. -Universal Time is now: Tue Nov 24 04:38:53 UTC 2026. +Local time is now: Tue Oct 21 22:22:18 UTC 2025. +Universal Time is now: Tue Oct 21 22:22:18 UTC 2025. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17030-1) ... @@ -725,7 +757,11 @@ fakeroot is already the newest version (1.37.1.2-1). 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. I: Building the package -I: Running cd /build/reproducible-path/git-remote-hg-1.0.5~ds/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S > ../git-remote-hg_1.0.5~ds-1_source.changes +I: user script /srv/workspace/pbuilder/139113/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for forky +I: user script /srv/workspace/pbuilder/139113/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/reproducible-path/git-remote-hg-1.0.5~ds/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S > ../git-remote-hg_1.0.5~ds-1_source.changes dpkg-buildpackage: info: source package git-remote-hg dpkg-buildpackage: info: source version 1.0.5~ds-1 dpkg-buildpackage: info: source distribution unstable @@ -735,7 +771,7 @@ debian/rules clean dh clean dh_auto_clean - make -j42 clean + make -j40 clean make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.5~ds' rm -f doc/git-remote-hg.1 rm -f -r bin/ @@ -747,7 +783,7 @@ dh_autoreconf dh_auto_configure dh_auto_build - make -j42 INSTALL="install --strip-program=true" + make -j40 INSTALL="install --strip-program=true" make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.5~ds' if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ : Use chosen Python version ; \ @@ -771,7 +807,7 @@ asciidoctor -d manpage -b manpage doc/git-remote-hg.txt make[1]: Leaving directory '/build/reproducible-path/git-remote-hg-1.0.5~ds' dh_auto_test - make -j42 test + make -j40 test make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.5~ds' make -C test make[2]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.5~ds/test' @@ -836,6 +872,10 @@ test_cmp expected actual +[master (root-commit) 79c6ce2] add älphà + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 alpha expecting success: ( hg init hgrepo && @@ -845,10 +885,6 @@ hg commit -m zero ) -[master (root-commit) 79c6ce2] add älphà - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 alpha [master 68b42de] add beta Author: tést èncödîng 1 file changed, 1 insertion(+) @@ -861,6 +897,14 @@ Author: tést èncödîng 1 file changed, 1 insertion(+) create mode 100644 delta +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 4 changes to 4 files ok 1 - setup expecting success: @@ -869,7 +913,6 @@ check gitrepo HEAD zero Cloning into 'gitrepo'... -Cloning into 'gitrepo'... ok 1 - setup expecting success: @@ -878,41 +921,34 @@ check gitrepo HEAD zero Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 15bb633519fa -no changes found -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +new changesets e7115432c9b0 adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 15bb633519fa -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +new changesets e7115432c9b0 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -searching for changes -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 4 files adding changesets adding manifests adding file changes +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) added 1 changesets with 1 changes to 1 files -new changesets 7f140525e830 +new changesets e7115432c9b0 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 2 - cloning @@ -945,10 +981,17 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/branches/next next +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] marked working directory as branch next (branches are permanent and global, did you want a bookmark?) marked working directory as branch next (branches are permanent and global, did you want a bookmark?) +adding changesets +adding manifests +adding file changes +added 4 changesets with 4 changes to 4 files +new changesets 1e3e49d2cc8f:6674f1c866b5 origin ok 1 - subcommand help @@ -969,38 +1012,46 @@ test_cmp expected actual -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 4 files -new changesets 1e3e49d2cc8f:6674f1c866b5 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... adding changesets adding manifests adding file changes +adding changesets +adding manifests +added 2 changesets with 2 changes to 1 files +new changesets e7115432c9b0:19aedd53f82f +adding file changes added 2 changesets with 2 changes to 1 files -new changesets 15bb633519fa:03d6d9c703db +new changesets e7115432c9b0:19aedd53f82f +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'next' (0/1) +searching for changes +no changes found +searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 7f140525e830:d85e2c5ced3a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +added 4 changesets with 4 changes to 4 files ok 3 - cloning with branches expecting success: @@ -1017,8 +1068,6 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/feature-a feature-a -progress revision 1 'next' (0/1) -Cloning into 'gitrepo'... ok 3 - cloning with branches expecting success: @@ -1035,24 +1084,10 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/feature-a feature-a -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 4 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... ok 2 - subcommand repo - no local proxy expecting success: @@ -1071,18 +1106,7 @@ test_cmp expected actual Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 15bb633519fa:6534e9a318fa +Cloning into 'gitrepo'... ok 1 - encoding expecting success: @@ -1116,9 +1140,6 @@ test_cmp expected actual -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'next' (0/1) [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) @@ -1132,21 +1153,37 @@ 1 file changed, 1 insertion(+) create mode 100644 foo/bar rm 'alpha' -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a [master 74dc957] remove alpha Author: A U Thor 1 file changed, 1 deletion(-) delete mode 100644 alpha rm 'foo/bar' -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 7f140525e830:461da68d19a9 [master ea36818] remove foo/bar Author: A U Thor 1 file changed, 1 deletion(-) delete mode 100644 foo/bar +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +adding remote bookmark feature-a +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets e7115432c9b0:73cfc2e99f78 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'next' (0/1) +adding changesets +adding manifests +adding file changes +adding remote bookmark feature-a +Cloning into 'gitrepo'... +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets e7115432c9b0:73cfc2e99f78 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) @@ -1192,22 +1229,30 @@ check_bookmark hgrepo devel devel -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] searching for changes -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes added 5 changesets with 3 changes to 3 files -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 85ea97735403 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests @@ -1215,49 +1260,22 @@ adding remote bookmark devel adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 15bb633519fa:6534e9a318fa +new changesets e7115432c9b0:73cfc2e99f78 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) adding changesets -adding manifests -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 6329b12cc930 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -adding changesets adding manifests adding file changes adding remote bookmark devel adding remote bookmark feature-a -[devel 3c7aac9] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 7f140525e830:461da68d19a9 +new changesets e7115432c9b0:73cfc2e99f78 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) -[devel 636c161] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] ok 3 - subcommand repo - with local proxy expecting success: @@ -1276,21 +1294,40 @@ grep "`cat rev-HEAD` `cat hg-HEAD`" mapfile ) -no changes found +[devel cb16c8f] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[devel cb16c8f] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 5 changesets with 3 changes to 3 files +new changesets 362b656574c3:54f595cbdf1f +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/5) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +searching for changes adding changesets adding manifests adding file changes -added 5 changesets with 3 changes to 3 files -new changesets 362b656574c3:54f595cbdf1f -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) +added 1 changesets with 1 changes to 1 files +Cloning into 'gitrepo'... ok 5 - update bookmark expecting success: @@ -1308,6 +1345,17 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 3 changes to 3 files +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 5 - update bookmark expecting success: @@ -1330,63 +1378,92 @@ WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways adding changesets +adding changesets +adding manifests adding manifests adding file changes +adding file changes adding remote bookmark devel adding remote bookmark feature-a -added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 15bb633519fa:775b86ee1d53 -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/3) -progress revision 1 'next' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -[feature-b 96cadce] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +added 1 changesets with 1 changes to 1 files +new changesets e8e13452ff0e +added 4 changesets with 4 changes to 1 files (+1 heads) +new changesets e7115432c9b0:06ba9196c627 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) adding changesets adding manifests adding file changes adding remote bookmark devel adding remote bookmark feature-a +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/3) +progress revision 1 'next' (0/1) added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 7f140525e830:58a74e5b920e -searching for changes -no changes found +new changesets e7115432c9b0:06ba9196c627 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files -[feature-b d74d4eb] feature-b +ok 2 - file removal + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + git init -q gitrepo && + cd gitrepo && + git config receive.denyCurrentBranch ignore && + echo alpha > alpha && + git add alpha && + git commit -m "add alpha" && + git tag alpha && + + echo beta > beta && + git add beta && + git commit -m "add beta" && + git tag -a -m "added tag beta" beta + ) && + + hg_clone gitrepo hgrepo && + git_clone hgrepo gitrepo2 && + hg_clone gitrepo2 hgrepo2 && + + hg_log hgrepo > expected && + hg_log hgrepo2 > actual && + + test_cmp expected actual + +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +[feature-b a886ccf] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[master (root-commit) 223a6f6] add alpha + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 alpha +[master 862befc] add beta + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 beta +[feature-b a886ccf] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 8d790c3fe51d no changes found -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) searching for changes adding changesets +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding manifests adding file changes added 1 changesets with 1 changes to 1 files -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found searching for changes @@ -1394,38 +1471,9 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -ok 6 - new bookmark - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && - - ( - hg init hgrepo && - cd hgrepo && - - touch content && - hg add content && - - > ../expected && - author_test alpha "" "H G Wells " && - author_test beta "beta" "beta " && - author_test gamma "gamma (comment)" "gamma " && - author_test delta "" "Unknown " && - author_test epsilon "epsilon" "epsilon " && - author_test zeta "zeta " && - author_test eta " eta " "eta " && - author_test theta "theta < test@example.com >" "theta " && - author_test iota "iota >test@example.com>" "iota " && - author_test kappa "kappa < test example com>" "kappa " && - author_test lambda "lambda@example.com" "Unknown " && - author_test mu "mu.mu@example.com" "Unknown " - ) && - - git clone "hg::hgrepo" gitrepo && - git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual && - - test_cmp expected actual - +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] ok 6 - new bookmark @@ -1460,61 +1508,17 @@ test_cmp expected actual -ok 2 - file removal - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - ( - git init -q gitrepo && - cd gitrepo && - git config receive.denyCurrentBranch ignore && - echo alpha > alpha && - git add alpha && - git commit -m "add alpha" && - git tag alpha && - - echo beta > beta && - git add beta && - git commit -m "add beta" && - git tag -a -m "added tag beta" beta - ) && - - hg_clone gitrepo hgrepo && - git_clone hgrepo gitrepo2 && - hg_clone gitrepo2 hgrepo2 && - - hg_log hgrepo > expected && - hg_log hgrepo2 > actual && - - test_cmp expected actual - -[master (root-commit) 223a6f6] add alpha - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 alpha -[master 862befc] add beta - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 beta -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] Loading hg marks ... Loading git marks ... Writing mapfile ... -no changes found searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files searching for changes +b989c798af4cb2484607284295c09200e7f2f6d7 e8e13452ff0e8c87b51a76df18b127118d635176 searching for changes -9547b8734e35e043944abdfdf09d64490bbc15e9 8d790c3fe51de948537e61ca8bfd5afb58df266f ok 4 - subcommands hg-rev and git-rev and mapfile expecting success: @@ -1554,6 +1558,38 @@ grep "git marks" output ) +ok 6 - new bookmark + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + + touch content && + hg add content && + + > ../expected && + author_test alpha "" "H G Wells " && + author_test beta "beta" "beta " && + author_test gamma "gamma (comment)" "gamma " && + author_test delta "" "Unknown " && + author_test epsilon "epsilon" "epsilon " && + author_test zeta "zeta " && + author_test eta " eta " "eta " && + author_test theta "theta < test@example.com >" "theta " && + author_test iota "iota >test@example.com>" "iota " && + author_test kappa "kappa < test example com>" "kappa " && + author_test lambda "lambda@example.com" "Unknown " && + author_test mu "mu.mu@example.com" "Unknown " + ) && + + git clone "hg::hgrepo" gitrepo && + git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual && + + test_cmp expected actual + /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets @@ -1568,20 +1604,22 @@ searching for changes no changes found searching for changes +Cloning into 'gitrepo'... adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files -new changesets 3367f243a854:74ced8ba8809 +new changesets b8b910853a00:b7fb57d12609 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/8890b9d8f11f-a8b294b8-backup.hg ok 3 - git tags expecting success: @@ -1620,10 +1658,10 @@ test_cmp expected actual -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/bac643cdd235-33de8ebf-backup.hg /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] no changes found searching for changes adding changesets @@ -1631,21 +1669,60 @@ adding file changes added 1 changesets with 1 changes to 1 files searching for changes -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 47a076fb23a6 +new changesets fecf367c4541 progress revision 4 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - + 0b4142a...fe5208d master -> origin/master (forced update) - + 0b4142a...fe5208d branches/default -> origin/branches/default (forced update) + + 04be587...a9a4077 master -> origin/master (forced update) + + 04be587...a9a4077 branches/default -> origin/branches/default (forced update) +HEAD is now at a9a4077 four +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Loading hg marks ... +Loading git marks ... +Performing garbage collection on git commits ... +Computing marks intersection ... +Including notes commits ... +Trimmed hg marks from #5 down to #0 +Trimmed git marks from #12 down to #2 +Writing hg marks ... +Writing git marks ... +Loading hg marks ... +Trimmed hg marks from #5 down to #0 +Writing hg marks ... +Loading git marks ... +Trimmed git marks from #12 down to #2 +Writing git marks ... +ok 5 - subcommand gc + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + + ( + cd hgrepo && + echo one > content && + hg commit -m one + ) && + + ( + cd gitrepo && + git fetch origin + ) && + + hg log -R hgrepo > expected && + # not inside gitrepo; test shared path handling + GIT_DIR=gitrepo/.git git-hg-helper origin log > actual + + test_cmp expected actual + +Cloning into 'gitrepo'... Cloning into 'gitrepo'... -HEAD is now at fe5208d four /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -1653,11 +1730,22 @@ adding changesets adding manifests adding file changes +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] added 12 changesets with 12 changes to 1 files -new changesets f794078505d0:81845255e2b3 +new changesets 81644e770990:fa56b7021b7a progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +marked working directory as branch gamma +adding changesets +adding manifests +adding file changes +Cloning into 'gitrepo'... +added 12 changesets with 12 changes to 1 files +new changesets d8f8104ca311:2220fb32b924 +progress revision walk 'bookmarks/master' (11/11) +progress revision 0 'master' (0/12) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] ok 7 - authors @@ -1698,15 +1786,21 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes adding changesets adding manifests adding file changes -added 12 changesets with 12 changes to 1 files -new changesets f794078505d0:12b6217175e9 -progress revision walk 'bookmarks/master' (11/11) -progress revision 0 'master' (0/12) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +adding remote bookmark not-master +adding changesets +adding manifests +adding file changes +added 2 changesets with 1 changes to 1 files +new changesets 5889597089fe:3320583a8de0 +1 local changesets published +added 1 changesets with 1 changes to 1 files +new changesets e0521278d702 ok 7 - authors expecting success: @@ -1746,186 +1840,95 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected -Loading hg marks ... -Loading git marks ... -Performing garbage collection on git commits ... -Computing marks intersection ... -Including notes commits ... -Trimmed hg marks from #5 down to #0 -Trimmed git marks from #12 down to #2 -Writing hg marks ... -Writing git marks ... -Loading hg marks ... -Trimmed hg marks from #5 down to #0 -Writing hg marks ... -Loading git marks ... -Trimmed git marks from #12 down to #2 -Writing git marks ... -ok 5 - subcommand gc - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd hgrepo && - echo one > content && - hg commit -m one - ) && - - ( - cd gitrepo && - git fetch origin - ) && - - hg log -R hgrepo > expected && - # not inside gitrepo; test shared path handling - GIT_DIR=gitrepo/.git git-hg-helper origin log > actual - - test_cmp expected actual - -marked working directory as branch gamma -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 9cd16d1e4fb5 +progress revision 1 'default' (0/1) +progress revision 2 'gamma' (0/1) progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 67b4e3d8d3fc:cadf8ae2776a -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) searching for changes -adding changesets -adding manifests -adding file changes -adding remote bookmark not-master -added 2 changesets with 1 changes to 1 files -new changesets 5889597089fe:3320583a8de0 -1 local changesets published -progress revision 1 'default' (0/1) -progress revision 2 'gamma' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 67b4e3d8d3fc:cadf8ae2776a -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo/.hg/strip-backup/cadf8ae2776a-bb9365e7-backup.hg -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/cadf8ae2776a-bb9365e7-backup.hg +no changes found /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets bbe77c6c14a9 -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - 8d291d9..9d88030 master -> origin/master - 8d291d9..9d88030 branches/default -> origin/branches/default -searching for changes -no changes found searching for changes adding changesets adding manifests adding file changes +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways added 2 changesets with 2 changes to 2 files +added 1 changesets with 1 changes to 1 files +new changesets 44740d34dff5 searching for changes adding changesets adding manifests adding file changes +Cloning into 'gitrepo'... added 1 changesets with 0 changes to 0 files +progress revision 1 'default' (0/1) searching for changes searching for changes -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets ad05054cda7b:84f9e44ce1ea -progress revision 2 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo - + b3eebcb...67a74cd master -> origin/master (forced update) - + b3eebcb...67a74cd branches/default -> origin/branches/default (forced update) -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +added 2 changesets with 2 changes to 1 files +new changesets 71897a936040:01a7ee97c9e4 /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + 96d640f..c6b9efb master -> origin/master + 96d640f..c6b9efb branches/default -> origin/branches/default +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets ad05054cda7b:84f9e44ce1ea -progress revision 2 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo - + b3eebcb...67a74cd master -> origin/master (forced update) - + b3eebcb...67a74cd branches/default -> origin/branches/default (forced update) -ok 8 - strip +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +added 2 changesets with 2 changes to 1 files +new changesets 71897a936040:01a7ee97c9e4 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +ok 4 - hg branch expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && + test_when_finished "rm -rf gitrepo* hgrepo*" && ( - hg init hgrepo && - cd hgrepo && + git init -q gitrepo && + cd gitrepo && - echo one >.git && - echo ONE >.GIT && - mkdir a && echo two > a/.gitmodules && - hg add .git .GIT a/.gitmodules && - hg commit -m zero + echo alpha > alpha && + git add alpha && + git commit -m "add alpha" && + git checkout -q -b not-master ) && - git clone "hg::hgrepo" gitrepo && - test_cmp gitrepo/.git_ hgrepo/.git && - test_cmp gitrepo/.GIT_ hgrepo/.GIT && - test_cmp gitrepo/a/.gitmodules_ hgrepo/a/.gitmodules && - ( - cd gitrepo && - echo three >.git_ && - echo THREE >.GIT && - echo four >a/.gitmodules_ && - git add .git_ .GIT_ a/.gitmodules_ && - git commit -m one && - git push + hg_clone gitrepo hgrepo && + + cd hgrepo && + hg co default && + hg tag alpha ) && - hg -R hgrepo update && - test_cmp gitrepo/.git_ hgrepo/.git && - test_cmp gitrepo/.GIT_ hgrepo/.GIT && - test_cmp gitrepo/a/.gitmodules_ hgrepo/a/.gitmodules + hg_push hgrepo gitrepo && + # pushing a fetched tag is a problem ... + { hg_clone gitrepo hgrepo2 || true ; } && + + # fetch does not affect phase, but pushing now does + hg_log hgrepo | grep -v phase > expected && + hg_log hgrepo2 | grep -v phase > actual && + + test_cmp expected actual ok 6 - subcommand [some-repo] @@ -1961,6 +1964,50 @@ check gitrepo/sub_hg_b HEAD zero_sub_hg_b && check gitrepo/sub_git HEAD zero_sub_git +[master (root-commit) 223a6f6] add alpha + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 alpha +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo/.hg/strip-backup/01a7ee97c9e4-7930d642-backup.hg +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/01a7ee97c9e4-7930d642-backup.hg +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +searching for changes +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +searching for changes +adding changesets +adding changesets +adding manifests +adding manifests +adding file changes +adding file changes +added 2 changesets with 2 changes to 1 files (+1 heads) +added 2 changesets with 2 changes to 1 files (+1 heads) +new changesets 6f34c82143f2:d7e7115a94cc +new changesets 6f34c82143f2:d72b3ad590fc +progress revision 2 'default' (0/2) +progress revision 2 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo + + 1d7d4a0...ee4b5cb master -> origin/master (forced update) + + 1d7d4a0...ee4b5cb branches/default -> origin/branches/default (forced update) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo + + 1d7d4a0...b7b7a5a master -> origin/master (forced update) + + 1d7d4a0...b7b7a5a branches/default -> origin/branches/default (forced update) +0 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 8 - strip expecting success: @@ -1997,55 +2044,64 @@ test_cmp gitrepo/.GIT_ hgrepo/.GIT && test_cmp gitrepo/a/.gitmodules_ hgrepo/a/.gitmodules -ok 4 - hg branch +ok 8 - strip expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && + test_when_finished "rm -rf hgrepo gitrepo" && ( - git init -q gitrepo && - cd gitrepo && + hg init hgrepo && + cd hgrepo && - echo alpha > alpha && - git add alpha && - git commit -m "add alpha" && - git checkout -q -b not-master + echo one >.git && + echo ONE >.GIT && + mkdir a && echo two > a/.gitmodules && + hg add .git .GIT a/.gitmodules && + hg commit -m zero ) && - ( - hg_clone gitrepo hgrepo && + git clone "hg::hgrepo" gitrepo && + test_cmp gitrepo/.git_ hgrepo/.git && + test_cmp gitrepo/.GIT_ hgrepo/.GIT && + test_cmp gitrepo/a/.gitmodules_ hgrepo/a/.gitmodules && - cd hgrepo && - hg co default && - hg tag alpha + ( + cd gitrepo && + echo three >.git_ && + echo THREE >.GIT && + echo four >a/.gitmodules_ && + git add .git_ .GIT_ a/.gitmodules_ && + git commit -m one && + git push ) && - hg_push hgrepo gitrepo && - # pushing a fetched tag is a problem ... - { hg_clone gitrepo hgrepo2 || true ; } && - - # fetch does not affect phase, but pushing now does - hg_log hgrepo | grep -v phase > expected && - hg_log hgrepo2 | grep -v phase > actual && - - test_cmp expected actual + hg -R hgrepo update && + test_cmp gitrepo/.git_ hgrepo/.git && + test_cmp gitrepo/.GIT_ hgrepo/.GIT && + test_cmp gitrepo/a/.gitmodules_ hgrepo/a/.gitmodules -[master (root-commit) 223a6f6] add alpha +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +[master (root-commit) e9a16bb] zero_sub_git Author: A U Thor 1 file changed, 1 insertion(+) - create mode 100644 alpha + create mode 100644 content_sub_git warning: possible case-folding collision for .git warning: possible case-folding collision for .git -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found searching for changes adding changesets adding manifests adding file changes +adding remote bookmark not-master added 1 changesets with 1 changes to 1 files -searching for changes +new changesets 16869bbe54be +1 local changesets published +Cloning into 'gitrepo'... +progress revision 1 'default' (0/1) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] @@ -2055,50 +2111,146 @@ adding manifests adding file changes added 1 changesets with 3 changes to 3 files -new changesets 962550e5102e -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master bfc694c] one - Author: A U Thor - 2 files changed, 2 insertions(+), 2 deletions(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +new changesets dcd7bbb7a0aa +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets added 1 changesets with 3 changes to 3 files -new changesets 962550e5102e +new changesets dcd7bbb7a0aa +adding manifests +adding file changes +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +searching for changes +no changes found +added 2 changesets with 3 changes to 3 files +new changesets b558e0819e0b:a8c6755207e7 +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master bfc694c] one +searching for changes +searching for changes +To hg::../hgrepo2 + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] not-master -> not-master + ! [rejected] alpha -> alpha (already exists) +error: failed to push some refs to 'hg::../hgrepo2' +hint: Updates were rejected because the tag already exists in the remote. +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +[master d98f906] one Author: A U Thor 2 files changed, 2 insertions(+), 2 deletions(-) -0 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +[master d98f906] one + Author: A U Thor + 2 files changed, 2 insertions(+), 2 deletions(-) +no changes found +ok 5 - hg tags + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + git init -q gitrepo && + cd gitrepo && + + echo alpha > alpha && + git add alpha && + git commit -m "add alpha" --date="2007-01-01 00:00:00 +0000" && + + echo beta > beta && + git add beta && + git commit -m "add beta" --date="2007-01-01 00:00:00 +0100" && + + echo gamma > gamma && + git add gamma && + git commit -m "add gamma" --date="2007-01-01 00:00:00 -0100" && + + echo delta > delta && + git add delta && + git commit -m "add delta" --date="2007-01-01 00:00:00 +0130" && + + echo epsilon > epsilon && + git add epsilon && + git commit -m "add epsilon" --date="2007-01-01 00:00:00 -0130" + ) && + + hg_clone gitrepo hgrepo && + git_clone hgrepo gitrepo2 && + hg_clone gitrepo2 hgrepo2 && + + hg_log hgrepo > expected && + hg_log hgrepo2 > actual && + + test_cmp expected actual + /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... searching for changes adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo - 115417b..bfc694c master -> master -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found +[master (root-commit) a663549] add alpha + Author: A U Thor + Date: Mon Jan 1 00:00:00 2007 +0000 + 1 file changed, 1 insertion(+) + create mode 100644 alpha searching for changes adding changesets adding manifests adding file changes +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] added 1 changesets with 2 changes to 2 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo + f177aee..d98f906 master -> master +[master ea3e397] add beta + Author: A U Thor + Date: Mon Jan 1 00:00:00 2007 +0100 + 1 file changed, 1 insertion(+) + create mode 100644 beta To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo - fffffff..bfc694c master -> master + fffffff..d98f906 master -> master +adding changesets +adding manifests +[master d7a1343] add gamma + Author: A U Thor + Date: Mon Jan 1 00:00:00 2007 -0100 + 1 file changed, 1 insertion(+) + create mode 100644 gamma +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets c879b25393fe 2 files updated, 0 files merged, 0 files removed, 0 files unresolved +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +[master 79cd3e4] add delta + Author: A U Thor + Date: Mon Jan 1 00:00:00 2007 +0130 + 1 file changed, 1 insertion(+) + create mode 100644 delta +progress revision walk 'bookmarks/master' (0/0) ok 9 - dotfiles +progress revision 0 'master' (0/1) expecting success: test_when_finished "rm -rf hgrepo gitrepo*" && @@ -2123,18 +2275,6 @@ check_branch hgrepo default two -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -2 files updated, 0 files merged, 0 files removed, 0 files unresolved -searching for changes -adding changesets -adding manifests -adding file changes -adding remote bookmark not-master -added 1 changesets with 1 changes to 1 files -new changesets 16869bbe54be -1 local changesets published -progress revision 1 'default' (0/1) ok 9 - dotfiles expecting success: @@ -2161,176 +2301,126 @@ check_branch hgrepo default two -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git +[master f12dbdf] add epsilon Author: A U Thor + Date: Mon Jan 1 00:00:00 2007 -0130 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git + create mode 100644 epsilon /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes no changes found +Cloning into './sub_hg_b'... searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 2 files -searching for changes -searching for changes -To hg::../hgrepo2 - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] not-master -> not-master - ! [rejected] alpha -> alpha (already exists) -error: failed to push some refs to 'hg::../hgrepo2' -Cloning into 'gitrepo'... -hint: Updates were rejected because the tag already exists in the remote. -Cloning into 'gitrepo'... +added 5 changesets with 5 changes to 5 files /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 390da5f0531c:bdd2094dd0a4 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +added 1 changesets with 1 changes to 1 files +new changesets d73f297713b2 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -ok 5 - hg tags +Cloning into './sub_git'... +adding changesets +adding manifests +adding file changes +added 5 changesets with 5 changes to 5 files +new changesets 87c8f82b00d0:21e96c99dac4 +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +done. +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/5) +ok 7 - subcommand sub initial update (hg and git subrepos) expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && - ( - git init -q gitrepo && - cd gitrepo && - - echo alpha > alpha && - git add alpha && - git commit -m "add alpha" --date="2007-01-01 00:00:00 +0000" && - - echo beta > beta && - git add beta && - git commit -m "add beta" --date="2007-01-01 00:00:00 +0100" && - - echo gamma > gamma && - git add gamma && - git commit -m "add gamma" --date="2007-01-01 00:00:00 -0100" && + setup_subrepos && - echo delta > delta && - git add delta && - git commit -m "add delta" --date="2007-01-01 00:00:00 +0130" && + git clone hg::hgrepo gitrepo && - echo epsilon > epsilon && - git add epsilon && - git commit -m "add epsilon" --date="2007-01-01 00:00:00 -0130" + ( + cd gitrepo && + git-hg-helper sub --recursive update --force && + test -f content_hgrepo && + test -f sub_hg_a/content_sub_hg_a && + test -f sub_hg_a/sub_hg_a_x/content_sub_hg_a_x && + test -f sub_hg_b/content_sub_hg_b && + test -f sub_hg_b/sub_git/content_sub_git ) && - hg_clone gitrepo hgrepo && - git_clone hgrepo gitrepo2 && - hg_clone gitrepo2 hgrepo2 && - - hg_log hgrepo > expected && - hg_log hgrepo2 > actual && - - test_cmp expected actual + check gitrepo HEAD substate && + check gitrepo/sub_hg_a HEAD substate_hg_a && + check gitrepo/sub_hg_b HEAD substate_hg_b && + check gitrepo/sub_hg_a/sub_hg_a_x HEAD zero_sub_hg_a_x && + check gitrepo/sub_hg_b/sub_git HEAD zero_sub_git -[master (root-commit) a663549] add alpha - Author: A U Thor - Date: Mon Jan 1 00:00:00 2007 +0000 - 1 file changed, 1 insertion(+) - create mode 100644 alpha -[master ea3e397] add beta - Author: A U Thor - Date: Mon Jan 1 00:00:00 2007 +0100 - 1 file changed, 1 insertion(+) - create mode 100644 beta -[master d7a1343] add gamma - Author: A U Thor - Date: Mon Jan 1 00:00:00 2007 -0100 - 1 file changed, 1 insertion(+) - create mode 100644 gamma -[master 79cd3e4] add delta - Author: A U Thor - Date: Mon Jan 1 00:00:00 2007 +0130 - 1 file changed, 1 insertion(+) - create mode 100644 delta /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets adding changesets adding manifests adding file changes -adding remote bookmark master -[master f12dbdf] add epsilon - Author: A U Thor - Date: Mon Jan 1 00:00:00 2007 -0130 - 1 file changed, 1 insertion(+) - create mode 100644 epsilon -added 2 changesets with 2 changes to 1 files -new changesets 5db831641eea:8fa7e1d0a727 -progress revision walk 'bookmarks/default' (1/1) -progress revision 0 'default' (0/2) -adding changesets adding manifests adding file changes adding remote bookmark master +adding remote bookmark master added 2 changesets with 2 changes to 1 files -new changesets 357780aadfec:cedc0dbfb363 +new changesets 55651704b465:9da8aea178c8 +added 2 changesets with 2 changes to 1 files +new changesets 55651704b465:9da8aea178c8 +progress revision walk 'bookmarks/default' (1/1) +progress revision 0 'default' (0/2) progress revision walk 'bookmarks/default' (1/1) progress revision 0 'default' (0/2) -[default 6ec5ab5] two +[default 03c1056] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -[default ac8c54d] two +[default 03c1056] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo - 43b94de..6ec5ab5 default -> default /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found +no changes found +searching for changes searching for changes adding changesets -adding manifests -adding file changes adding changesets -added 1 changesets with 1 changes to 1 files adding manifests +adding manifests +adding file changes adding file changes added 1 changesets with 1 changes to 1 files -new changesets 89e1e14c377c +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo + de4d916..03c1056 default -> default To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo - fffffff..ac8c54d default -> default -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) + fffffff..03c1056 default -> default +searching for changes no changes found searching for changes adding changesets adding manifests adding file changes added 5 changesets with 5 changes to 5 files -Cloning into './sub_hg_b'... ok 10 - remote push with master bookmark expecting success: @@ -2377,81 +2467,40 @@ check_branch hgrepo default one -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 8a4865d84566 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/gitrepo/.git/ +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/gitrepo/.git/ [master (root-commit) 64caca5] one Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/gitrepo/.git/ [master (root-commit) 64caca5] one Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content -Cloning into './sub_git'... -done. -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -ok 7 - subcommand sub initial update (hg and git subrepos) - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_subrepos && - - git clone hg::hgrepo gitrepo && - - ( - cd gitrepo && - git-hg-helper sub --recursive update --force && - test -f content_hgrepo && - test -f sub_hg_a/content_sub_hg_a && - test -f sub_hg_a/sub_hg_a_x/content_sub_hg_a_x && - test -f sub_hg_b/content_sub_hg_b && - test -f sub_hg_b/sub_git/content_sub_git - ) && - - check gitrepo HEAD substate && - check gitrepo/sub_hg_a HEAD substate_hg_a && - check gitrepo/sub_hg_b HEAD substate_hg_b && - check gitrepo/sub_hg_a/sub_hg_a_x HEAD zero_sub_hg_a_x && - check gitrepo/sub_hg_b/sub_git HEAD zero_sub_git - -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files -new changesets 87c8f82b00d0:21e96c99dac4 -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +ok 6 - test timezones + +# passed all 6 test(s) +1..6 no changes found -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +no changes found +searching for changes searching for changes adding changesets adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::../hgrepo - * [new branch] master -> master -no changes found -searching for changes adding changesets +adding file changes adding manifests adding file changes added 1 changesets with 1 changes to 1 files +added 1 changesets with 1 changes to 1 files +To hg::../hgrepo + * [new branch] master -> master To hg::../hgrepo * [new branch] master -> master changeset: 0:6e2126489d3d @@ -2466,15 +2515,6 @@ date: Mon Jan 01 00:00:00 2007 +0230 summary: one -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files ok 11 - remote push from master branch expecting success: @@ -2509,28 +2549,26 @@ Cloning into 'gitrepo'... Cloning into 'gitrepo'... -ok 6 - test timezones - -# passed all 6 test(s) -1..6 +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways adding changesets +adding changesets adding manifests +adding manifests +adding file changes adding file changes added 1 changesets with 1 changes to 1 files -new changesets 149020c65a07 +added 1 changesets with 1 changes to 1 files +new changesets db887fb144f0 +new changesets db887fb144f0 +progress revision walk 'bookmarks/master' (0/0) progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 149020c65a07 +progress revision 0 'master' (0/1) ok 12 - remote cloning expecting success: @@ -2544,8 +2582,6 @@ ) Cloning into 'gitrepo'... -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) ok 12 - remote cloning expecting success: @@ -2559,33 +2595,39 @@ ) Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways adding changesets +adding changesets +adding manifests adding manifests adding file changes +adding file changes +added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files -new changesets 149020c65a07 +new changesets db887fb144f0 +new changesets db887fb144f0 +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 149020c65a07 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +no changes found +no changes found ok 13 - moving remote clone expecting success: @@ -2607,7 +2649,6 @@ check_bookmark hgrepo devel devel -no changes found ok 13 - moving remote clone expecting success: @@ -2631,43 +2672,44 @@ Cloning into 'gitrepo'... Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets +adding changesets +adding manifests adding manifests adding file changes +adding file changes +adding remote bookmark devel adding remote bookmark devel -added 1 changesets with 1 changes to 1 files -new changesets 149020c65a07 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) adding changesets +added 1 changesets with 1 changes to 1 files +added 1 changesets with 1 changes to 1 files +new changesets db887fb144f0 +new changesets db887fb144f0 adding manifests -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ adding file changes -adding remote bookmark devel -added 1 changesets with 1 changes to 1 files -new changesets 149020c65a07 -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git +added 2 changesets with 3 changes to 3 files +new changesets 553bd13c1a72:d6a433578e99 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel e1e35ee] devel +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +[devel 84179d7] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -[devel e1e35ee] devel +[devel 84179d7] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found @@ -2675,8 +2717,17 @@ adding changesets adding manifests adding file changes -no changes found added 1 changesets with 1 changes to 1 files +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Cloning into './sub_hg_a'... +no changes found +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] searching for changes adding changesets adding manifests @@ -2699,6 +2750,24 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 69148cc7ce31:40ced3f61701 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_a/sub_hg_a_x'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +adding remote bookmark devel +added 2 changesets with 2 changes to 1 files +new changesets db887fb144f0:738f732c1943 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 14 - remote update bookmark expecting success: @@ -2716,33 +2785,40 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +[feature-b 2b14ce5] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets c0b2ae90c53d +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_b'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +no changes found +searching for changes adding changesets adding manifests adding file changes -adding remote bookmark devel -added 2 changesets with 2 changes to 1 files -new changesets 149020c65a07:76b26e70fc75 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) adding changesets adding manifests +added 1 changesets with 1 changes to 1 files adding file changes adding remote bookmark devel added 2 changesets with 2 changes to 1 files -new changesets 149020c65a07:76b26e70fc75 +new changesets db887fb144f0:738f732c1943 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -[feature-b d75d95f] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[feature-b d75d95f] feature-b +[feature-b 2b14ce5] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -2751,30 +2827,9 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 0efbd1b92ec1:af9dca1e0d96 +new changesets dd21d4ea7f3b:ca886a384a20 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... ok 15 - remote new bookmark expecting success: @@ -2801,6 +2856,36 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Cloning into './sub_hg_b/sub_git'... +no changes found +done. +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +ok 8 - subcommand sub initial recursive update + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update + +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +adding remote bookmark devel +adding remote bookmark feature-b +added 3 changesets with 3 changes to 1 files +new changesets db887fb144f0:5dea9e603220 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) ok 15 - remote new bookmark expecting success: @@ -2827,89 +2912,24 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 3bce0ed5ef40:dc812d771572 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark feature-b -added 3 changesets with 3 changes to 1 files -new changesets 149020c65a07:deecc7d5935a -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(leaving bookmark devel) adding changesets adding manifests adding file changes -Cloning into './sub_hg_a/sub_hg_a_x'... adding remote bookmark devel adding remote bookmark feature-b added 3 changesets with 3 changes to 1 files -new changesets 149020c65a07:deecc7d5935a -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(leaving bookmark devel) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(leaving bookmark devel) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 4e14348ab917 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... -[master ba456e7] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[master ba456e7] diverged +new changesets db887fb144f0:5dea9e603220 +[master 5bc9a7d] diverged Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets b333073e720a:f34212249323 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets d297012ee21a -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo' -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. - ! [rejected] master -> master (non-fast-forward) +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] searching for changes @@ -2917,7 +2937,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets d297012ee21a +new changesets c870f4f46834 To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo' @@ -2926,13 +2946,6 @@ hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] master -> master (non-fast-forward) -ok 8 - subcommand sub initial recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update - ok 16 - remote push diverged expecting success: @@ -2964,6 +2977,52 @@ check_bookmark hgrepo diverge "bump bookmark" +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(leaving bookmark devel) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +[master 5bc9a7d] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +adding changesets +adding manifests +adding file changes +adding remote bookmark devel +adding remote bookmark diverge +adding remote bookmark feature-b +added 4 changesets with 4 changes to 1 files +new changesets db887fb144f0:c870f4f46834 +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/4) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets b40cee4ce07d +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + ! [rejected] master -> master (non-fast-forward) +created new head +[diverge 06d5034] diverge + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git ok 16 - remote push diverged expecting success: @@ -2996,62 +3055,7 @@ check_bookmark hgrepo diverge "bump bookmark" 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 4 changesets with 4 changes to 1 files -new changesets 149020c65a07:d297012ee21a -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/4) -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 4 changesets with 4 changes to 1 files -new changesets 149020c65a07:d297012ee21a -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/4) -created new head -[diverge c539d00] diverge - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -created new head -[diverge c539d00] diverge - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -searching for changes -adding changesets -adding manifests -adding file changes -updating bookmark diverge -added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 4ca65c0f51a3 -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo - ! [rejected] diverge -> diverge (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo' -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. - ! [rejected] diverge -> diverge (non-fast-forward) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] searching for changes @@ -3060,7 +3064,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 4ca65c0f51a3 +new changesets 175968683697 To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo ! [rejected] diverge -> diverge (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo' @@ -3085,41 +3089,24 @@ check_bookmark hgrepo feature-c feature-c -Cloning into 'gitrepo'... -ok 17 - remote update bookmark diverge - -expecting success: - test_when_finished "rm -rf gitrepo*" && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git checkout --quiet -b feature-c HEAD^ && - echo feature-c > content && - git commit -a -m feature-c && - git push --quiet origin feature-c - ) && - - check_bookmark hgrepo feature-c feature-c - -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes adding remote bookmark devel adding remote bookmark diverge adding remote bookmark feature-b -added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets 149020c65a07:4ca65c0f51a3 -WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'bookmarks/master' (4/4) +added 4 changesets with 4 changes to 1 files +new changesets db887fb144f0:b40cee4ce07d +progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes @@ -3127,20 +3114,26 @@ adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets 149020c65a07:4ca65c0f51a3 +new changesets db887fb144f0:175968683697 WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/4) -[feature-c 01cb02e] feature-c +created new head +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +[diverge 06d5034] diverge Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -[feature-c 01cb02e] feature-c +[feature-c ebdd7aa] feature-c Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 262b8c005c62:c1c6b0f3c3e0 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found @@ -3149,20 +3142,48 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) -no changes found +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways searching for changes adding changesets adding manifests adding file changes +updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git +new changesets 0cbf89a96087 +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo + ! [rejected] diverge -> diverge (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + ! [rejected] diverge -> diverge (non-fast-forward) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... +ok 17 - remote update bookmark diverge + +expecting success: + test_when_finished "rm -rf gitrepo*" && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git checkout --quiet -b feature-c HEAD^ && + echo feature-c > content && + git commit -a -m feature-c && + git push --quiet origin feature-c + ) && + + check_bookmark hgrepo feature-c feature-c + +Cloning into 'gitrepo'... ok 18 - remote new bookmark multiple branch head -checking known breakage: +expecting success: test_when_finished "rm -rf gitrepo hgrepo" && ( @@ -3199,9 +3220,70 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets +adding changesets +adding manifests +adding manifests +adding file changes +adding file changes +adding remote bookmark devel +adding remote bookmark diverge +adding remote bookmark feature-b +added 2 changesets with 3 changes to 3 files +new changesets f1c703ba15e4:a9fbaead33c7 +added 5 changesets with 5 changes to 1 files (+1 heads) +new changesets db887fb144f0:0cbf89a96087 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +WARNING: Branch 'default' has more than one head, consider merging +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/4) +[feature-c ebdd7aa] feature-c + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +Cloning into './sub_hg_a/sub_hg_a_x'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +searching for changes +adding changesets +adding manifests +adding manifests +adding file changes +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +added 1 changesets with 1 changes to 1 files +new changesets eb3970836a03 +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 4f2c35e2788e +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 21758fc] copy + Author: A U Thor + 1 file changed, 2 insertions(+) + create mode 100644 content-copy ok 18 - remote new bookmark multiple branch head -expecting success: +checking known breakage: test_when_finished "rm -rf gitrepo hgrepo" && ( @@ -3238,87 +3320,46 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -added 1 changesets with 1 changes to 1 files -new changesets 0084579eb2a4 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 0084579eb2a4 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master 01cf905] copy - Author: A U Thor - 1 file changed, 2 insertions(+) - create mode 100644 content-copy -[master 381a103] moved - Author: A U Thor - 1 file changed, 0 insertions(+), 0 deletions(-) - rename content-copy => content-moved (100%) -[master 01cf905] copy - Author: A U Thor - 1 file changed, 2 insertions(+) - create mode 100644 content-copy -[master 381a103] moved +Cloning into './sub_hg_b'... +[master 55d3c44] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +no changes found +adding changesets +searching for changes +adding manifests +adding file changes adding changesets adding manifests adding file changes +Cloning into 'gitrepo'... +added 2 changesets with 2 changes to 2 files added 2 changesets with 3 changes to 3 files -new changesets 609506aff680:620d737d9a9f +new changesets 2452e731b69a:8ba9adfd97f0 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo - b66f1a3..381a103 master -> master -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/hgrepo - fffffff..381a103 master -> master -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] + fffffff..55d3c44 master -> master adding changesets adding manifests adding file changes -not ok 19 - push commits with copy and rename # TODO known breakage +added 1 changesets with 1 changes to 1 files +new changesets 85db8267fb35 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_b/sub_git'... +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +done. +ok 19 - push commits with copy and rename expecting success: test_when_finished "rm -rf hgrepo gitrepo && LC_ALL=C" && @@ -3350,11 +3391,37 @@ echo "ø~?" > expected && test_cmp expected actual -added 2 changesets with 3 changes to 3 files -new changesets c87f5b5cc125:280442381fbd -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 19 - push commits with copy and rename +[master d632971] copy + Author: A U Thor + 1 file changed, 2 insertions(+) + create mode 100644 content-copy +[master 8f14c1e] moved + Author: A U Thor + 1 file changed, 0 insertions(+), 0 deletions(-) + rename content-copy => content-moved (100%) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +warning: filename contains '?', which is reserved on Windows: 'ø~?' +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/hgrepo + 2b04a6f..8f14c1e master -> master +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 74a3600475e8 +not ok 19 - push commits with copy and rename # TODO known breakage expecting success: test_when_finished "rm -rf hgrepo gitrepo && LC_ALL=C" && @@ -3386,66 +3453,50 @@ echo "ø~?" > expected && test_cmp expected actual -Cloning into './sub_hg_a/sub_hg_a_x'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 8caecf533e0a -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... +progress revision 2 'default' (0/1) warning: filename contains '?', which is reserved on Windows: 'ø~?' warning: filename contains '?', which is reserved on Windows: 'ø~?' +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + bb2cb09..380fd52 master -> origin/master + bb2cb09..380fd52 branches/default -> origin/branches/default +Cloning into 'gitrepo'... +Updating bb2cb09..380fd52 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets cbdfe93a7683:b68899e9a5b6 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. -warning: filename contains '?', which is reserved on Windows: 'ø~?' -warning: filename contains '?', which is reserved on Windows: 'ø~?' -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +added 1 changesets with 1 changes to 1 files +new changesets 5fdd9f744ad2 adding changesets adding manifests adding file changes +progress revision 2 'default' (0/1) +added 3 changesets with 4 changes to 2 files +new changesets af628ae0434f:f8370ef8566e +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a + 53db277..19b0167 branches/default -> origin/branches/default + 53db277..19b0167 master -> origin/master +warning: filename contains '?', which is reserved on Windows: 'ø~?' +HEAD is now at 53db277 substate_hg_a /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -added 3 changesets with 4 changes to 2 files -new changesets 166ab9aebd3b:78293468c14f -adding manifests -adding file changes +Cloning into 'gitrepo'... searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 26f0dadbd264 -added 3 changesets with 4 changes to 2 files -new changesets a27a3330d6a7:2088787218d2 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) -progress revision 2 'default' (0/1) -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - 598545a..d2a43ed master -> origin/master - 598545a..d2a43ed branches/default -> origin/branches/default -Updating 598545a..d2a43ed -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +new changesets 94e4195d3138 +progress revision 1 'default' (0/1) ok 20 - fetch special filenames expecting success: @@ -3484,6 +3535,23 @@ printf "content\næ rø\n" > expected && test_cmp expected actual +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + 828172d..db44211 branches/default -> origin/branches/default + 828172d..db44211 master -> origin/master +HEAD is now at 828172d zero_sub_hg_a_x +adding changesets +adding manifests +adding file changes +added 3 changesets with 4 changes to 2 files +new changesets 09d007d739d9:1a0c9773f9b7 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +Cloning into 'gitrepo'... ok 20 - fetch special filenames expecting success: @@ -3522,90 +3590,47 @@ printf "content\næ rø\n" > expected && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 09cc74a2a7d9 -progress revision 2 'default' (0/1) -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a - 44ee2e2..badf9d5 branches/default -> origin/branches/default - 44ee2e2..badf9d5 master -> origin/master -HEAD is now at 44ee2e2 substate_hg_a -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes +ok 9 - subcommand sub subsequent recursive update + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update --rebase + adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets cd39e94e0b69 -added 1 changesets with 1 changes to 1 files -new changesets cd39e94e0b69 +new changesets 626f015d47d4 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 910e2dc27c08 -[master 6032723] utf-8 +[master 6aa0796] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" -progress revision 1 'default' (0/1) -[master 6032723] utf-8 - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 "\303\246 r\303\270" -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 4c44f04..72517c9 branches/default -> origin/branches/default - 4c44f04..72517c9 master -> origin/master -HEAD is now at 4c44f04 zero_sub_hg_a_x +Cloning into 'gitrepo'... WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found -searching for changes -no changes found adding changesets +searching for changes adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -searching for changes -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..6032723 master -> master adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - d4ca574..6032723 master -> master -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +added 1 changesets with 1 changes to 1 files +new changesets a91d8a6481ac +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..6aa0796 master -> master 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -ok 9 - subcommand sub subsequent recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --rebase - +[master 8502587] utf-8 + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 "\303\246 r\303\270" ok 21 - push special filenames expecting success: @@ -3664,6 +3689,17 @@ check gitrepo origin/master one fi +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + 09a66ab..8502587 master -> master +1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 21 - push special filenames expecting success: @@ -3722,47 +3758,90 @@ check gitrepo origin/master one fi -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ [master (root-commit) e9a16bb] zero_sub_git Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content_sub_git -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets +Cloning into 'gitrepo'... adding manifests adding file changes adding remote bookmark bad_bmark1 adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 3f3eb1036d5f:aec767f70dc7 +new changesets d37d54aa5366:cd26d1c7fbcb +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) adding remote bookmark bad_bmark1 adding remote bookmark bad_bmark2 adding remote bookmark good_bmark +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) added 4 changesets with 4 changes to 1 files -new changesets 3f3eb1036d5f:aec767f70dc7 +new changesets 4ddea4b0a96f:4a9efa2b6808 +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets b7734e788a4b:b7f92041d150 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 3ac4f69 zero -HEAD is now at 3ac4f69 zero -HEAD is now at 3ac4f69 zero -HEAD is now at 3ac4f69 zero -HEAD is now at 9f5872a good branch -HEAD is now at 9f5872a good branch +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... +HEAD is now at 88073e4 zero +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +HEAD is now at 88073e4 zero +added 2 changesets with 3 changes to 3 files +new changesets 84a8aa4c0cab:60b18599c610 +HEAD is now at 30bc612 zero +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +HEAD is now at 30bc612 zero +Cloning into './sub_hg_a/sub_hg_a_x'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +HEAD is now at 123fbc7 good branch +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 058f2ab5f1d6 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +HEAD is now at eb10605 good branch +Cloning into './sub_hg_b'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 7c3de25a11e2:2910acb8b7d9 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_b/sub_git'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -3780,7 +3859,7 @@ ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -Cloning into 'gitrepo'... +done. /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found @@ -3810,9 +3889,9 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..468a24e branches/good_branch -> branches/good_branch - fffffff..b056dc4 good_bmark -> good_bmark - fffffff..20fcf01 master -> master + fffffff..afa2f5e branches/good_branch -> branches/good_branch + fffffff..93b662c good_bmark -> good_bmark + fffffff..582353c master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) @@ -3823,9 +3902,9 @@ hint: counterpart. If you want to integrate the remote changes, use 'git pull' hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..20fcf01 master -> master - fffffff..b056dc4 good_bmark -> good_bmark - fffffff..468a24e branches/good_branch -> branches/good_branch + fffffff..582353c master -> master + fffffff..93b662c good_bmark -> good_bmark + fffffff..afa2f5e branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) @@ -3833,36 +3912,6 @@ ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets e05a70ff1932:01b3eb2d79de -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets e8ac6f42e03c:f32e578384bd -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets a0cab176ceea -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... ok 22 - remote big push expecting success: @@ -3947,15 +3996,13 @@ fi ) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 32ebafccc4cb:f9f6ebdee318 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +added 1 changesets with 1 changes to 1 files +new changesets aaec74e902da +progress revision 2 'default' (0/1) ok 22 - remote big push expecting success: @@ -4040,21 +4087,10 @@ fi ) -Cloning into './sub_hg_b/sub_git'... -done. -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets bceaaa3d9f4d -progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - cff0ee5..7bfe5be master -> origin/master - cff0ee5..7bfe5be branches/default -> origin/branches/default -Updating cff0ee5..7bfe5be + 53c8b1b..0c7205d master -> origin/master + 53c8b1b..0c7205d branches/default -> origin/branches/default +Updating 53c8b1b..0c7205d Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -4067,58 +4103,58 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 16f234b64b01 +new changesets 5839f24b7b23 progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a - d23ca95..d8f6436 branches/default -> origin/branches/default - d23ca95..d8f6436 master -> origin/master -HEAD is now at d23ca95 substate_hg_a + e3525ed..49d9f42 branches/default -> origin/branches/default + e3525ed..49d9f42 master -> origin/master +HEAD is now at e3525ed substate_hg_a Cloning into 'gitrepo'... Successfully rebased and updated detached HEAD. -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark -adding remote bookmark good_bmark -added 3 changesets with 3 changes to 1 files -new changesets 8d8f7c0f353d:8779ef31b811 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 9bbb911b0463 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'bad_branch' (0/2) +new changesets 01bb2e09f42c +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 328da33..e94e9bd branches/default -> origin/branches/default - 328da33..e94e9bd master -> origin/master -HEAD is now at 328da33 zero_sub_hg_a_x -Successfully rebased and updated detached HEAD. +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... +adding changesets +adding manifests /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +adding file changes +adding remote bookmark bad_bmark +adding remote bookmark good_bmark +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + bff8c81..b01cbb6 branches/default -> origin/branches/default + bff8c81..b01cbb6 master -> origin/master +added 3 changesets with 3 changes to 1 files +new changesets 5ac0ac45d6b5:ed0e15baf681 +HEAD is now at bff8c81 zero_sub_hg_a_x adding changesets adding manifests adding file changes adding remote bookmark bad_bmark adding remote bookmark good_bmark -added 3 changesets with 3 changes to 1 files -new changesets d2887a2d6f49:d100c9ec9aa2 +Successfully rebased and updated detached HEAD. progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +added 3 changesets with 3 changes to 1 files +new changesets 44ef3e8b9474:2a7fe529bd50 no changes found +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'bad_branch' (0/2) ok 10 - subcommand sub subsequent recursive update -- rebase expecting success: @@ -4136,7 +4172,7 @@ adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets 4284ccd4e0f3 +new changesets feb957456822 To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) @@ -4147,59 +4183,15 @@ hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -updating bookmark bad_bmark -added 1 changesets with 1 changes to 1 files -new changesets c62272eb1b92 -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..ec779cb good_bmark -> good_bmark - fffffff..4f84961 master -> master - ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) - ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo' -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..4f84961 master -> master - fffffff..ec779cb good_bmark -> good_bmark - ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) - ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found progress revision 3 'bad_branch' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -updating bookmark good_bmark -2 local changesets published -WARNING: Branch 'default' has more than one head, consider merging From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - 0e224a6..94aac1f branches/bad_branch -> origin/branches/bad_branch -progress revision 3 'bad_branch' (0/1) - f455301..94aac1f bad_bmark -> origin/bad_bmark -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - 014a6dc..7158307 branches/bad_branch -> origin/branches/bad_branch - 5d9b8db..4f84961 branches/default -> origin/branches/default - 5d9b8db..7158307 bad_bmark -> origin/bad_bmark + ec6e57d..5959eee branches/bad_branch -> origin/branches/bad_branch + 13b3698..5959eee bad_bmark -> origin/bad_bmark /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -4215,6 +4207,7 @@ hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ ok 23 - remote big push non fast forward expecting success: @@ -4260,6 +4253,57 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +updating bookmark bad_bmark +added 1 changesets with 1 changes to 1 files +new changesets 492b4c46695d +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..657ec6f good_bmark -> good_bmark + fffffff..9df8413 master -> master + ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) + ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + fffffff..9df8413 master -> master + fffffff..657ec6f good_bmark -> good_bmark + ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) + ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +updating bookmark good_bmark +2 local changesets published +WARNING: Branch 'default' has more than one head, consider merging +progress revision 3 'bad_branch' (0/1) +Cloning into 'gitrepo'... +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + 16c9c0e..c000c32 branches/bad_branch -> origin/branches/bad_branch + 37c2199..9df8413 branches/default -> origin/branches/default + 37c2199..c000c32 bad_bmark -> origin/bad_bmark +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found @@ -4318,60 +4362,83 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 3b41a4e81885:9b95f14abc88 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... adding changesets -adding changesets -adding manifests -adding file changes adding manifests adding file changes adding remote bookmark bad_bmark1 adding remote bookmark bad_bmark2 adding remote bookmark good_bmark -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets d1a576fa7cdb:71602b449b3c +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] added 4 changesets with 4 changes to 1 files -new changesets 95d314eebfbc:2dd52b952b2b +new changesets 21b870f658f8:03d64d0cdb26 +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 8fd8862ed30c:d8da2ff77a92 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... +Cloning into './sub_hg_a/sub_hg_a_x'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +HEAD is now at 03b32ef zero +adding manifests +adding file changes +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files +new changesets e89229bca2ac:d9fdc3a08027 +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets d05236a4e067 +HEAD is now at 03b32ef zero +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 9f3078e zero -HEAD is now at 15ec5d9 zero -HEAD is now at 9f3078e zero -HEAD is now at 15ec5d9 zero +Cloning into './sub_hg_b'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -HEAD is now at fdd8afe good branch -HEAD is now at 11f6f84 good branch adding changesets +HEAD is now at b1fc841 zero adding manifests adding file changes +HEAD is now at f095f7c good branch added 2 changesets with 3 changes to 3 files -new changesets c16bd8c45291:18f4995099be +new changesets 87fb8ec85a15:7aad777570ed progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... +HEAD is now at b1fc841 zero +Cloning into './sub_hg_b/sub_git'... +done. +HEAD is now at 0da73cd good branch /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -4383,113 +4450,49 @@ adding file changes added 9 changesets with 9 changes to 1 files (+7 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - + 12a2f43...0a730a2 branches/bad_branch -> branches/bad_branch (forced update) - 11f6f84..b1d5ffa branches/good_branch -> branches/good_branch - + 45b9ea2...4d3c9b4 bad_bmark1 -> bad_bmark1 (forced update) - + 45b9ea2...e85d4c7 bad_bmark2 -> bad_bmark2 (forced update) - 45b9ea2..7a841eb good_bmark -> good_bmark - 45b9ea2..656370f master -> master + + 383d2d0...fb8e81f branches/bad_branch -> branches/bad_branch (forced update) + f095f7c..2392311 branches/good_branch -> branches/good_branch + + e96ec5d...fa542d3 bad_bmark1 -> bad_bmark1 (forced update) + + e96ec5d...d961368 bad_bmark2 -> bad_bmark2 (forced update) + e96ec5d..b41d964 good_bmark -> good_bmark + e96ec5d..c8ef875 master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - 45b9ea2..656370f master -> master - 45b9ea2..7a841eb good_bmark -> good_bmark - 11f6f84..b1d5ffa branches/good_branch -> branches/good_branch + e96ec5d..c8ef875 master -> master + e96ec5d..b41d964 good_bmark -> good_bmark + f095f7c..2392311 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + 45b9ea2...4d3c9b4 bad_bmark1 -> bad_bmark1 (forced update) - + 45b9ea2...e85d4c7 bad_bmark2 -> bad_bmark2 (forced update) - + 12a2f43...0a730a2 branches/bad_branch -> branches/bad_branch (forced update) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + + e96ec5d...fa542d3 bad_bmark1 -> bad_bmark1 (forced update) + + e96ec5d...d961368 bad_bmark2 -> bad_bmark2 (forced update) + + 383d2d0...fb8e81f branches/bad_branch -> branches/bad_branch (forced update) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...1160e88 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...8341e70 branches/good_branch -> branches/good_branch (forced update) - + fffffff...8469e61 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...2900ab8 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...cc4edc9 good_bmark -> good_bmark (forced update) - + fffffff...2c2a5f2 master -> master (forced update) - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - + fffffff...2c2a5f2 master -> master (forced update) - + fffffff...cc4edc9 good_bmark -> good_bmark (forced update) - + fffffff...8341e70 branches/good_branch -> branches/good_branch (forced update) - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + fffffff...8469e61 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...2900ab8 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...1160e88 branches/bad_branch -> branches/bad_branch (forced update) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +new changesets 0860e1dd114d +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + d6d144f..a76e272 master -> origin/master + d6d144f..a76e272 branches/default -> origin/branches/default +Updating d6d144f..a76e272 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 6ac8280fe1ff:57a1c677ca22 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 1096d01b2847 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets a2641910b6f4:0a0d348c50f1 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. +new changesets bbd2b76d0ea6 +progress revision 2 'default' (0/1) ok 24 - remote big push force expecting success: @@ -4541,6 +4544,112 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a + c67750a..03e7b42 branches/default -> origin/branches/default + c67750a..03e7b42 master -> origin/master +HEAD is now at c67750a substate_hg_a +Updating c67750a..03e7b42 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 2f23588cccb1 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + 9c6ae1c..41e19a6 branches/default -> origin/branches/default + 9c6ae1c..41e19a6 master -> origin/master +HEAD is now at 9c6ae1c zero_sub_hg_a_x +Updating 9c6ae1c..41e19a6 +Fast-forward + content_sub_hg_a_x | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + + fffffff...e7b9a7b branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...b87ed1f branches/good_branch -> branches/good_branch (forced update) + + fffffff...52bec6c bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...521f104 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...ff7b546 good_bmark -> good_bmark (forced update) + + fffffff...829df92 master -> master (forced update) + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + + fffffff...829df92 master -> master (forced update) + + fffffff...ff7b546 good_bmark -> good_bmark (forced update) + + fffffff...b87ed1f branches/good_branch -> branches/good_branch (forced update) + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + fffffff...52bec6c bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...521f104 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...e7b9a7b branches/bad_branch -> branches/bad_branch (forced update) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +Cloning into 'gitrepo'... +ok 11 - subcommand sub subsequent recursive update -- merge + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_foreach + +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark ok 24 - remote big push force expecting success: @@ -4592,104 +4701,48 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 6cbf1e15e236 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - 40c76bd..b138db1 master -> origin/master - 40c76bd..b138db1 branches/default -> origin/branches/default -Updating 40c76bd..b138db1 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 04220aea7b43 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a - ece5144..a249ca3 branches/default -> origin/branches/default - ece5144..a249ca3 master -> origin/master -HEAD is now at ece5144 substate_hg_a -Updating ece5144..a249ca3 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 149e2c75c712 -progress revision 1 'default' (0/1) -Cloning into 'gitrepo'... +added 4 changesets with 4 changes to 1 files +new changesets 9e6ec40dd499:cd003cfed26d +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 7a7a344 zero +HEAD is now at 7a7a344 zero Cloning into 'gitrepo'... -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - c5043cb..b158197 branches/default -> origin/branches/default - c5043cb..b158197 master -> origin/master +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -HEAD is now at c5043cb zero_sub_hg_a_x -Updating c5043cb..b158197 -Fast-forward - content_sub_hg_a_x | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -adding changesets +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git adding changesets adding manifests -adding manifests -adding file changes adding file changes adding remote bookmark bad_bmark1 adding remote bookmark bad_bmark2 adding remote bookmark good_bmark -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files added 4 changesets with 4 changes to 1 files -new changesets c12e1f72df95:8c44e209c411 -new changesets c12e1f72df95:8c44e209c411 +new changesets f46c565929b9:90bbb3fe7f16 +HEAD is now at 33bdb80 good branch +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -progress revision walk 'bookmarks/master' (1/1) +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 305d8f38e1ce:3bac8395a795 +HEAD is now at 632c603 zero progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -progress revision 2 'bad_branch' (0/2) -ok 11 - subcommand sub subsequent recursive update -- merge - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_foreach - -HEAD is now at a9a7fb1 zero -HEAD is now at a9a7fb1 zero -HEAD is now at a9a7fb1 zero -HEAD is now at a9a7fb1 zero -HEAD is now at 0e60614 good branch -HEAD is now at 0e60614 good branch +HEAD is now at 632c603 zero +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -4707,76 +4760,42 @@ ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..20b2e30 branches/good_branch -> branches/good_branch - fffffff..974cabe good_bmark -> good_bmark - fffffff..764a48b master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) - ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) - ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo' -hint: Updates were rejected because a pushed branch tip is behind its remote -hint: counterpart. If you want to integrate the remote changes, use 'git pull' -hint: before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..764a48b master -> master - fffffff..974cabe good_bmark -> good_bmark - fffffff..20b2e30 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) - ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) - ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - 0e60614..20b2e30 branches/good_branch -> branches/good_branch - 0839359..974cabe good_bmark -> good_bmark - 0839359..764a48b master -> master - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - 0839359..764a48b master -> master - 0839359..974cabe good_bmark -> good_bmark - 0e60614..20b2e30 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..20b2e30 branches/good_branch -> branches/good_branch - fffffff..974cabe good_bmark -> good_bmark - fffffff..764a48b master -> master + 33bdb80..11b9344 branches/good_branch -> branches/good_branch + 2cd731c..b938750 good_bmark -> good_bmark + 2cd731c..a4927a8 master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - fffffff..764a48b master -> master - fffffff..974cabe good_bmark -> good_bmark - fffffff..20b2e30 branches/good_branch -> branches/good_branch + 2cd731c..a4927a8 master -> master + 2cd731c..b938750 good_bmark -> good_bmark + 33bdb80..11b9344 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets eec7048b340d:c206d80e9653 +new changesets b97db6ca0ae5:d3825142e48a progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +Cloning into './sub_hg_a/sub_hg_a_x'... +HEAD is now at bb5d6e0 good branch +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets da50ba4bf236 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 25 - remote big push dry-run expecting success: @@ -4823,74 +4842,6 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -ok 25 - remote big push dry-run - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && - - setup_big_push - - ( - cd gitrepo && - - if test "$CAPABILITY_PUSH" = "t" - then - check_push 0 --force --dry-run --all <<-\EOF - master:forced-update - good_bmark:forced-update - branches/good_branch:forced-update - new_bmark:new - branches/new_branch:new - bad_bmark1:forced-update - bad_bmark2:forced-update - branches/bad_branch:forced-update - EOF - else - check_push 0 --force --dry-run --all <<-\EOF - master - good_bmark - branches/good_branch - new_bmark:new - branches/new_branch:new - bad_bmark1:forced-update - bad_bmark2:forced-update - branches/bad_branch:forced-update - EOF - fi - ) && - - check gitrepo origin/master one && - check_branch hgrepo default one && - check_branch hgrepo good_branch "good branch" && - check_branch hgrepo bad_branch "bad branch" && - check_branch hgrepo new_branch && - check_bookmark hgrepo good_bmark one && - check_bookmark hgrepo bad_bmark1 one && - check_bookmark hgrepo bad_bmark2 one && - check_bookmark hgrepo new_bmark - -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 1a5bbbb563b7:920c32a62ec1 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 4df2f8ad86be -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) Cloning into './sub_hg_b'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] @@ -4898,16 +4849,60 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 58935cdc2539:c550c7230ce3 +new changesets e259e76865fa:6c86bccbec19 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..82bafe7 branches/good_branch -> branches/good_branch + fffffff..a7ae5e8 good_bmark -> good_bmark + fffffff..0c96973 master -> master + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) + ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) + ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo' +hint: Updates were rejected because a pushed branch tip is behind its remote +hint: counterpart. If you want to integrate the remote changes, use 'git pull' +hint: before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + fffffff..0c96973 master -> master + fffffff..a7ae5e8 good_bmark -> good_bmark + fffffff..82bafe7 branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) + ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) + ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) Cloning into './sub_hg_b/sub_git'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..82bafe7 branches/good_branch -> branches/good_branch + fffffff..a7ae5e8 good_bmark -> good_bmark + fffffff..0c96973 master -> master + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + fffffff..0c96973 master -> master + fffffff..a7ae5e8 good_bmark -> good_bmark + fffffff..82bafe7 branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch done. +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -hg 5958c64198b15c1664276c8fcbc8135fe8d34fd3 920c32a62ec1b898c8e6e24bfc2b6c218571739f sub_hg_a /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo -hg 7fd6655fc037ef8728f47152fe01729fb2df5e26 4df2f8ad86bea011e25612b75e39f938eb94b501 sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg 2018c2ab4221b63ac58118d7a04e16c534f9defb c550c7230ce3ecd0a65a59848c32a83c646ac627 sub_hg_b /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +hg 695c3a05175432599909297506ab2fa66f2e6328 d3825142e48af8aca80bd06759d29d6ed8088208 sub_hg_a /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo +hg 63d7a6c8fb5d87469d56107bb1a837e128b07223 da50ba4bf236094e827a55677ca8e8bc4908eeea sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg 74bf24e9263ce770e5b320b88515c6a1a0319a7f 6c86bccbec191d0808a594a3f074e2a8a3c4353a sub_hg_b /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo git e9a16bb7c08361f85ab0002e4094b4229fefb384 e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/gitrepo/sub_hg_b ok 12 - subcommand sub foreach @@ -4941,14 +4936,6 @@ test_cmp expected actual ) -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes @@ -4956,141 +4943,95 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 48c8195ea37e:0e6168e94ff2 -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets 48c8195ea37e:0e6168e94ff2 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) +new changesets 7579c39661ba:a6ac323f6c41 +ok 25 - remote big push dry-run + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo*" && + + setup_big_push + + ( + cd gitrepo && + + if test "$CAPABILITY_PUSH" = "t" + then + check_push 0 --force --dry-run --all <<-\EOF + master:forced-update + good_bmark:forced-update + branches/good_branch:forced-update + new_bmark:new + branches/new_branch:new + bad_bmark1:forced-update + bad_bmark2:forced-update + branches/bad_branch:forced-update + EOF + else + check_push 0 --force --dry-run --all <<-\EOF + master + good_bmark + branches/good_branch + new_bmark:new + branches/new_branch:new + bad_bmark1:forced-update + bad_bmark2:forced-update + branches/bad_branch:forced-update + EOF + fi + ) && + + check gitrepo origin/master one && + check_branch hgrepo default one && + check_branch hgrepo good_branch "good branch" && + check_branch hgrepo bad_branch "bad branch" && + check_branch hgrepo new_branch && + check_bookmark hgrepo good_bmark one && + check_bookmark hgrepo bad_bmark1 one && + check_bookmark hgrepo bad_bmark2 one && + check_bookmark hgrepo new_bmark + progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at f479c38 zero -HEAD is now at f479c38 zero -HEAD is now at f479c38 zero -HEAD is now at f479c38 zero -HEAD is now at 74cdf5a good branch -HEAD is now at 74cdf5a good branch -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - + a32bf85...b436198 branches/bad_branch -> branches/bad_branch (forced update) - 74cdf5a..688b3d5 branches/good_branch -> branches/good_branch - + a953562...b346ca4 bad_bmark1 -> bad_bmark1 (forced update) - + a953562...811767f bad_bmark2 -> bad_bmark2 (forced update) - a953562..93f095b good_bmark -> good_bmark - a953562..f305279 master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - a953562..f305279 master -> master - a953562..93f095b good_bmark -> good_bmark - 74cdf5a..688b3d5 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + a953562...b346ca4 bad_bmark1 -> bad_bmark1 (forced update) - + a953562...811767f bad_bmark2 -> bad_bmark2 (forced update) - + a32bf85...b436198 branches/bad_branch -> branches/bad_branch (forced update) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...b436198 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...688b3d5 branches/good_branch -> branches/good_branch (forced update) - + fffffff...b346ca4 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...811767f bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...93f095b good_bmark -> good_bmark (forced update) - + fffffff...f305279 master -> master (forced update) - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - + fffffff...f305279 master -> master (forced update) - + fffffff...93f095b good_bmark -> good_bmark (forced update) - + fffffff...688b3d5 branches/good_branch -> branches/good_branch (forced update) - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + fffffff...b346ca4 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...811767f bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...b436198 branches/bad_branch -> branches/bad_branch (forced update) +HEAD is now at 8400d37 zero Cloning into 'gitrepo'... +HEAD is now at 8400d37 zero /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 254bd0203524:424357fd99b3 +new changesets 6cb8b434237a:b0e932ee803c progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +HEAD is now at 6e55af4 good branch /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] Cloning into './sub_hg'... -ok 26 - remote big push force dry-run - -ok 26 - remote big push force dry-run - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero && - echo one > content && - hg commit -m one - ) && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git reset --hard HEAD^ && - echo two > content && - git commit -a -m two && - test_expect_code 1 git push && - test_expect_code 1 git push - ) - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero && - echo one > content && - hg commit -m one - ) && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git reset --hard HEAD^ && - echo two > content && - git commit -a -m two && - test_expect_code 1 git push && - test_expect_code 1 git push - ) - +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets +adding changesets +adding manifests adding manifests adding file changes +adding file changes +adding remote bookmark bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files added 1 changesets with 1 changes to 1 files -new changesets 07b1fde564fd +new changesets 950d84758662 +new changesets e5995c93a33b:97271a428f04 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) url = foobar /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] @@ -5158,68 +5099,137 @@ check_branch hgclone/sub_hg default one_sub_hg && check hgclone/sub_git HEAD one_sub_git +HEAD is now at 86a150c zero +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + + 6307f30...190afa9 branches/bad_branch -> branches/bad_branch (forced update) + 6e55af4..8c29e9f branches/good_branch -> branches/good_branch + + 5d786b2...c52f803 bad_bmark1 -> bad_bmark1 (forced update) + + 5d786b2...3c18d82 bad_bmark2 -> bad_bmark2 (forced update) + 5d786b2..a646f32 good_bmark -> good_bmark + 5d786b2..266b77b master -> master + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + 5d786b2..266b77b master -> master + 5d786b2..a646f32 good_bmark -> good_bmark + 6e55af4..8c29e9f branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + 5d786b2...c52f803 bad_bmark1 -> bad_bmark1 (forced update) + + 5d786b2...3c18d82 bad_bmark2 -> bad_bmark2 (forced update) + + 6307f30...190afa9 branches/bad_branch -> branches/bad_branch (forced update) +HEAD is now at 86a150c zero +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +HEAD is now at 4efa8ae good branch Cloning into 'gitrepo'... +ok 26 - remote big push force dry-run + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero && + echo one > content && + hg commit -m one + ) && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git reset --hard HEAD^ && + echo two > content && + git commit -a -m two && + test_expect_code 1 git push && + test_expect_code 1 git push + ) + +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 9c65f6e3ed44:44b3706fdad7 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +Cloning into './sub_hg'... adding changesets adding manifests adding file changes +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + + fffffff...05f5c65 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...bde98a1 branches/good_branch -> branches/good_branch (forced update) + + fffffff...37144b5 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...8251c64 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...155d1ad good_bmark -> good_bmark (forced update) + + fffffff...22d283d master -> master (forced update) + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + + fffffff...22d283d master -> master (forced update) + + fffffff...155d1ad good_bmark -> good_bmark (forced update) added 2 changesets with 2 changes to 1 files -new changesets e30d77d428f3:9052f76fac40 +new changesets dddecff12514:2092905f7d99 + + fffffff...bde98a1 branches/good_branch -> branches/good_branch (forced update) + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + fffffff...37144b5 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...8251c64 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...05f5c65 branches/bad_branch -> branches/bad_branch (forced update) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files -new changesets e30d77d428f3:9052f76fac40 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -HEAD is now at ff4491e zero -[master 94dbaac] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -HEAD is now at ff4491e zero -[master 94dbaac] two +added 1 changesets with 1 changes to 1 files +new changesets 3e4c3fa091e0 +HEAD is now at d5fc81e zero +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master ca78752] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo' -no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo' +Cloning into './sub_git'... hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo' +done. no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo ! [rejected] master -> master (non-fast-forward) @@ -5259,14 +5269,15 @@ ! grep feature-a out ) -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. -ok 27 - remote double failed push +[detached HEAD f9b9c48] one_sub_hg + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +ok 26 - remote big push force dry-run expecting success: - test_when_finished "rm -rf gitrepo hgrepo" && + test_when_finished "rm -rf hgrepo gitrepo*" && ( hg init hgrepo && @@ -5274,104 +5285,114 @@ echo zero > content && hg add content && hg commit -m zero && - echo feature-a > content && - hg commit -m feature-a - hg bookmark feature-a - ) && - - git clone "hg::hgrepo" gitrepo && - check gitrepo origin/feature-a feature-a && - - ( - cd hgrepo && - hg bookmark -d feature-a + echo one > content && + hg commit -m one ) && ( + git clone "hg::hgrepo" gitrepo && cd gitrepo && - git fetch --prune origin - git branch -a > out && - ! grep feature-a out + git reset --hard HEAD^ && + echo two > content && + git commit -a -m two && + test_expect_code 1 git push && + test_expect_code 1 git push ) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg + fffffff..f9b9c48 HEAD -> master +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +1 local changesets published +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg + 683b86d..f9b9c48 branches/default -> origin/branches/default +Cloning into 'gitrepo'... +[detached HEAD cea1af1] one_sub_git Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git + 1 file changed, 1 insertion(+), 1 deletion(-) +To /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git + * [new branch] HEAD -> new Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 6066db4b604b:4f03601e4cf4 +added 2 changesets with 2 changes to 1 files +new changesets 0c3a5f73e17e:388f9b8bfc13 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into './sub_hg'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Updating ./sub_hg to ee2366381cfcd5489354b193b9875447df7fc3e9 [git f9b9c48] +Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] +HEAD is now at 1f99984 zero +[master 0c6605f] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +diff --git a/.hgsubstate b/.hgsubstate +index 4fd8c47..82d05c2 100644 +--- a/.hgsubstate ++++ b/.hgsubstate +@@ -1,2 +1,2 @@ +-e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git +-3e4c3fa091e082235a7b764a02ca2b6d71398f04 sub_hg ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git ++ee2366381cfcd5489354b193b9875447df7fc3e9 sub_hg WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways + M .hgsubstate +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +[master 5db4357] update_sub + Author: A U Thor + 1 file changed, 2 insertions(+), 2 deletions(-) adding changesets adding manifests adding file changes adding remote bookmark feature-a added 2 changesets with 2 changes to 1 files -new changesets a3c59986fa86:a4ac7b7f6d60 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a -added 2 changesets with 2 changes to 1 files -new changesets a3c59986fa86:a4ac7b7f6d60 +new changesets 0c3a5f73e17e:a86497494bef +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo' progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 7cd398f0fcff -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_git'... -done. -[detached HEAD f60ac5e] one_sub_hg - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways no changes found -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - - [deleted] (none) -> origin/feature-a -no changes found -error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - - [deleted] (none) -> origin/feature-a -no changes found searching for changes adding changesets adding manifests adding file changes -ok 28 - fetch prune +added 1 changesets with 1 changes to 1 files +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo + fffffff..5db4357 master -> master +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. +ok 27 - remote double failed push expecting success: test_when_finished "rm -rf gitrepo hgrepo" && @@ -5382,42 +5403,36 @@ echo zero > content && hg add content && hg commit -m zero && - hg up -r null && - echo another > ocontent && - hg add ocontent && - hg commit -m one + echo feature-a > content && + hg commit -m feature-a + hg bookmark feature-a ) && - # -r 1 acts as master - ( - git init --bare gitrepo && cd gitrepo && - git remote add origin hg::../hgrepo && - git fetch origin refs/heads/*:refs/heads/* - ) && + git clone "hg::hgrepo" gitrepo && + check gitrepo origin/feature-a feature-a && ( cd hgrepo && - hg up 0 && - echo two > content && - hg commit -m two + hg bookmark -d feature-a ) && - # now master already exists - # -r 2 becomes master head which has rev 0 as ancestor - # so when importing (parentless) rev 0, a reset is needed - # (to ensure rev 0 is not given a parent commit) ( cd gitrepo && - git fetch origin && - git log --format="%s" origin/master > ../actual - ) && - - hg -R hgrepo log -r . -f --template "{desc}\n" > expected && - test_cmp actual expected + git fetch --prune origin + git branch -a > out && + ! grep feature-a out + ) -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg - fffffff..f60ac5e HEAD -> master +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + - [deleted] (none) -> origin/feature-a +Cloning into '/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgclone/sub_git'... +done. ok 28 - fetch prune expecting success: @@ -5462,92 +5477,14 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -1 local changesets published -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg - 2dd60c0..f60ac5e branches/default -> origin/branches/default -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -To /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git - * [new branch] HEAD -> new -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Updating ./sub_hg to 571635233ae7bb5077e63df17384857748ade4f2 [git f60ac5e] -Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -diff --git a/.hgsubstate b/.hgsubstate -index 1ae3522..e87ce65 100644 ---- a/.hgsubstate -+++ b/.hgsubstate -@@ -1,2 +1,2 @@ --e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --7cd398f0fcffc9452254bebc4653bfbd0395ae2d sub_hg -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+571635233ae7bb5077e63df17384857748ade4f2 sub_hg - M .hgsubstate -[master 602db98] update_sub - Author: A U Thor - 1 file changed, 2 insertions(+), 2 deletions(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo - fffffff..602db98 master -> master -created new head -created new head -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/gitrepo/ -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/gitrepo/ -Cloning into '/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgclone/sub_git'... -done. Switched to a new branch 'new' updating to branch default cloning subrepo sub_git from /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git cloning subrepo sub_hg from /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_hg 3 files updated, 0 files merged, 0 files removed, 0 files unresolved -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets abf8182b9e44:bb57f1d5725f -adding changesets -adding manifests -WARNING: Branch 'default' has more than one head, consider merging -adding file changes -WARNING: Branch 'default' has more than one head, consider merging -progress revision 1 'default' (0/1) -added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets abf8182b9e44:bb57f1d5725f -From hg::../hgrepo - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] branches/default -> origin/branches/default - * [new branch] master -> origin/master -WARNING: Branch 'default' has more than one head, consider merging -WARNING: Branch 'default' has more than one head, consider merging -progress revision 1 'default' (0/1) -From hg::../hgrepo - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] branches/default -> origin/branches/default - * [new branch] master -> origin/master 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 1 files removed, 0 files unresolved -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +Cloning into 'gitrepo'... ok 14 - subcommand sub addstate expecting success: @@ -5592,62 +5529,108 @@ test_cmp output actual ) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -searching for changes adding changesets -searching for changes adding manifests adding file changes +adding remote bookmark feature-a +added 2 changesets with 2 changes to 1 files +new changesets c33044a1413d:240d9cd5c312 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +created new head +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/gitrepo/ +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets f78bdaee8c2d -added 1 changesets with 1 changes to 1 files -new changesets f78bdaee8c2d +added 2 changesets with 2 changes to 2 files (+1 heads) +new changesets 00e87d776160:19df0fbc56f0 WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'branches/default' (2/2) -progress revision 0 'default' (0/2) WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'branches/default' (2/2) -progress revision 0 'default' (0/2) +progress revision 1 'default' (0/1) +From hg::../hgrepo + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] branches/default -> origin/branches/default + * [new branch] master -> origin/master +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - + fedf560...ed6b2b7 branches/default -> origin/branches/default (forced update) - + fedf560...ed6b2b7 master -> origin/master (forced update) -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - + fedf560...ed6b2b7 branches/default -> origin/branches/default (forced update) - + fedf560...ed6b2b7 master -> origin/master (forced update) -ok 29 - fetch multiple independent histories + - [deleted] (none) -> origin/feature-a +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +ok 28 - fetch prune expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && + test_when_finished "rm -rf gitrepo hgrepo" && ( hg init hgrepo && cd hgrepo && - echo a > a && - hg add a && - hg commit -m a && - hg bookmark -r null bookmark + echo zero > content && + hg add content && + hg commit -m zero && + hg up -r null && + echo another > ocontent && + hg add ocontent && + hg commit -m one ) && + # -r 1 acts as master + ( + git init --bare gitrepo && cd gitrepo && + git remote add origin hg::../hgrepo && + git fetch origin refs/heads/*:refs/heads/* + ) && + + ( + cd hgrepo && + hg up 0 && + echo two > content && + hg commit -m two + ) && + + # now master already exists + # -r 2 becomes master head which has rev 0 as ancestor + # so when importing (parentless) rev 0, a reset is needed + # (to ensure rev 0 is not given a parent commit) ( - git clone "hg::hgrepo" gitrepo && - check gitrepo HEAD a && cd gitrepo && - git checkout --quiet -b bookmark && - git remote -v && - echo b > b && - git add b && - git commit -m b && - git push origin bookmark - ) + git fetch origin && + git log --format="%s" origin/master > ../actual + ) && + hg -R hgrepo log -r . -f --template "{desc}\n" > expected && + test_cmp actual expected + +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 8e35c545d150 +WARNING: Branch 'default' has more than one head, consider merging +progress revision walk 'branches/default' (2/2) +progress revision 0 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + + 7d3ecbf...6a99f21 branches/default -> origin/branches/default (forced update) + + 7d3ecbf...6a99f21 master -> origin/master (forced update) +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git ok 29 - fetch multiple independent histories expecting success: @@ -5674,49 +5657,61 @@ git push origin bookmark ) +created new head Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/gitrepo/ /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... adding changesets +adding changesets +adding manifests adding manifests adding file changes -adding remote bookmark bookmark +adding file changes +added 2 changesets with 3 changes to 3 files +added 2 changesets with 2 changes to 2 files (+1 heads) +new changesets 66a9a43f94ea:1e4285d56bc6 +new changesets b126d0db9bbd:93a09bf0217c +WARNING: Branch 'default' has more than one head, consider merging +WARNING: Branch 'default' has more than one head, consider merging +progress revision 1 'default' (0/1) +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +From hg::../hgrepo + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] branches/default -> origin/branches/default + * [new branch] master -> origin/master +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests -added 1 changesets with 1 changes to 1 files -new changesets 4a8b77d74c27 adding file changes +1 files updated, 0 files merged, 1 files removed, 0 files unresolved adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets 4a8b77d74c27 -WARNING: Ignoring invalid bookmark 'bookmark' -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +new changesets d3f5d6e66aab WARNING: Ignoring invalid bookmark 'bookmark' progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -origin hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo (fetch) -origin hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo (push) -[bookmark 8062488] b - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 b +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Cloning into './sub_hg_a'... origin hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo (fetch) origin hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo (push) -[bookmark 8062488] b +[bookmark 6bbd9fb] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -5724,23 +5719,30 @@ WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found -WARNING: Ignoring invalid bookmark 'bookmark' -no changes found searching for changes adding changesets adding manifests adding file changes -WARNING: Ignoring invalid bookmark 'bookmark' added 1 changesets with 1 changes to 1 files +new changesets 4e1bc9024fe3 +WARNING: Ignoring invalid bookmark 'bookmark' +WARNING: Branch 'default' has more than one head, consider merging +adding changesets +adding manifests +progress revision walk 'branches/default' (2/2) +progress revision 0 'default' (0/2) +adding file changes searching for changes -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - * [new branch] bookmark -> bookmark adding changesets +added 1 changesets with 1 changes to 1 files +new changesets aa1ebcfb708f adding manifests adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo * [new branch] bookmark -> bookmark +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 30 - clone remote with null bookmark, then push expecting success: @@ -5761,75 +5763,97 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -ok 30 - clone remote with null bookmark, then push +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + + 50fea6b...3c8cc81 branches/default -> origin/branches/default (forced update) + + 50fea6b...3c8cc81 master -> origin/master (forced update) +ok 29 - fetch multiple independent histories expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && + test_when_finished "rm -rf gitrepo* hgrepo*" && ( hg init hgrepo && cd hgrepo && - echo one > content && - hg add content && - hg commit -m one && - echo two > content && - hg commit -m two + echo a > a && + hg add a && + hg commit -m a && + hg bookmark -r null bookmark ) && + ( git clone "hg::hgrepo" gitrepo && - hg -R hgrepo log --template "{node}\n\n" > expected && - git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && - test_cmp expected actual + check gitrepo HEAD a && + cd gitrepo && + git checkout --quiet -b bookmark && + git remote -v && + echo b > b && + git add b && + git commit -m b && + git push origin bookmark + ) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 8111a0142427:bb3748ff8a38 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +Cloning into './sub_git'... +done. +[detached HEAD cea1af1] one_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... + 450b9f5ebacce4dd64f80b3fdd0c1ba6f8bcb538 ./sub_hg_a (heads/master) +-58a5b3a227ff8dea463dcc0d3ed2e0e60117431a[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) + 450b9f5ebacce4dd64f80b3fdd0c1ba6f8bcb538 ./sub_hg_a (heads/master) +-58a5b3a227ff8dea463dcc0d3ed2e0e60117431a[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) adding changesets -adding manifests -adding file changes adding changesets adding manifests -added 2 changesets with 2 changes to 1 files -new changesets 85b02d870d4a:19a5a3fdf03f +adding manifests +adding file changes adding file changes +ok 15 - subcommand sub status + +adding remote bookmark bookmark +added 1 changesets with 1 changes to 1 files added 2 changesets with 2 changes to 1 files -new changesets 85b02d870d4a:19a5a3fdf03f -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +# passed all 15 test(s) +new changesets 22b11095935d:d7fb7ed48c1c +1..15 +new changesets fd9d7f2d97fe +WARNING: Ignoring invalid bookmark 'bookmark' progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets ae4beb842033 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +origin hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo (fetch) +origin hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo (push) +[bookmark 34eb7be] b + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 b +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found ok 31 - notes -expecting success: +checking known breakage: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -5853,9 +5877,17 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -ok 31 - notes +WARNING: Ignoring invalid bookmark 'bookmark' +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + * [new branch] bookmark -> bookmark +ok 30 - clone remote with null bookmark, then push -checking known breakage: +expecting success: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -5863,43 +5895,17 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one - ) && - - git clone "hg::hgrepo" gitrepo && - - ( - cd gitrepo && + hg commit -m one && echo two > content && - git commit -a -m two && - git push + hg commit -m two ) && + git clone "hg::hgrepo" gitrepo && hg -R hgrepo log --template "{node}\n\n" > expected && git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into './sub_git'... -done. -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] - b543f5ed83396e023dea88629a7ef5babcb15659 ./sub_hg_a (heads/master) --c99da55d7c9135c231c0b725c0ad1b18512c14b8[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) - b543f5ed83396e023dea88629a7ef5babcb15659 ./sub_hg_a (heads/master) --c99da55d7c9135c231c0b725c0ad1b18512c14b8[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -5907,60 +5913,41 @@ adding changesets adding manifests adding file changes -adding changesets -adding manifests -adding file changes added 1 changesets with 1 changes to 1 files -new changesets f871a9c15522 -added 1 changesets with 1 changes to 1 files -new changesets f871a9c15522 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +new changesets 227c95151f3a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 3d6f230] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[master 3d6f230] two +[master 84c670d] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) -ok 15 - subcommand sub status - -# passed all 15 test(s) -1..15 +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found -no changes found searching for changes adding changesets adding manifests adding file changes -searching for changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - 733d09c..3d6f230 master -> master + 4782ed2..84c670d master -> master +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..3d6f230 master -> master ---- expected 2026-11-24 04:40:46.665514686 +0000 -+++ actual 2026-11-24 04:40:46.701514686 +0000 +added 2 changesets with 2 changes to 1 files +new changesets 227c95151f3a:ee6f62e4a2e4 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +--- expected 2025-10-21 22:27:48.783072121 +0000 ++++ actual 2025-10-21 22:27:48.823072286 +0000 @@ -1,4 +1,3 @@ --2c02bdd6355ab0dbf4e4aadb2a4404148472a53e +-45d79f7201b57c438e8aacba05305097be3f4309 - f871a9c155225de73f1272b9bfd60e7b64afb4c5 + 227c95151f3a686066a22abbb116f1628eb0c93b not ok 32 - push updates notes # TODO known breakage @@ -5988,7 +5975,7 @@ check_bookmark hgrepo feature-a two -ok 32 - push updates notes +ok 31 - notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6007,79 +5994,72 @@ cd gitrepo && echo two > content && git commit -a -m two && - git push origin master && - git branch feature-a && - git push origin feature-a + git push ) && - check_bookmark hgrepo feature-a two + hg -R hgrepo log --template "{node}\n\n" > expected && + git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && + test_cmp expected actual Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways adding changesets -adding changesets adding manifests adding file changes -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 40b6ce2a1ff7 added 1 changesets with 1 changes to 1 files -new changesets 40b6ce2a1ff7 +new changesets 0ea7356803eb progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master b4ba2fb] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[master b4ba2fb] two +[master fda01bb] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 0ea7356803eb +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found -no changes found -searching for changes +[master fda01bb] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) searching for changes adding changesets adding manifests -adding changesets -adding file changes -adding manifests adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - ac188d7..b4ba2fb master -> master -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..b4ba2fb master -> master + 2294f17..fda01bb master -> master +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] no changes found -1 local changesets published searching for changes -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - * [new branch] feature-a -> feature-a no changes found +adding changesets 1 local changesets published +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files searching for changes -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo * [new branch] feature-a -> feature-a +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..fda01bb master -> master ok 33 - push bookmark without changesets expecting success: @@ -6102,7 +6082,7 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual -ok 33 - push bookmark without changesets +ok 32 - push updates notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6117,12 +6097,16 @@ git clone "hg::hgrepo" gitrepo && - (cd hgrepo && hg tag v1.0) && - (cd gitrepo && git pull) && + ( + cd gitrepo && + echo two > content && + git commit -a -m two && + git push origin master && + git branch feature-a && + git push origin feature-a + ) && - echo "v1.0" > expected && - git --git-dir=gitrepo/.git tag > actual && - test_cmp expected actual + check_bookmark hgrepo feature-a two Cloning into 'gitrepo'... Cloning into 'gitrepo'... @@ -6133,48 +6117,52 @@ WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways adding changesets -adding changesets -adding manifests adding manifests adding file changes +adding changesets +adding manifests adding file changes added 1 changesets with 1 changes to 1 files +new changesets 6485da6810a3 added 1 changesets with 1 changes to 1 files -new changesets 0d8a65850d8c -new changesets 0d8a65850d8c -progress revision walk 'bookmarks/master' (0/0) +new changesets 6485da6810a3 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +[master 4f8e9d4] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets f170387af691 -progress revision 1 'default' (0/1) +no changes found /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +searching for changes WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes searching for changes +added 1 changesets with 1 changes to 1 files adding changesets adding manifests adding file changes -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - 0b59448..1600d8e master -> origin/master - 0b59448..1600d8e branches/default -> origin/branches/default - * [new tag] v1.0 -> v1.0 added 1 changesets with 1 changes to 1 files -new changesets f170387af691 -Updating 0b59448..1600d8e +new changesets ee586eeb31fd +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..4f8e9d4 master -> master +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + 54d4196..043d0b2 master -> origin/master + 54d4196..043d0b2 branches/default -> origin/branches/default + * [new tag] v1.0 -> v1.0 +Updating 54d4196..043d0b2 Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) create mode 100644 .hgtags -progress revision 1 'default' (0/1) ok 34 - pull tags expecting success: @@ -6210,16 +6198,14 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual -From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - 0b59448..1600d8e master -> origin/master - 0b59448..1600d8e branches/default -> origin/branches/default - * [new tag] v1.0 -> v1.0 -Updating 0b59448..1600d8e -Fast-forward - .hgtags | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 .hgtags -ok 34 - pull tags +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +1 local changesets published +searching for changes +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + * [new branch] feature-a -> feature-a +ok 33 - push bookmark without changesets expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6229,49 +6215,32 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one && - hg branch feature && - echo two > content && - hg commit -m two && - hg update default && - echo three > content && - hg commit -m three + hg commit -m one ) && - ( git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git merge -m Merge -Xtheirs origin/branches/feature && - git push - ) && - cat > expected <<-EOF && - Merge - three - two - one - EOF - hg -R hgrepo log --template "{desc}\n" > actual && + (cd hgrepo && hg tag v1.0) && + (cd gitrepo && git pull) && + + echo "v1.0" > expected && + git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual marked working directory as branch feature (branches are permanent and global, did you want a bookmark?) -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Cloning into 'gitrepo'... Cloning into 'gitrepo'... +1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets a886e586925c:3258c19baa8c -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'feature' (0/1) +added 1 changesets with 1 changes to 1 files +new changesets fbfca78a0145 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -6279,42 +6248,34 @@ adding changesets adding manifests adding file changes -Auto-merging content -Merge made by the 'ort' strategy. added 3 changesets with 3 changes to 1 files (+1 heads) - content | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -new changesets a886e586925c:3258c19baa8c +new changesets 5dea0fdaef12:1ff73c7b76ab progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) -Auto-merging content -Merge made by the 'ort' strategy. - content | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files (-1 heads) -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..9b78707 master -> master -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (-1 heads) -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - 13ff769..9b78707 master -> master -ok 35 - push merged named branch +added 1 changesets with 1 changes to 1 files +new changesets 59fefd7de606 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + b2e22d2..ce48f79 master -> origin/master + b2e22d2..ce48f79 branches/default -> origin/branches/default + * [new tag] v1.0 -> v1.0 +Auto-merging content +Merge made by the 'ort' strategy. + content | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Updating b2e22d2..ce48f79 +Fast-forward + .hgtags | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 .hgtags +ok 34 - pull tags expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6324,20 +6285,43 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one + hg commit -m one && + hg branch feature && + echo two > content && + hg commit -m two && + hg update default && + echo three > content && + hg commit -m three ) && ( git clone "hg::hgrepo" gitrepo && cd gitrepo && - git tag v1.0 && - git push --tags + git merge -m Merge -Xtheirs origin/branches/feature && + git push ) && - echo "C O Mitter " > expected && - hg -R hgrepo log --template "{author}\n" -r tip > actual && + cat > expected <<-EOF && + Merge + three + two + one + EOF + hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (-1 heads) +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + dc04b2b..2d60cd7 master -> master ok 35 - push merged named branch expecting success: @@ -6362,50 +6346,58 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... adding changesets -adding changesets -adding manifests adding manifests adding file changes -adding file changes -added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files -new changesets bdb07c3c8e38 -new changesets bdb07c3c8e38 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +new changesets ece3a03a99f9 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets d013ef000112:79ac841f0b9f +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'feature' (0/1) +Auto-merging content +Merge made by the 'ort' strategy. + content | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] no changes found no changes found searching for changes adding changesets adding manifests adding file changes -searching for changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo * [new tag] v1.0 -> v1.0 +searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files +added 1 changesets with 1 changes to 1 files (-1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - * [new tag] v1.0 -> v1.0 + fffffff..1c567ab master -> master ok 36 - light tag sets author expecting success: @@ -6415,7 +6407,6 @@ hg init hgrepo && cd hgrepo && echo one > content && -ok 36 - light tag sets author hg add content && hg commit -m one && hg branch feature && @@ -6436,6 +6427,7 @@ hg -R hgrepo log --template="{branch}\n" -r tip > actual && test_cmp expected actual +ok 35 - push merged named branch expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6445,82 +6437,59 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one && - hg branch feature && - echo two > content && - hg commit -m two + hg commit -m one ) && ( git clone "hg::hgrepo" gitrepo && cd gitrepo && - git branch && - git checkout branches/feature && git tag v1.0 && git push --tags ) && - echo feature > expected && - hg -R hgrepo log --template="{branch}\n" -r tip > actual && + echo "C O Mitter " > expected && + hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) -Cloning into 'gitrepo'... Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 13065b3678c1:5a0bdaeb026d +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) adding changesets adding manifests adding file changes +added 1 changesets with 1 changes to 1 files +new changesets a89e5da6109b progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -progress revision 1 'feature' (0/1) -added 2 changesets with 2 changes to 1 files -new changesets 13065b3678c1:5a0bdaeb026d -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'feature' (0/1) -* master -* master -Switched to a new branch 'branches/feature' -branch 'branches/feature' set up to track 'origin/branches/feature'. -Switched to a new branch 'branches/feature' -branch 'branches/feature' set up to track 'origin/branches/feature'. -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found -no changes found -searching for changes adding changesets adding manifests adding file changes +added 2 changesets with 2 changes to 1 files +new changesets a89e5da6109b:fd46697f2270 searching for changes adding changesets adding manifests adding file changes +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'feature' (0/1) added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo * [new tag] v1.0 -> v1.0 -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -ok 37 - push tag different branch +* master +Switched to a new branch 'branches/feature' +branch 'branches/feature' set up to track 'origin/branches/feature'. +ok 36 - light tag sets author expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6528,18 +6497,39 @@ ( hg init hgrepo && cd hgrepo && - - echo test > test_file && - hg add test_file && - hg commit -m add && - - hg rm test_file && - hg commit -m remove + echo one > content && + hg add content && + hg commit -m one && + hg branch feature && + echo two > content && + hg commit -m two ) && + ( git clone "hg::hgrepo" gitrepo && - check_files gitrepo + cd gitrepo && + git branch && + git checkout branches/feature && + git tag v1.0 && + git push --tags + ) && + + echo feature > expected && + hg -R hgrepo log --template="{branch}\n" -r tip > actual && + test_cmp expected actual +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + * [new tag] v1.0 -> v1.0 ok 37 - push tag different branch expecting success: @@ -6560,28 +6550,34 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes Cloning into 'gitrepo'... +added 2 changesets with 2 changes to 1 files +new changesets fe6add89f33b:c885b2b74dae +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'feature' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways adding changesets -adding changesets -adding manifests adding manifests adding file changes -adding file changes -added 2 changesets with 1 changes to 1 files added 2 changesets with 1 changes to 1 files -new changesets 35bd0355e164:4f02bb38a8a1 -new changesets 35bd0355e164:4f02bb38a8a1 +new changesets f2682468a4e1:8e5ca95751ca progress revision walk 'bookmarks/master' (1/1) -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) progress revision 0 'master' (0/2) +* master +Switched to a new branch 'branches/feature' +branch 'branches/feature' set up to track 'origin/branches/feature'. ok 38 - cloning a removed file works expecting success: @@ -6605,7 +6601,17 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file/test_file" -ok 38 - cloning a removed file works +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo + * [new tag] v1.0 -> v1.0 +ok 37 - push tag different branch expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6614,44 +6620,30 @@ hg init hgrepo && cd hgrepo && - echo test > dir_or_file && - hg add dir_or_file && + echo test > test_file && + hg add test_file && hg commit -m add && - hg rm dir_or_file && - mkdir dir_or_file && - echo test > dir_or_file/test_file && - hg add dir_or_file/test_file && - hg commit -m replase + hg rm test_file && + hg commit -m remove ) && git clone "hg::hgrepo" gitrepo && - check_files gitrepo "dir_or_file/test_file" + check_files gitrepo Cloning into 'gitrepo'... -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -new changesets 248449054bec:a515aa59aea7 added 2 changesets with 2 changes to 2 files -new changesets 248449054bec:a515aa59aea7 +new changesets 9929212927a0:8c0df513622e progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 39 - cloning a file replaced with a directory - +Cloning into 'gitrepo'... ok 39 - cloning a file replaced with a directory expecting success: @@ -6677,6 +6669,17 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file" +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 1 changes to 1 files +new changesets 5ff053551990:2f1894482fd8 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +ok 38 - cloning a removed file works + expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6684,46 +6687,33 @@ hg init hgrepo && cd hgrepo && - mkdir dir_or_file && - echo test > dir_or_file/test_file && - hg add dir_or_file/test_file && - hg commit -m add && - - hg rm dir_or_file/test_file && echo test > dir_or_file && hg add dir_or_file && hg commit -m add && - hg rm dir_or_file + hg rm dir_or_file && + mkdir dir_or_file && + echo test > dir_or_file/test_file && + hg add dir_or_file/test_file && + hg commit -m replase ) && git clone "hg::hgrepo" gitrepo && - check_files gitrepo "dir_or_file" + check_files gitrepo "dir_or_file/test_file" Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways adding changesets -adding changesets adding manifests -adding manifests -adding file changes adding file changes added 2 changesets with 2 changes to 2 files -added 2 changesets with 2 changes to 2 files -new changesets 063eaa070fb2:00eb39bd4a5a -new changesets 063eaa070fb2:ac069015d378 -progress revision walk 'bookmarks/master' (1/1) +new changesets a4f877268c85:280469e781db +Cloning into 'gitrepo'... progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -progress revision 0 'master' (0/2) -ok 40 - clone replace directory with a file - ok 40 - clone replace directory with a file expecting success: @@ -6747,6 +6737,17 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files +new changesets 647ebd18c783:eebd81a79f97 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +ok 39 - cloning a file replaced with a directory + expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6754,30 +6755,26 @@ hg init hgrepo && cd hgrepo && - touch test.txt && - hg add test.txt && - hg commit -m master && - hg branch parent && - echo test >test.txt && - hg commit -m test && - hg branch parent/child && - echo test1 >test.txt && - hg commit -m test1 + mkdir dir_or_file && + echo test > dir_or_file/test_file && + hg add dir_or_file/test_file && + hg commit -m add && + + hg rm dir_or_file/test_file && + echo test > dir_or_file && + hg add dir_or_file && + hg commit -m add && + + hg rm dir_or_file ) && - git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && - check_files gitrepo "test.txt" + git clone "hg::hgrepo" gitrepo && + check_files gitrepo "dir_or_file" marked working directory as branch parent (branches are permanent and global, did you want a bookmark?) -marked working directory as branch parent -(branches are permanent and global, did you want a bookmark?) -marked working directory as branch parent/child marked working directory as branch parent/child Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -6785,21 +6782,22 @@ adding changesets adding manifests adding file changes -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files -new changesets f76d7c517cde:702e206af9b1 -WARNING: Ignoring matched branch parent/child +Cloning into 'gitrepo'... added 3 changesets with 3 changes to 1 files -new changesets f76d7c517cde:702e206af9b1 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'parent' (0/1) +new changesets 6ec75f690234:9590e805ce50 WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'parent' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files +new changesets a1807ea8f600:ae64fedd3bff +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 41 - clone can ignore invalid refnames expecting success: @@ -6829,7 +6827,7 @@ test_cmp expected actual -ok 41 - clone can ignore invalid refnames +ok 40 - clone replace directory with a file expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6837,64 +6835,49 @@ ( hg init hgrepo && cd hgrepo && - echo one > content && - hg add content && - hg commit -m one - ) && - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git tag -m "Version 1.0" v1.0 && - git push --tags + touch test.txt && + hg add test.txt && + hg commit -m master && + hg branch parent && + echo test >test.txt && + hg commit -m test && + hg branch parent/child && + echo test1 >test.txt && + hg commit -m test1 ) && - cat > expected <<-\EOF && - tip:Version 1.0:C O Mitter - v1.0:one:H G Wells - EOF - - hg -R hgrepo log --template "{tags}:{desc}:{author}\n" > actual && - - test_cmp expected actual + git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && + check_files gitrepo "test.txt" Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets a96e0e590eb2 /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +marked working directory as branch parent +(branches are permanent and global, did you want a bookmark?) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets caa5318713ce -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +new changesets 520ad8daba66 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways no changes found searching for changes adding changesets adding manifests adding file changes +marked working directory as branch parent/child added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo * [new tag] v1.0 -> v1.0 -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found +Cloning into 'gitrepo'... ok 42 - push annotated tag expecting success: @@ -6917,62 +6900,133 @@ git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && test_cmp expected actual -searching for changes +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] Cloning into 'gitrepo1'... adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +added 3 changesets with 3 changes to 1 files +new changesets b4dfb84fbaed:6ba65c905753 +WARNING: Ignoring matched branch parent/child +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'parent' (0/1) no changes found warning: You appear to have cloned an empty repository. -ok 42 - push annotated tag +ok 41 - clone can ignore invalid refnames expecting success: - test_when_finished "rm -rf hgrepo gitrepo1 gitrepo2" && + test_when_finished "rm -rf hgrepo gitrepo" && + ( hg init hgrepo && + cd hgrepo && + echo one > content && + hg add content && + hg commit -m one + ) && ( - git clone "hg::hgrepo" gitrepo1 && - cd gitrepo1 && - echo two >> content && - git add content && - git commit -m two --date="2016-09-26 00:00:00 -0230" && - git push + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git tag -m "Version 1.0" v1.0 && + git push --tags ) && - git clone "hg::hgrepo" gitrepo2 && + cat > expected <<-\EOF && + tip:Version 1.0:C O Mitter + v1.0:one:H G Wells + EOF + + hg -R hgrepo log --template "{tags}:{desc}:{author}\n" > actual && - git --git-dir=gitrepo1/.git log -1 --format="%ai" > expected && - git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && test_cmp expected actual -Cloning into 'gitrepo1'... [master (root-commit) 9f40cc0] two Author: A U Thor Date: Mon Sep 26 00:00:00 2016 -0230 1 file changed, 1 insertion(+) create mode 100644 content -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways no changes found searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo + * [new branch] master -> master +Cloning into 'gitrepo2'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets e522f351d13b adding changesets adding manifests adding file changes +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) added 1 changesets with 1 changes to 1 files +new changesets d47ff90a6a9f +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +ok 43 - timezone issues with negative offsets + +# still have 2 known breakage(s) +# passed all remaining 41 test(s) +1..43 +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - * [new branch] master -> master -Cloning into 'gitrepo2'... + * [new tag] v1.0 -> v1.0 +ok 42 - push annotated tag + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo1 gitrepo2" && + + hg init hgrepo && + + ( + git clone "hg::hgrepo" gitrepo1 && + cd gitrepo1 && + echo two >> content && + git add content && + git commit -m two --date="2016-09-26 00:00:00 -0230" && + git push + ) && + + git clone "hg::hgrepo" gitrepo2 && + + git --git-dir=gitrepo1/.git log -1 --format="%ai" > expected && + git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && + test_cmp expected actual + +Cloning into 'gitrepo1'... +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found warning: You appear to have cloned an empty repository. [master (root-commit) 9f40cc0] two Author: A U Thor @@ -6981,35 +7035,24 @@ create mode 100644 content /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways no changes found searching for changes adding changesets adding manifests adding file changes -adding changesets -adding manifests -adding file changes added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/tmp/hgrepo +To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo * [new branch] master -> master Cloning into 'gitrepo2'... -added 1 changesets with 1 changes to 1 files -new changesets e522f351d13b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files new changesets e522f351d13b +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 43 - timezone issues with negative offsets expecting success: @@ -7034,13 +7077,6 @@ check_bookmark hgrepo feature-a -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -ok 43 - timezone issues with negative offsets - -# still have 2 known breakage(s) -# passed all remaining 41 test(s) -1..43 Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] @@ -7049,7 +7085,7 @@ adding file changes adding remote bookmark feature-a added 1 changesets with 1 changes to 1 files -new changesets 2a784537fc3f +new changesets 34619a4c962f progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -7096,10 +7132,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 73cccdc589c8 +new changesets b86dc82f8d2f progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 09aaf2d] one +[master 6a9b24e] one Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -7145,7 +7181,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets ad39303f6e5a +new changesets 1dd5bde33358 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -7165,19 +7201,19 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets 65e49ffdb90c:bf507987c926 +new changesets e5665e5c43fb:2245a76bee96 progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - 1ba5d25..08900b4 master -> origin/master - 1ba5d25..08900b4 branches/default -> origin/branches/default -HEAD is now at 08900b4 restored + cf4815e..bf581e3 master -> origin/master + cf4815e..bf581e3 branches/default -> origin/branches/default +HEAD is now at bf581e3 restored /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo.second - ! [remote rejected] master -> master (rejected not pushing hg based commit 75ad0a19f6a4d023e157acc67285db48c4654c34) + ! [remote rejected] master -> master (rejected not pushing hg based commit 24b2121c5af0271af676b6a2cb0c8d8cdc1abff1) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo.second' - ! [remote rejected] master -> master (rejected not pushing hg based commit 75ad0a19f6a4d023e157acc67285db48c4654c34) + ! [remote rejected] master -> master (rejected not pushing hg based commit 24b2121c5af0271af676b6a2cb0c8d8cdc1abff1) ok 46 - check-hg-commits with fail mode expecting success: @@ -7201,23 +7237,23 @@ or locale.getdefaultlocale()[1] progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - 2402303..cfbc8e3 master -> origin/master - 2402303..cfbc8e3 branches/default -> origin/branches/default -HEAD is now at cfbc8e3 restored + 4b57d61..1838c06 master -> origin/master + 4b57d61..1838c06 branches/default -> origin/branches/default +HEAD is now at 1838c06 restored /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: Pushing hg changeset dd06bd64529cacc8e2d6c116afa6f705b7566237 for a7321cb108cf22a61fac276af02e7dfa0ce61e63 -WARNING: Pushing hg changeset b6f1284e9f2fecba5459883cfcf5a9812c8be35f for dd5d1bff5842f136d3793fb0fc9fdf81f03e7cf3 -WARNING: Pushing hg changeset c686c4f6b0e962f4a01742916e7e392cbc43fa4f for 97c7f2043ad2937eb974ba078df49db4d30ef872 -WARNING: Pushing hg changeset f19aed688badf4f1509b6c15cfd14c0acdb9cb3e for c0090fdbda700d3fcb62dccac93db578542df915 -WARNING: Pushing hg changeset fe9a8442e87a81f7c5dba8a3f74a106d1beb39a6 for cfbc8e39b9ff12f7f2d7db2a8a40a014d9bc6857 +WARNING: Pushing hg changeset 9cae4424bd51d1f8ab2dd314f1e71e715acc6e8c for 860fd03a7f52df54a1619509332b376f5d603512 +WARNING: Pushing hg changeset 38c5d76516663e43f1007a716805b54f31a147d9 for 114b8f5eb4fe590747bb7e07d653f607db69c5b6 +WARNING: Pushing hg changeset 55b1f109e06872f0b06356e6292ccdbb0802cd71 for 08f6cb2848e2c7a9805450a4496b9227f88800fc +WARNING: Pushing hg changeset 72fdfd69627c0facca24f340122a087e33569f88 for f3871cb146244199c1f1fbc3124761bfb7d6a481 +WARNING: Pushing hg changeset 03fa459c518191f63270bfe90290376961fecd35 for 1838c0616076d82c1670a1171d589e4c0ccba253 To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..cfbc8e3 master -> master -WARNING: Pushing hg changeset dd06bd64529cacc8e2d6c116afa6f705b7566237 for a7321cb108cf22a61fac276af02e7dfa0ce61e63 -WARNING: Pushing hg changeset b6f1284e9f2fecba5459883cfcf5a9812c8be35f for dd5d1bff5842f136d3793fb0fc9fdf81f03e7cf3 -WARNING: Pushing hg changeset c686c4f6b0e962f4a01742916e7e392cbc43fa4f for 97c7f2043ad2937eb974ba078df49db4d30ef872 -WARNING: Pushing hg changeset f19aed688badf4f1509b6c15cfd14c0acdb9cb3e for c0090fdbda700d3fcb62dccac93db578542df915 -WARNING: Pushing hg changeset fe9a8442e87a81f7c5dba8a3f74a106d1beb39a6 for cfbc8e39b9ff12f7f2d7db2a8a40a014d9bc6857 + fffffff..1838c06 master -> master +WARNING: Pushing hg changeset 9cae4424bd51d1f8ab2dd314f1e71e715acc6e8c for 860fd03a7f52df54a1619509332b376f5d603512 +WARNING: Pushing hg changeset 38c5d76516663e43f1007a716805b54f31a147d9 for 114b8f5eb4fe590747bb7e07d653f607db69c5b6 +WARNING: Pushing hg changeset 55b1f109e06872f0b06356e6292ccdbb0802cd71 for 08f6cb2848e2c7a9805450a4496b9227f88800fc +WARNING: Pushing hg changeset 72fdfd69627c0facca24f340122a087e33569f88 for f3871cb146244199c1f1fbc3124761bfb7d6a481 +WARNING: Pushing hg changeset 03fa459c518191f63270bfe90290376961fecd35 for 1838c0616076d82c1670a1171d589e4c0ccba253 ok 47 - check-hg-commits with push mode - no local proxy expecting success: @@ -7230,7 +7266,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 182334d08635 +new changesets 3badac595637 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -7250,32 +7286,32 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets ae0a019e5a39:23de76eebea9 +new changesets 2f5c18e00ce3:1ec6c8e8cf45 progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo - 4a06556..90e109f master -> origin/master - 4a06556..90e109f branches/default -> origin/branches/default -HEAD is now at 90e109f restored + 3912cda..13c38cd master -> origin/master + 3912cda..13c38cd branches/default -> origin/branches/default +HEAD is now at 13c38cd restored /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found -WARNING: Using hg changeset ae0a019e5a39a3368039ae1a2cb9fe2c192ada99 for a51c40ba17832495bd9205eefc4011cec123f56c -WARNING: Using hg changeset 9f33b8915e8e1b82a4243012a429cfa3d635ff6c for a661ad21663a80e9d736b7da59a403a629ff3ecd -WARNING: Using hg changeset 47b360660287fe687e512d3725f1f80ff722340a for e927690356d3c3c533991e1a744f150f2b31c070 -WARNING: Using hg changeset 812ebaa52f8bbf965c819a6ee9fcc6383601a217 for 6b011ee5d913cf72bcc18bda24ec304b6eb1b130 -WARNING: Using hg changeset 23de76eebea9acce6e7267a34852f79f71d484db for 90e109f146287ed181e2598215f4e5c1bf83b3c6 +WARNING: Using hg changeset 2f5c18e00ce335a8105fb631cf7e5325431a2b51 for c2529a5cc6887e7128892b7b4b0312692a61d5af +WARNING: Using hg changeset d3f56b2ea4e5b2a3faabaf2f26136e5bf4f5876f for 895669ebe74b3d0000b7d0a7a520911fc680a561 +WARNING: Using hg changeset 390454f2bf3da001b937035336b31daf2d0045f5 for 88ee2aca6912ff4e8bdc8058ff7f22fd1f1f1388 +WARNING: Using hg changeset 0f764f598cf9e201906e4d10c4305f088296c1a5 for 5e463c303d049433f99d41db4bab21a08d2e74db +WARNING: Using hg changeset 1ec6c8e8cf45925c6142e0ec2f5c0c81334ab79b for 13c38cdf5178380e8f78ebb7569b55c0b16d4b64 searching for changes adding changesets adding manifests adding file changes added 5 changesets with 5 changes to 2 files To hg::/build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..90e109f master -> master -WARNING: Using hg changeset ae0a019e5a39a3368039ae1a2cb9fe2c192ada99 for a51c40ba17832495bd9205eefc4011cec123f56c -WARNING: Using hg changeset 9f33b8915e8e1b82a4243012a429cfa3d635ff6c for a661ad21663a80e9d736b7da59a403a629ff3ecd -WARNING: Using hg changeset 47b360660287fe687e512d3725f1f80ff722340a for e927690356d3c3c533991e1a744f150f2b31c070 -WARNING: Using hg changeset 812ebaa52f8bbf965c819a6ee9fcc6383601a217 for 6b011ee5d913cf72bcc18bda24ec304b6eb1b130 -WARNING: Using hg changeset 23de76eebea9acce6e7267a34852f79f71d484db for 90e109f146287ed181e2598215f4e5c1bf83b3c6 + fffffff..13c38cd master -> master +WARNING: Using hg changeset 2f5c18e00ce335a8105fb631cf7e5325431a2b51 for c2529a5cc6887e7128892b7b4b0312692a61d5af +WARNING: Using hg changeset d3f56b2ea4e5b2a3faabaf2f26136e5bf4f5876f for 895669ebe74b3d0000b7d0a7a520911fc680a561 +WARNING: Using hg changeset 390454f2bf3da001b937035336b31daf2d0045f5 for 88ee2aca6912ff4e8bdc8058ff7f22fd1f1f1388 +WARNING: Using hg changeset 0f764f598cf9e201906e4d10c4305f088296c1a5 for 5e463c303d049433f99d41db4bab21a08d2e74db +WARNING: Using hg changeset 1ec6c8e8cf45925c6142e0ec2f5c0c81334ab79b for 13c38cdf5178380e8f78ebb7569b55c0b16d4b64 ok 48 - check-hg-commits with push mode - with local proxy expecting success: @@ -7297,7 +7333,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 9aaf816b4f68 +new changesets 25321c618b5f progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -7307,23 +7343,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Nov 24 04:43 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Nov 24 04:43 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 21 22:29 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 21 22:29 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs ok 49 - shared-marks unset expecting success: @@ -7355,7 +7391,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 93944c9054a6 +new changesets 897aecb9d4ab progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -7365,31 +7401,31 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Nov 24 04:43 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Nov 24 04:43 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 21 22:29 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 21 22:29 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: seeded marks of origin with shared; performing gc +WARNING: seeded marks of second with shared; performing gc /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -ERROR: found both .git/hg/origin/marks-git and .git/hg/marks-git -WARNING: gc for origin failed -WARNING: seeded marks of second with shared; performing gc +ERROR: found both .git/hg/second/marks-git and .git/hg/marks-git +WARNING: gc for second failed +WARNING: seeded marks of origin with shared; performing gc /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] Loading hg marks ... @@ -7400,26 +7436,28 @@ Writing hg marks ... Writing git marks ... no changes found +progress revision walk 'branches/default' (0/0) +progress revision 0 'default' (0/1) total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Nov 24 04:43 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Nov 24 04:43 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs -total 20 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone --rw-r--r-- 1 pbuilder1 pbuilder1 0 Nov 24 04:43 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 71 Nov 24 04:43 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 21 22:29 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 21 22:29 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs +total 24 +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 21 22:29 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 21 22:29 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs ok 50 - shared-marks set to unset expecting success: @@ -7460,7 +7498,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 6747e8ae33c4 +new changesets 37374f004ea3 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. @@ -7472,70 +7510,70 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Nov 24 04:43 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Nov 24 04:43 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 21 22:29 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 21 22:29 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Nov 24 04:43 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Nov 24 04:43 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 21 22:29 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 21 22:29 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Nov 24 04:43 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Nov 24 04:43 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 21 22:29 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 21 22:29 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Nov 24 04:43 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Nov 24 04:43 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 21 22:29 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 21 22:29 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs /build/reproducible-path/git-remote-hg-1.0.5~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: using marks of remote origin as shared marks no changes found total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Nov 24 04:43 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Nov 24 04:43 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 21 22:29 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 21 22:29 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Nov 24 04:43 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Nov 24 04:43 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Nov 24 04:43 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 21 22:29 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 21 22:29 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 21 22:29 refs ok 51 - shared-marks unset to set expecting success: @@ -7584,7 +7622,7 @@ To hg::../hgrepo * [new branch] master -> master 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -Access: (0777/-rwxrwxrwx) Uid: ( 1111/pbuilder1) Gid: ( 1111/pbuilder1) +Access: (0777/-rwxrwxrwx) Uid: ( 2222/pbuilder2) Gid: ( 2222/pbuilder2) ok 52 - push with renamed executable preserves executable bit expecting success: @@ -7655,7 +7693,7 @@ debian/rules override_dh_auto_install make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.5~ds' dh_auto_install -- prefix=/usr install-doc - make -j42 install DESTDIR=/build/reproducible-path/git-remote-hg-1.0.5\~ds/debian/git-remote-hg AM_UPDATE_INFO_DIR=no INSTALL="install --strip-program=true" prefix=/usr install-doc + make -j40 install DESTDIR=/build/reproducible-path/git-remote-hg-1.0.5\~ds/debian/git-remote-hg AM_UPDATE_INFO_DIR=no INSTALL="install --strip-program=true" prefix=/usr install-doc make[2]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.5~ds' if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ : Use chosen Python version ; \ @@ -7695,8 +7733,8 @@ make[1]: Leaving directory '/build/reproducible-path/git-remote-hg-1.0.5~ds' dh_installman dh_python3 -I: dh_python3 tools:114: replacing shebang in debian/git-remote-hg/usr/bin/git-remote-hg I: dh_python3 tools:114: replacing shebang in debian/git-remote-hg/usr/bin/git-hg-helper +I: dh_python3 tools:114: replacing shebang in debian/git-remote-hg/usr/bin/git-remote-hg dh_perl dh_link dh_strip_nondeterminism @@ -7715,12 +7753,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: including full source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/139113/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/139113/tmp/hooks/B01_cleanup finished I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env -I: removing directory /srv/workspace/pbuilder/2474331 and its subdirectories -I: Current time: Mon Nov 23 16:43:57 -12 2026 -I: pbuilder-time-stamp: 1795495437 +I: removing directory /srv/workspace/pbuilder/139113 and its subdirectories +I: Current time: Wed Oct 22 12:29:34 +14 2025 +I: pbuilder-time-stamp: 1761085774