Diff of the two buildlogs: -- --- b1/build.log 2024-05-30 15:02:33.663619223 +0000 +++ b2/build.log 2024-05-30 15:14:00.810374460 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Wed Jul 2 09:22:29 -12 2025 -I: pbuilder-time-stamp: 1751491349 +I: Current time: Fri May 31 05:02:36 +14 2024 +I: pbuilder-time-stamp: 1717081356 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz] I: copying local configuration @@ -27,52 +27,84 @@ dpkg-source: info: applying 1001_testsuite_UTF-8.patch I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/3065802/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/2268542/tmp/hooks/D01_modify_environment starting +debug: Running on ionos11-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 May 30 15:02 /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/2268542/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/2268542/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='unstable' - 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]="2" [2]="21" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu") + BASH_VERSION='5.2.21(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=20 ' + DIRSTACK=() + DISTRIBUTION=unstable + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=x86_64 + HOST_ARCH=amd64 IFS=' ' - INVOCATION_ID='23de98e1d4204e1f8a575189675851b0' - 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='3065802' - PS1='# ' - PS2='> ' + INVOCATION_ID=c1e19590ae6a4af28632ad52d29c6ff4 + 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=2268542 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.Pz4mqtiv/pbuilderrc_3RBm --distribution unstable --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.Pz4mqtiv/b1 --logfile b1/build.log git-remote-hg_1.0.4~ds-1.dsc' - SUDO_GID='111' - 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.Pz4mqtiv/pbuilderrc_nhya --distribution unstable --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.Pz4mqtiv/b2 --logfile b2/build.log git-remote-hg_1.0.4~ds-1.dsc' + SUDO_GID=111 + SUDO_UID=106 + 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.7.12+bpo-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.7.12-1~bpo12+1 (2024-05-06) x86_64 GNU/Linux + Linux i-capture-the-hostname 6.1.0-21-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.90-1 (2024-05-03) x86_64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Jun 30 14:05 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/3065802/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 May 27 07:42 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/2268542/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -209,7 +241,7 @@ Get: 83 http://deb.debian.org/debian unstable/main amd64 mercurial-git all 1.0.3-1 [63.5 kB] Get: 84 http://deb.debian.org/debian unstable/main amd64 sharness all 1.0.0-1.1 [28.6 kB] Get: 85 http://deb.debian.org/debian unstable/main amd64 xmlto amd64 0.0.28-2.1 [33.6 kB] -Fetched 44.7 MB in 4s (10.4 MB/s) +Fetched 44.7 MB in 7s (6737 kB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package libpython3.11-minimal: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 ... 19716 files and directories currently installed.) @@ -500,8 +532,8 @@ Setting up tzdata (2024a-4) ... Current default time zone: 'Etc/UTC' -Local time is now: Wed Jul 2 21:22:54 UTC 2025. -Universal Time is now: Wed Jul 2 21:22:54 UTC 2025. +Local time is now: Thu May 30 15:04:55 UTC 2024. +Universal Time is now: Thu May 30 15:04:55 UTC 2024. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17029-2) ... @@ -584,7 +616,11 @@ Building tag database... -> Finished parsing the build-deps I: Building the package -I: Running cd /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds-1_source.changes +I: user script /srv/workspace/pbuilder/2268542/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for unstable +I: user script /srv/workspace/pbuilder/2268542/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds-1_source.changes dpkg-buildpackage: info: source package git-remote-hg dpkg-buildpackage: info: source version 1.0.4~ds-1 dpkg-buildpackage: info: source distribution unstable @@ -594,7 +630,7 @@ debian/rules clean dh clean dh_auto_clean - make -j42 clean + make -j20 clean make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' rm -f doc/git-remote-hg.1 rm -f -r bin/ @@ -606,7 +642,7 @@ dh_autoreconf dh_auto_configure dh_auto_build - make -j42 "INSTALL=install --strip-program=true" + make -j20 "INSTALL=install --strip-program=true" make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ : Use chosen Python version ; \ @@ -630,7 +666,7 @@ a2x -d manpage -f manpage doc/git-remote-hg.txt make[1]: Leaving directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' dh_auto_test - make -j42 test + make -j20 test make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' make -C test make[2]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds/test' @@ -716,11 +752,11 @@ Author: tést èncödîng 1 file changed, 1 insertion(+) create mode 100644 gamma -Cloning into 'gitrepo'... [master 3b0b48f] add déltà Author: tést èncödîng 1 file changed, 1 insertion(+) create mode 100644 delta +Cloning into 'gitrepo'... ok 1 - setup expecting success: @@ -728,6 +764,10 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 ok 1 - setup expecting success: @@ -736,44 +776,40 @@ check gitrepo HEAD zero Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 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 b9da6362b73b -no changes found -adding changesets +added 4 changesets with 4 changes to 4 files +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 manifests adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 111a6d5744c2 +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 -added 1 changesets with 1 changes to 1 files -new changesets f318a64c949d -new changesets f318a64c949d -progress revision walk 'bookmarks/master' (0/0) -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 0 'master' (0/1) -searching for changes +new changesets 17f2fd4624d2 adding changesets adding manifests adding file changes -added 4 changesets with 4 changes to 4 files +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +added 1 changesets with 1 changes to 1 files +new changesets 17f2fd4624d2 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 2 - cloning expecting success: @@ -830,8 +866,6 @@ /build/reproducible-path/git-remote-hg-1.0.4~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'... -Cloning into 'gitrepo'... adding changesets adding manifests adding file changes @@ -839,33 +873,31 @@ 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.4~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.4~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 2 changesets with 2 changes to 1 files +new changesets 17f2fd4624d2:ec9c70717a17 +adding changesets +adding manifests +adding file changes added 2 changesets with 2 changes to 1 files -new changesets f318a64c949d:e72628acf177 -new changesets f318a64c949d:e72628acf177 -progress revision walk 'bookmarks/master' (0/0) +new changesets 111a6d5744c2:054f6ee38164 +Cloning into 'gitrepo'... progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -progress revision 0 'master' (0/1) -progress revision 1 'next' (0/1) progress revision 1 'next' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~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) /build/reproducible-path/git-remote-hg-1.0.4~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] ok 3 - cloning with branches @@ -902,11 +934,15 @@ searching for changes no changes found +/build/reproducible-path/git-remote-hg-1.0.4~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 4 changesets with 4 changes to 4 files +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) 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.4~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. @@ -928,13 +964,6 @@ test_cmp expected actual -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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] ok 1 - encoding expecting success: @@ -968,8 +997,6 @@ test_cmp expected actual -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) @@ -992,24 +1019,36 @@ Author: A U Thor 1 file changed, 1 deletion(-) delete mode 100644 foo/bar +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 changesets adding file changes +adding remote bookmark feature-a +adding changesets adding manifests adding file changes -adding remote bookmark feature-a -adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets f318a64c949d:a3a49a4bf4c4 +adding remote bookmark feature-a +new changesets 17f2fd4624d2:d221c7cbec64 added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets f318a64c949d:a3a49a4bf4c4 +new changesets 111a6d5744c2:ccc9f73379af progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~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' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) +no changes found ok 4 - cloning with bookmarks expecting success: @@ -1031,6 +1070,13 @@ check_bookmark hgrepo devel devel +/build/reproducible-path/git-remote-hg-1.0.4~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 5 changesets with 3 changes to 3 files ok 4 - cloning with bookmarks expecting success: @@ -1052,33 +1098,33 @@ check_bookmark hgrepo devel devel -/build/reproducible-path/git-remote-hg-1.0.4~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 a0520f536b54 +new changesets 529cc1e2c5f6 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.4~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.4~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] -no changes found -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.4~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 devel +adding remote bookmark feature-a +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets 111a6d5744c2:ccc9f73379af +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'next' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~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] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways ok 3 - subcommand repo - with local proxy expecting success: @@ -1100,55 +1146,47 @@ adding file changes adding remote bookmark devel adding remote bookmark feature-a +/build/reproducible-path/git-remote-hg-1.0.4~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] added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets f318a64c949d:a3a49a4bf4c4 +new changesets 17f2fd4624d2:d221c7cbec64 +[devel d305793] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -adding remote bookmark devel -adding remote bookmark feature-a -progress revision 1 'next' (0/1) -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets f318a64c949d:a3a49a4bf4c4 +added 5 changesets with 3 changes to 3 files +new changesets 362b656574c3:54f595cbdf1f progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) -[devel a0815f3] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[devel a0815f3] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~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] +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/5) /build/reproducible-path/git-remote-hg-1.0.4~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 -/build/reproducible-path/git-remote-hg-1.0.4~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] +[devel 287e8c6] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +searching for changes adding changesets adding manifests adding file changes -added 5 changesets with 3 changes to 3 files -new changesets 362b656574c3:54f595cbdf1f -searching for changes +added 1 changesets with 1 changes to 1 files +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 changesets -adding manifests -adding file changes adding manifests adding file changes +/build/reproducible-path/git-remote-hg-1.0.4~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 -added 1 changesets with 1 changes to 1 files -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) -Cloning into 'gitrepo'... ok 5 - update bookmark expecting success: @@ -1166,30 +1204,11 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -ok 5 - update bookmark - -expecting success: - test_when_finished "rm -rf gitrepo*" && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git checkout --quiet -b feature-b && - echo feature-b > content && - git commit -a -m feature-b && - git push --quiet origin feature-b - ) && - - check_bookmark hgrepo feature-b feature-b - -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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 b29c93f21037 +new changesets ca8e7580baa1 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~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. @@ -1200,63 +1219,51 @@ WARNING: various enhanced features might fail in subtle ways searching for changes no changes found -/build/reproducible-path/git-remote-hg-1.0.4~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 changesets adding file changes -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files -adding remote bookmark devel -adding remote bookmark feature-a -added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets f318a64c949d:2f685ec87485 -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/3) -progress revision 1 'next' (0/1) adding changesets adding manifests adding file changes +added 5 changesets with 3 changes to 3 files adding remote bookmark devel adding remote bookmark feature-a added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets f318a64c949d:2f685ec87485 +new changesets 111a6d5744c2:7d5be5537207 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -[feature-b 76b91f4] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[feature-b 76b91f4] feature-b +/build/reproducible-path/git-remote-hg-1.0.4~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 5 - update bookmark + +expecting success: + test_when_finished "rm -rf gitrepo*" && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git checkout --quiet -b feature-b && + echo feature-b > content && + git commit -a -m feature-b && + git push --quiet origin feature-b + ) && + + check_bookmark hgrepo feature-b feature-b + +Cloning into 'gitrepo'... +[feature-b 78c0570] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 -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.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp ok 4 - subcommands hg-rev and git-rev expecting success: @@ -1296,38 +1303,27 @@ 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.4~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 +adding changesets +adding manifests +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 17f2fd4624d2:b6bfc90f4a98 +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/3) +progress revision 1 'next' (0/1) +[feature-b 4c927ad] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) ok 6 - new bookmark expecting success: @@ -1397,6 +1393,46 @@ Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 beta +/build/reproducible-path/git-remote-hg-1.0.4~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 +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.4~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 @@ -1408,26 +1444,24 @@ searching for changes searching for changes Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 2 files +new changesets 362b656574c3:7cd99375c843 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~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 4 changesets with 4 changes to 1 files -new changesets 0fd43bacfb50:161928b91830 adding manifests adding file changes -added 2 changesets with 2 changes to 2 files -new changesets 362b656574c3:7cd99375c843 +added 4 changesets with 4 changes to 1 files +new changesets ddd46edf1af6:2df7065cc08d progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) -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.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/d2d33259efa8-7cfb9f76-backup.hg /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -1437,6 +1471,8 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/64973f0d1af2-50408cda-backup.hg /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -1444,38 +1480,55 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 2775403372fb +new changesets 9e89ca9e1068 progress revision 4 'default' (0/1) -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - + f8e26cc...6d30cfb master -> origin/master (forced update) - + f8e26cc...6d30cfb branches/default -> origin/branches/default (forced update) -HEAD is now at 6d30cfb four -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 12 changesets with 12 changes to 1 files -new changesets b180ef85333f:6901f251482c -added 12 changesets with 12 changes to 1 files -new changesets b180ef85333f:6901f251482c -progress revision walk 'bookmarks/master' (11/11) -progress revision 0 'master' (0/12) -progress revision walk 'bookmarks/master' (11/11) -progress revision 0 'master' (0/12) + + fbe9fd3...4c5a5b4 master -> origin/master (forced update) + + fbe9fd3...4c5a5b4 branches/default -> origin/branches/default (forced update) +ok 3 - git tags + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + git init -q gitrepo && + cd gitrepo && + + echo alpha > alpha && + git add alpha && + git commit -q -m "add alpha" && + git checkout -q -b not-master + ) && + + ( + hg_clone gitrepo hgrepo && + + cd hgrepo && + hg -q co default && + hg mv alpha beta && + hg -q commit -m "rename alpha to beta" && + hg branch gamma | grep -v "permanent and global" && + hg -q commit -m "started branch gamma" + ) && + + hg_push hgrepo gitrepo && + hg_clone gitrepo hgrepo2 && + + : Back to the common revision && + (cd hgrepo && hg checkout default) && + + # 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 + +HEAD is now at 4c5a5b4 four /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp +Cloning into 'gitrepo'... Loading hg marks ... Loading git marks ... Performing garbage collection on git commits ... @@ -1485,6 +1538,56 @@ 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 ... +/build/reproducible-path/git-remote-hg-1.0.4~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] +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 + +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.4~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 12 changesets with 12 changes to 1 files +new changesets d85cf6e4d2fb:7f2c7b8f7b32 +progress revision walk 'bookmarks/master' (11/11) +progress revision 0 'master' (0/12) ok 7 - authors expecting success: @@ -1524,6 +1627,26 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 12 changesets with 12 changes to 1 files +new changesets 13849bd90878:eccc67985ff5 +progress revision walk 'bookmarks/master' (11/11) +progress revision 0 'master' (0/12) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 9fae8418bb8d +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 7 - authors expecting success: @@ -1563,172 +1686,75 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected -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 - -ok 3 - git tags - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - ( - git init -q gitrepo && - cd gitrepo && - - echo alpha > alpha && - git add alpha && - git commit -q -m "add alpha" && - git checkout -q -b not-master - ) && - - ( - hg_clone gitrepo hgrepo && - - cd hgrepo && - hg -q co default && - hg mv alpha beta && - hg -q commit -m "rename alpha to beta" && - hg branch gamma | grep -v "permanent and global" && - hg -q commit -m "started branch gamma" - ) && - - hg_push hgrepo gitrepo && - hg_clone gitrepo hgrepo2 && - - : Back to the common revision && - (cd hgrepo && hg checkout default) && - - # 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 - -/build/reproducible-path/git-remote-hg-1.0.4~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 -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +marked working directory as branch gamma Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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 401400cb9ac1 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~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 dca3bec0eb0c:e008fd5e4691 +new changesets ec3d9b1774be:acd1f7136497 +searching for changes adding changesets adding manifests adding file changes +adding remote bookmark not-master +added 2 changesets with 1 changes to 1 files progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -added 2 changesets with 2 changes to 1 files -new changesets dca3bec0eb0c:e008fd5e4691 -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.4~ds/test/trash directory.main/hgrepo/.hg/strip-backup/e008fd5e4691-045f7d71-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.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/e008fd5e4691-045f7d71-backup.hg +new changesets 5889597089fe:3320583a8de0 +1 local changesets published /build/reproducible-path/git-remote-hg-1.0.4~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 1 'default' (0/1) +progress revision 2 'gamma' (0/1) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets fb1cdbedd6b4 +new changesets 39aa6df75e0a progress revision 1 'default' (0/1) +Cloning into 'gitrepo'... From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - c2764f3..a6eb4ee master -> origin/master - c2764f3..a6eb4ee branches/default -> origin/branches/default -marked working directory as branch gamma -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~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. + 7b3620b..46b3cab master -> origin/master + 7b3620b..46b3cab branches/default -> origin/branches/default +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo/.hg/strip-backup/acd1f7136497-96f803a9-backup.hg +/build/reproducible-path/git-remote-hg-1.0.4~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 -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 not-master -/build/reproducible-path/git-remote-hg-1.0.4~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 2 changesets with 2 changes to 1 files +new changesets 2c45f4701466:cb884ecd727d +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~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 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.4~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 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 5f2e412828be:17d59c9cbe80 +added 2 changesets with 2 changes to 2 files searching for changes adding changesets adding manifests adding file changes -progress revision 2 'default' (0/2) -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 5f2e412828be:17d59c9cbe80 -progress revision 2 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - + 615b843...bab9ef8 master -> origin/master (forced update) - + 615b843...bab9ef8 branches/default -> origin/branches/default (forced update) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - + 615b843...bab9ef8 master -> origin/master (forced update) - + 615b843...bab9ef8 branches/default -> origin/branches/default (forced update) +added 1 changesets with 0 changes to 0 files +searching for changes +searching for changes +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/cb884ecd727d-34648d5c-backup.hg ok 6 - subcommand [some-repo] expecting success: @@ -1763,6 +1789,21 @@ check gitrepo/sub_hg_b HEAD zero_sub_hg_b && check gitrepo/sub_git HEAD zero_sub_git +/build/reproducible-path/git-remote-hg-1.0.4~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 72ec4a02028e:1ba991eeb92b +progress revision 2 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo + + a75d001...1e05f07 master -> origin/master (forced update) + + a75d001...1e05f07 branches/default -> origin/branches/default (forced update) +0 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 8 - strip expecting success: @@ -1789,6 +1830,18 @@ check_branch hgrepo default two +/build/reproducible-path/git-remote-hg-1.0.4~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 2 changesets with 2 changes to 1 files (+1 heads) +new changesets e1561b56dc2e:ca5cab69bb06 +progress revision 2 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + + 8becb6d...04b1689 master -> origin/master (forced update) + + 8becb6d...04b1689 branches/default -> origin/branches/default (forced update) ok 8 - strip expecting success: @@ -1815,25 +1868,6 @@ check_branch hgrepo default two -/build/reproducible-path/git-remote-hg-1.0.4~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 2 changesets with 2 changes to 2 files -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 0 changes to 0 files -searching for changes -searching for changes -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... ok 4 - hg branch expecting success: @@ -1867,74 +1901,67 @@ test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha +/build/reproducible-path/git-remote-hg-1.0.4~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 manifests 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.4~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 master -adding remote bookmark master added 2 changesets with 2 changes to 1 files -added 2 changesets with 2 changes to 1 files -new changesets 6276758c19e5:73a628e9e752 -new changesets 6276758c19e5:73a628e9e752 -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +new changesets 35bf3a2122f1:732d4c058dd4 progress revision walk 'bookmarks/default' (1/1) -progress revision walk 'bookmarks/default' (1/1) -progress revision 0 'default' (0/2) progress revision 0 'default' (0/2) +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +Cloning into 'gitrepo'... [master (root-commit) e9a16bb] zero_sub_git Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content_sub_git -[default b7b71b2] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[default b7b71b2] two +[default 8ac1321] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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] +0 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.4~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 -no changes found +/build/reproducible-path/git-remote-hg-1.0.4~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 -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -searching for changes searching for changes adding changesets -searching for 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.4~ds/test/trash directory.main/hgrepo + da2a466..8ac1321 default -> default 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.4~ds/test/trash directory.main/hgrepo - a95cf30..b7b71b2 default -> default -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..b7b71b2 default -> default +adding remote bookmark master +added 2 changesets with 2 changes to 1 files +new changesets 546409a88dd3:ee038450f374 +progress revision walk 'bookmarks/default' (1/1) +progress revision 0 'default' (0/2) +[default d485bde] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) Cloning into 'gitrepo'... ok 9 - remote push with master bookmark @@ -1959,6 +1986,53 @@ check_branch hgrepo default one +/build/reproducible-path/git-remote-hg-1.0.4~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 +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) +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ +[master (root-commit) 64caca5] one + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets bd4a36923be7:60592c1c0a9e +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + fffffff..d485bde default -> default +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~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::../hgrepo + * [new branch] master -> master ok 9 - remote push with master bookmark expecting success: @@ -1982,102 +2056,52 @@ check_branch hgrepo default one -/build/reproducible-path/git-remote-hg-1.0.4~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 e11c7fc64157:87aceed66f84 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ -[master (root-commit) 64caca5] one - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~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 /build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~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 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp Cloning into './sub_hg_a'... -/build/reproducible-path/git-remote-hg-1.0.4~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::../hgrepo - * [new branch] master -> master no changes found searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -To hg::../hgrepo +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 -/build/reproducible-path/git-remote-hg-1.0.4~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] + * [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. +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/gitrepo/.git/ +changeset: 0:6e2126489d3d +tag: tip +user: A U Thor +date: Mon Jan 01 00:00:00 2007 +0230 +summary: one + +[master (root-commit) 64caca5] one + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content /build/reproducible-path/git-remote-hg-1.0.4~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 -adding remote bookmark not-master -adding changesets -adding manifests -added 1 changesets with 1 changes to 1 files -new changesets 16869bbe54be -adding file changes -1 local changesets published added 1 changesets with 1 changes to 1 files -new changesets e9551e0ffb18 -progress revision 1 'default' (0/1) +new changesets 28ea8403861f progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -changeset: 0:6e2126489d3d -tag: tip -user: A U Thor -date: Mon Jan 01 00:00:00 2007 +0230 -summary: one - -changeset: 0:6e2126489d3d -tag: tip -user: A U Thor -date: Mon Jan 01 00:00:00 2007 +0230 -summary: one - -Cloning into './sub_hg_b'... -ok 10 - remote push from master branch - -expecting success: - test_when_finished "rm -rf gitrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) && - - git clone "hg::hgrepo" gitrepo && - check gitrepo HEAD zero - +/build/reproducible-path/git-remote-hg-1.0.4~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 10 - remote push from master branch expecting success: @@ -2094,80 +2118,21 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 adding changesets adding manifests adding file changes -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files +Cloning into './sub_hg_b'... added 1 changesets with 1 changes to 1 files -new changesets 902957ef1c7d -searching for changes -searching for changes -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -To hg::../hgrepo2 - * [new branch] branches/default -> branches/default +To hg::../hgrepo * [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. -Cloning into './sub_git'... -done. -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -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 - -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~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 -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 e6619ff25720 -added 1 changesets with 1 changes to 1 files -new changesets e6619ff25720 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +new changesets 3543f805b1c8 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) ok 5 - hg tags @@ -2209,6 +2174,12 @@ test_cmp expected actual +changeset: 0:6e2126489d3d +tag: tip +user: A U Thor +date: Mon Jan 01 00:00:00 2007 +0230 +summary: one + [master (root-commit) a663549] add alpha Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0000 @@ -2234,19 +2205,84 @@ Date: Mon Jan 1 00:00:00 2007 -0130 1 file changed, 1 insertion(+) create mode 100644 epsilon -ok 11 - remote cloning +Cloning into './sub_git'... +done. +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 + +ok 10 - remote push from master branch expecting success: test_when_finished "rm -rf gitrepo*" && ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) && + git clone "hg::hgrepo" gitrepo && - mv gitrepo gitrepo2 && - cd gitrepo2 && - git fetch - ) + check gitrepo HEAD zero +/build/reproducible-path/git-remote-hg-1.0.4~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 +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 5 changesets with 5 changes to 5 files Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 6ec63500905a +/build/reproducible-path/git-remote-hg-1.0.4~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] +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 60d727b7b26d +/build/reproducible-path/git-remote-hg-1.0.4~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) +adding changesets +adding manifests +adding file changes ok 11 - remote cloning expecting success: @@ -2260,41 +2296,56 @@ ) Cloning into 'gitrepo'... +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.4~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.4~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 11 - remote cloning + +expecting success: + test_when_finished "rm -rf gitrepo*" && + + ( + git clone "hg::hgrepo" gitrepo && + mv gitrepo gitrepo2 && + cd gitrepo2 && + git fetch + ) + adding changesets +Cloning into 'gitrepo'... adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e6619ff25720 +new changesets 6ec63500905a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 1 changesets with 1 changes to 1 files -new changesets e6619ff25720 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~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 +added 1 changesets with 1 changes to 1 files +new changesets 60d727b7b26d +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 12 - moving remote clone @@ -2317,6 +2368,10 @@ check_bookmark hgrepo devel devel +/build/reproducible-path/git-remote-hg-1.0.4~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'... +no changes found ok 12 - moving remote clone expecting success: @@ -2338,29 +2393,28 @@ check_bookmark hgrepo devel devel -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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 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.4~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] +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ 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.4~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 (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +ok 6 - test timezones + +# passed all 6 test(s) +1..6 +Cloning into 'gitrepo'... adding changesets adding manifests adding file changes adding remote bookmark devel added 1 changesets with 1 changes to 1 files -new changesets e6619ff25720 +new changesets 6ec63500905a +/build/reproducible-path/git-remote-hg-1.0.4~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] progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) adding changesets @@ -2368,42 +2422,43 @@ adding file changes adding remote bookmark devel added 1 changesets with 1 changes to 1 files -new changesets e6619ff25720 +new changesets 60d727b7b26d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel f552ca6] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[devel f552ca6] devel +[devel 1229b27] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~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 no changes found +[devel 4df3fb1] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) searching for changes adding changesets adding manifests adding file changes -searching for changes +added 1 changesets with 1 changes to 1 files +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 adding changesets -searching for changes adding manifests adding file changes +added 2 changesets with 3 changes to 3 files +new changesets a7c2e657b0dd:f760cbd2e23f +searching for changes adding changesets -added 5 changesets with 5 changes to 5 files adding manifests adding file changes added 1 changesets with 1 changes to 1 files -added 1 changesets with 1 changes to 1 files +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 13 - remote update bookmark expecting success: @@ -2421,6 +2476,20 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 devel +added 2 changesets with 2 changes to 1 files +new changesets 6ec63500905a:0bd1763f523a +/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp ok 13 - remote update bookmark expecting success: @@ -2438,61 +2507,50 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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'... +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 devel -added 2 changesets with 2 changes to 1 files -new changesets e6619ff25720:4972584aa15e adding changesets adding manifests +adding manifests +adding file changes adding file changes adding remote bookmark devel +added 2 changesets with 3 changes to 3 files +new changesets 982afcd373b8:38a20516240c +[feature-b fece93c] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) added 2 changesets with 2 changes to 1 files -new changesets e6619ff25720:4972584aa15e -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +new changesets 60d727b7b26d:ec18d72dc421 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -[feature-b 891ef03] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[feature-b 891ef03] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -ok 6 - test timezones - -# passed all 6 test(s) -1..6 -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~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 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) 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 1 changesets with 1 changes to 1 files +Cloning into './sub_hg_a/sub_hg_a_x'... +[feature-b 79a5280] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 ok 14 - remote new bookmark expecting success: @@ -2519,6 +2577,32 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +searching for changes +added 1 changesets with 1 changes to 1 files +new changesets a8d3865924d8 +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~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 devel +adding remote bookmark feature-b +added 3 changesets with 3 changes to 1 files +new changesets 6ec63500905a:d6987cfc1276 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +Cloning into './sub_hg_b'... ok 14 - remote new bookmark expecting success: @@ -2545,10 +2629,8 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -2556,44 +2638,24 @@ adding file changes adding remote bookmark devel adding remote bookmark feature-b -added 3 changesets with 3 changes to 1 files -new changesets e6619ff25720:d4dcf78ce114 adding changesets adding manifests adding file changes -adding remote bookmark devel -adding remote bookmark feature-b -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) +added 2 changesets with 3 changes to 3 files added 3 changesets with 3 changes to 1 files -new changesets e6619ff25720:d4dcf78ce114 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) -Cloning into 'gitrepo'... -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(leaving bookmark devel) +new changesets a75056322ded:43388d461409 +new changesets 60d727b7b26d:f14666259013 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark devel) -/build/reproducible-path/git-remote-hg-1.0.4~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 d36d5036984d:ab426f73020a progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -[master e409f71] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[master e409f71] diverged +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +[master 3582542] diverged Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into './sub_hg_a'... +Cloning into './sub_hg_b/sub_git'... +done. /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -2603,7 +2665,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets a9aad38c527f +new changesets 866d80122400 To hg::/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main/hgrepo' @@ -2612,24 +2674,15 @@ 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) -/build/reproducible-path/git-remote-hg-1.0.4~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 a9aad38c527f -To hg::/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/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) -/build/reproducible-path/git-remote-hg-1.0.4~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) +ok 8 - subcommand sub initial recursive update + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update + ok 15 - remote push diverged expecting success: @@ -2661,6 +2714,31 @@ check_bookmark hgrepo diverge "bump bookmark" +[master 6bf83e1] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 8552a2ac2fae +To hg::/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/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) +/build/reproducible-path/git-remote-hg-1.0.4~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 15 - remote push diverged expecting success: @@ -2695,77 +2773,24 @@ adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 0507fb8b7551:499c3ce5f6e8 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... -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.4~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 df4a1af03b74 -Cloning into 'gitrepo'... -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... -Cloning into './sub_hg_b'... -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -adding file changes -added 4 changesets with 4 changes to 1 files adding remote bookmark devel adding remote bookmark diverge adding remote bookmark feature-b -new changesets e6619ff25720:a9aad38c527f added 4 changesets with 4 changes to 1 files -new changesets e6619ff25720:a9aad38c527f -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/4) +new changesets 6ec63500905a:866d80122400 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) -/build/reproducible-path/git-remote-hg-1.0.4~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. +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head +[diverge d5e8e1a] diverge + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 48b2c7955b9c:58d0aead3ba7 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. -created new head -created new head -ok 8 - subcommand sub initial recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update - -[diverge e6e673c] diverge - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[diverge e6e673c] diverge - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -2776,7 +2801,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 436a266a42ce +new changesets 4cffb2b34f24 To hg::/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main/hgrepo' @@ -2784,42 +2809,16 @@ 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.4~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 diverge -added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 436a266a42ce -To hg::/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/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) +adding remote bookmark devel +adding remote bookmark diverge +adding remote bookmark feature-b ! [rejected] diverge -> diverge (non-fast-forward) +added 4 changesets with 4 changes to 1 files +new changesets 60d727b7b26d:8552a2ac2fae +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/4) ok 16 - remote update bookmark diverge -ok 16 - 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 - expecting success: test_when_finished "rm -rf gitrepo*" && @@ -2835,59 +2834,77 @@ check_bookmark hgrepo feature-c feature-c Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +created new head /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 +[diverge d992ad5] diverge + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes -adding changesets -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -adding manifests -added 5 changesets with 5 changes to 1 files (+1 heads) -adding file changes -new changesets e6619ff25720:436a266a42ce 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 e6619ff25720:436a266a42ce +new changesets 6ec63500905a:4cffb2b34f24 WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/4) -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 a94eba4] feature-c - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -[feature-c a94eba4] feature-c +[feature-c 7f2ac98] feature-c Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 +updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) +new changesets 46100248516f +To hg::/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/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.4~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) +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~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 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 17 - remote new bookmark multiple branch head checking known breakage: @@ -2927,6 +2944,32 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) +/build/reproducible-path/git-remote-hg-1.0.4~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 60d727b7b26d:46100248516f +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 3120c0f] feature-c + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~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) +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... ok 17 - remote new bookmark multiple branch head expecting success: @@ -2966,41 +3009,31 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~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 0c206ec0e7df -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 2 changesets with 3 changes to 3 files +new changesets 6c8ec8f8d359:a2d1a312706d +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 0c206ec0e7df +new changesets 8aac325cb504 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 8a4e6e9] copy +[master 9e831df] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master 902fb6a] moved - Author: A U Thor - 1 file changed, 0 insertions(+), 0 deletions(-) - rename content-copy => content-moved (100%) -[master 8a4e6e9] copy - Author: A U Thor - 1 file changed, 2 insertions(+) - create mode 100644 content-copy -[master 902fb6a] moved +[master ddee4f3] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) @@ -3008,31 +3041,37 @@ 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.4~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.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp no changes found -no changes found -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -searching for changes +Cloning into './sub_hg_a'... searching for changes -[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 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 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - dabb4f0..902fb6a master -> master -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..902fb6a master -> master -1 files updated, 0 files merged, 0 files removed, 0 files unresolved + 5cafc7d..ddee4f3 master -> master +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 +/build/reproducible-path/git-remote-hg-1.0.4~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 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +added 2 changesets with 3 changes to 3 files +new changesets a6b471071d23:dee783ad84e1 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets cf676b1542aa not ok 18 - push commits with copy and rename # TODO known breakage expecting success: @@ -3065,6 +3104,43 @@ echo "ø~?" > expected && test_cmp expected actual +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_hg_a/sub_hg_a_x'... +warning: filename contains '?', which is reserved on Windows: 'ø~?' +[master 69804f9] copy + Author: A U Thor + 1 file changed, 2 insertions(+) + create mode 100644 content-copy +[master 69170c7] 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.4~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.4~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 +no changes found +added 1 changesets with 1 changes to 1 files +new changesets c38cdc7e91e0 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +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.4~ds/test/trash directory.main-push/hgrepo + fffffff..69170c7 master -> master +Cloning into './sub_hg_b'... +warning: filename contains '?', which is reserved on Windows: 'ø~?' +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~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'... ok 18 - push commits with copy and rename expecting success: @@ -3097,72 +3173,25 @@ echo "ø~?" > expected && test_cmp expected actual -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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 a7e6aa3a7cd6:f09455507d8f +new changesets f71db2e1f8e9:65d2a95b5641 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -warning: filename contains '?', which is reserved on Windows: 'ø~?' -warning: filename contains '?', which is reserved on Windows: 'ø~?' -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Cloning into './sub_hg_a'... -/build/reproducible-path/git-remote-hg-1.0.4~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 c64256f434b2:fc99083b9f03 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_a/sub_hg_a_x'... -warning: filename contains '?', which is reserved on Windows: 'ø~?' -warning: filename contains '?', which is reserved on Windows: 'ø~?' -/build/reproducible-path/git-remote-hg-1.0.4~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 9e80c50e9848 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -Cloning into './sub_hg_b'... 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.4~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 3 changesets with 4 changes to 2 files -new changesets 2cac27cc2a70:2c6bb93011dd -added 3 changesets with 4 changes to 2 files -new changesets 2cac27cc2a70:2c6bb93011dd -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) +new changesets 5b57ffb70f95:3d0c8cc4f2be progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 6cfbff42719c:0b8c2dc5afec -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +warning: filename contains '?', which is reserved on Windows: 'ø~?' +Cloning into './sub_hg_b/sub_git'... +done. ok 19 - fetch special filenames expecting success: @@ -3201,6 +3230,55 @@ printf "content\næ rø\n" > expected && test_cmp expected actual +Cloning into 'gitrepo'... +warning: filename contains '?', which is reserved on Windows: 'ø~?' +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 +added 1 changesets with 1 changes to 1 files +new changesets d1143cd7b4ef +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +adding changesets +adding manifests +adding file changes +added 3 changesets with 4 changes to 2 files +new changesets 3e4430c355cc:22ffe3f3173e +/build/reproducible-path/git-remote-hg-1.0.4~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 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +added 1 changesets with 1 changes to 1 files +new changesets 49a4a5d7e4d5 +progress revision 2 'default' (0/1) +[master 615dec9] utf-8 + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 "\303\246 r\303\270" +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 +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 46ae074..0fc20c4 master -> origin/master + 46ae074..0fc20c4 branches/default -> origin/branches/default +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + dc95ba0..615dec9 master -> master +Updating 46ae074..0fc20c4 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ok 19 - fetch special filenames expecting success: @@ -3239,76 +3317,11 @@ printf "content\næ rø\n" > expected && test_cmp expected actual -Cloning into './sub_hg_b/sub_git'... -done. -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 -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets c79e0d3fbdf1 -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 c79e0d3fbdf1 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master 503cbbb] utf-8 - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 "\303\246 r\303\270" -[master 503cbbb] utf-8 - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 "\303\246 r\303\270" -/build/reproducible-path/git-remote-hg-1.0.4~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 165f7519fcd9 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - e7706d1..27d8d1c master -> origin/master - e7706d1..27d8d1c branches/default -> origin/branches/default -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -Updating e7706d1..27d8d1c -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -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.4~ds/test/trash directory.main/tmp/hgrepo - 03509df..503cbbb master -> master -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.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..503cbbb master -> master +1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -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.4~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 20 - push special filenames expecting success: @@ -3354,12 +3367,68 @@ check_bookmark hgrepo new_bmark fi +/build/reproducible-path/git-remote-hg-1.0.4~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 04dbe37b4f5e +new changesets 7d80ff531d37 +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + c8c2bc8..7a74889 branches/default -> origin/branches/default + c8c2bc8..7a74889 master -> origin/master +Cloning into 'gitrepo'... +HEAD is now at c8c2bc8 substate_hg_a +/build/reproducible-path/git-remote-hg-1.0.4~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 +adding changesets +added 1 changesets with 1 changes to 1 files +new changesets c2e2f776d705 +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 35c258dc36f3 +progress revision 1 'default' (0/1) +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + 0fb7ffd..0635b22 branches/default -> origin/branches/default + 0fb7ffd..0635b22 master -> origin/master +HEAD is now at 0fb7ffd zero_sub_hg_a_x +/build/reproducible-path/git-remote-hg-1.0.4~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] +[master 8183095] utf-8 + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 "\303\246 r\303\270" +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 +ok 9 - subcommand sub subsequent recursive update + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update --rebase + +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..8183095 master -> master +Cloning into 'gitrepo'... +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~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 20 - push special filenames expecting success: @@ -3405,40 +3474,6 @@ check_bookmark hgrepo new_bmark fi -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 8aa55ff..c3e0709 branches/default -> origin/branches/default - 8aa55ff..c3e0709 master -> origin/master -HEAD is now at 8aa55ff substate_hg_a -/build/reproducible-path/git-remote-hg-1.0.4~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 214bf99a393c -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 9235ec8..5c6e3bc branches/default -> origin/branches/default - 9235ec8..5c6e3bc master -> origin/master -HEAD is now at 9235ec8 zero_sub_hg_a_x -/build/reproducible-path/git-remote-hg-1.0.4~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 -ok 9 - subcommand sub subsequent recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --rebase - -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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 @@ -3446,10 +3481,19 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 16544686615a:7a48ea1041ae +new changesets b9dfad18142b:c9099ab1d5f1 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) +HEAD is now at c76d879 zero +HEAD is now at c76d879 zero +HEAD is now at 9e2f880 good branch +Cloning into 'gitrepo'... +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 @@ -3459,25 +3503,19 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 16544686615a:cf2441db0488 -HEAD is now at 5ba464d zero -HEAD is now at 5ba464d zero +new changesets c65f593af041:cb7170083d0c progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at abcd15d good branch -HEAD is now at 5ba464d zero -HEAD is now at 5ba464d zero -HEAD is now at fb19ed3 good branch /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main/tmp/hgrepo - abcd15d..381e5eb branches/good_branch -> branches/good_branch - 9508cb9..72ad361 good_bmark -> good_bmark - 9508cb9..51de02b master -> master + 9e2f880..fe5d15e branches/good_branch -> branches/good_branch + af67334..0104300 good_bmark -> good_bmark + af67334..c1d0238 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) @@ -3488,69 +3526,14 @@ 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. - 9508cb9..51de02b master -> master - 9508cb9..72ad361 good_bmark -> good_bmark - abcd15d..381e5eb branches/good_branch -> branches/good_branch + af67334..c1d0238 master -> master + af67334..0104300 good_bmark -> good_bmark + 9e2f880..fe5d15e 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.4~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 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.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..8b53aa3 branches/good_branch -> branches/good_branch - fffffff..72ad361 good_bmark -> good_bmark - fffffff..51de02b 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.4~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..51de02b master -> master - fffffff..72ad361 good_bmark -> good_bmark - fffffff..8b53aa3 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) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~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.4~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] @@ -3558,9 +3541,18 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets cbcc11b32d6c:915afb37787d +HEAD is now at b62689e zero +new changesets e311a510063d:56fa0d025db1 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +HEAD is now at b62689e zero +/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.4~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 21 - remote big push expecting success: @@ -3637,6 +3629,110 @@ fi ) +HEAD is now at 41d9965 good branch +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 43007e4a2ac8:a53d8cde19bd +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.4~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 0c0f1a26d14c +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.4~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 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.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..2b77095 branches/good_branch -> branches/good_branch + fffffff..5cfff0b good_bmark -> good_bmark + fffffff..3206ddc 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.4~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..3206ddc master -> master + fffffff..5cfff0b good_bmark -> good_bmark + fffffff..2b77095 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.4~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 d5ac14cd50fc:79b1db1556d0 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into './sub_hg_b/sub_git'... +done. +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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_bmark +adding remote bookmark good_bmark +/build/reproducible-path/git-remote-hg-1.0.4~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 f4e2ef60907f:9a6f252a6f7f +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 4ac05a898ed5 +progress revision 2 'default' (0/1) +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'bad_branch' (0/2) ok 21 - remote big push expecting success: @@ -3713,102 +3809,55 @@ fi ) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + effdd12..575a9a2 master -> origin/master + effdd12..575a9a2 branches/default -> origin/branches/default +Updating effdd12..575a9a2 +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -Cloning into './sub_hg_a'... -/build/reproducible-path/git-remote-hg-1.0.4~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 eddd5596645b:92678220e6bb -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.4~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 824d12b05961 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into './sub_hg_b'... +new changesets dcf037222561 +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a + 8fe577e..d0b9015 branches/default -> origin/branches/default + 8fe577e..d0b9015 master -> origin/master +HEAD is now at 8fe577e substate_hg_a + Successfully rebased and updated detached HEAD. /build/reproducible-path/git-remote-hg-1.0.4~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 863cea1e4f7d:aba50e5275db -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into './sub_hg_b/sub_git'... -done. -Cloning into 'gitrepo'... +added 1 changesets with 1 changes to 1 files +new changesets 9dc9d6df8d95 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x + 9ae7fcb..46ccbc9 branches/default -> origin/branches/default + 9ae7fcb..46ccbc9 master -> origin/master Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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_bmark -adding remote bookmark good_bmark -added 3 changesets with 3 changes to 1 files -new changesets dfaa08b5e730:ac40f43874ea -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.4~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 9ae7fcb zero_sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~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 8af24598775b -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - a8c7a2a..787c457 master -> origin/master - a8c7a2a..787c457 branches/default -> origin/branches/default + Successfully rebased and updated detached HEAD. 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 dfaa08b5e730:ac40f43874ea -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'bad_branch' (0/2) -Updating a8c7a2a..787c457 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp /build/reproducible-path/git-remote-hg-1.0.4~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 f61c219d7a8f -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - e3880bd..e6e5c86 branches/default -> origin/branches/default - e3880bd..e6e5c86 master -> origin/master /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -3819,10 +3868,10 @@ adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets f22d64e8411d +new changesets 8c4a6f6a3369 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 8c216c8..da7ea19 good_bmark -> good_bmark - 8c216c8..d2671ba master -> master + 8a33578..07bcb60 good_bmark -> good_bmark + 8a33578..3bc8d8e 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.4~ds/test/trash directory.main/tmp/hgrepo' @@ -3830,91 +3879,42 @@ 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. - 8c216c8..d2671ba master -> master -HEAD is now at e3880bd substate_hg_a - 8c216c8..da7ea19 good_bmark -> good_bmark + 8a33578..3bc8d8e master -> master + 8a33578..07bcb60 good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) - Successfully rebased and updated detached HEAD. +no changes found +added 3 changesets with 3 changes to 1 files +new changesets 06dd337ce69d:d38b23ab91d1 /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 3 'bad_branch' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~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 f22d64e8411d -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.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..da7ea19 good_bmark -> good_bmark - fffffff..d2671ba 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.4~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..d2671ba master -> master - fffffff..da7ea19 good_bmark -> good_bmark - ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) - ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'bad_branch' (0/2) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 6ae4ec9..1740ab2 branches/bad_branch -> origin/branches/bad_branch - 8c216c8..1740ab2 bad_bmark -> origin/bad_bmark - + da7ea19...8c216c8 good_bmark -> origin/good_bmark (forced update) - + d2671ba...8c216c8 master -> origin/master (forced update) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 0fdeff2a12d6 -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 1e06b29..ffbd8a4 branches/default -> origin/branches/default - 1e06b29..ffbd8a4 master -> origin/master -HEAD is now at 1e06b29 zero_sub_hg_a_x - Successfully rebased and updated detached HEAD. -/build/reproducible-path/git-remote-hg-1.0.4~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) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 6ae4ec9..1740ab2 branches/bad_branch -> origin/branches/bad_branch - 8c216c8..d2671ba branches/default -> origin/branches/default - 8c216c8..1740ab2 bad_bmark -> origin/bad_bmark -/build/reproducible-path/git-remote-hg-1.0.4~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] + 15c3660..11896a9 branches/bad_branch -> origin/branches/bad_branch + 8a33578..11896a9 bad_bmark -> origin/bad_bmark + + 07bcb60...8a33578 good_bmark -> origin/good_bmark (forced update) + + 3bc8d8e...8a33578 master -> origin/master (forced update) +ok 10 - subcommand sub subsequent recursive update -- rebase + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update --merge + /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main/tmp/hgrepo - 8c216c8..da7ea19 good_bmark -> good_bmark - 8c216c8..d2671ba master -> master + 8a33578..07bcb60 good_bmark -> good_bmark + 8a33578..3bc8d8e 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.4~ds/test/trash directory.main/tmp/hgrepo' @@ -3922,8 +3922,8 @@ 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. - 8c216c8..d2671ba master -> master - 8c216c8..da7ea19 good_bmark -> good_bmark + 8a33578..3bc8d8e master -> master + 8a33578..07bcb60 good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ok 22 - remote big push non fast forward @@ -3970,14 +3970,56 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six +/build/reproducible-path/git-remote-hg-1.0.4~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 3fe5719cada8 +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.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..1350d35 good_bmark -> good_bmark + fffffff..ad5608b 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.4~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..ad5608b master -> master + fffffff..1350d35 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.4~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 10 - subcommand sub subsequent recursive update -- rebase - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --merge - +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) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + e1b7b9d..4cd4a71 branches/bad_branch -> origin/branches/bad_branch + 92ee169..ad5608b branches/default -> origin/branches/default + 92ee169..4cd4a71 bad_bmark -> origin/bad_bmark +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 @@ -4035,7 +4077,6 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -4047,35 +4088,14 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 3fac470f4702:3e28bca0a4c8 +new changesets 5021ab741be4:714eff85f371 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) +HEAD is now at b923cf7 zero +HEAD is now at b923cf7 zero +HEAD is now at 9cd90b7 good branch Cloning into 'gitrepo'... -HEAD is now at fd0dc07 zero -HEAD is now at fd0dc07 zero -HEAD is now at 6beedd5 good branch -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets 3fac470f4702:0fb55aee10b1 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at fd0dc07 zero -HEAD is now at fd0dc07 zero -HEAD is now at 6c61545 good branch /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -4087,90 +4107,29 @@ adding file changes added 9 changesets with 9 changes to 1 files (+7 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 2a2ef66...9c136a5 branches/bad_branch -> branches/bad_branch (forced update) - 6beedd5..3be5079 branches/good_branch -> branches/good_branch - + 4cb6d8d...29874f9 bad_bmark1 -> bad_bmark1 (forced update) - + 4cb6d8d...82ec48d bad_bmark2 -> bad_bmark2 (forced update) - 4cb6d8d..8eddc7f good_bmark -> good_bmark - 4cb6d8d..cf7a462 master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - 4cb6d8d..cf7a462 master -> master - 4cb6d8d..8eddc7f good_bmark -> good_bmark - 6beedd5..3be5079 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + 4cb6d8d...29874f9 bad_bmark1 -> bad_bmark1 (forced update) - + 4cb6d8d...82ec48d bad_bmark2 -> bad_bmark2 (forced update) - + 2a2ef66...9c136a5 branches/bad_branch -> branches/bad_branch (forced update) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...f0f1ad8 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...94b5985 branches/good_branch -> branches/good_branch (forced update) - + fffffff...29874f9 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...82ec48d bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...efb5993 good_bmark -> good_bmark (forced update) - + fffffff...2b2a9c3 master -> master (forced update) + + c08af36...9237f75 branches/bad_branch -> branches/bad_branch (forced update) + 9cd90b7..6530062 branches/good_branch -> branches/good_branch + + aa3f068...ae1fae6 bad_bmark1 -> bad_bmark1 (forced update) + + aa3f068...7da39c0 bad_bmark2 -> bad_bmark2 (forced update) + aa3f068..c4dbe42 good_bmark -> good_bmark + aa3f068..dd89990 master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...2b2a9c3 master -> master (forced update) - + fffffff...efb5993 good_bmark -> good_bmark (forced update) - + fffffff...94b5985 branches/good_branch -> branches/good_branch (forced update) + aa3f068..dd89990 master -> master + aa3f068..c4dbe42 good_bmark -> good_bmark + 9cd90b7..6530062 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...29874f9 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...82ec48d bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...f0f1ad8 branches/bad_branch -> branches/bad_branch (forced update) -Cloning into 'gitrepo'... + + aa3f068...ae1fae6 bad_bmark1 -> bad_bmark1 (forced update) + + aa3f068...7da39c0 bad_bmark2 -> bad_bmark2 (forced update) + + c08af36...9237f75 branches/bad_branch -> branches/bad_branch (forced update) /build/reproducible-path/git-remote-hg-1.0.4~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 61fb1b68ff6d:890e13c31146 +new changesets 77ea90de9e79:16525214972b progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~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. @@ -4184,9 +4143,10 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets d160f4813a3d:caef205e3835 +new changesets a9f327615c7d:a35b42f1d954 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +Cloning into './sub_hg_a/sub_hg_a_x'... ok 23 - remote big push force expecting success: @@ -4226,80 +4186,73 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -Cloning into './sub_hg_a/sub_hg_a_x'... /build/reproducible-path/git-remote-hg-1.0.4~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 1 changesets with 1 changes to 1 files -new changesets 950cd2497728 +new changesets 15a889b02f90 +/build/reproducible-path/git-remote-hg-1.0.4~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] progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +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 bb76055be564:ba5086bfe092 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) Cloning into './sub_hg_b'... -ok 23 - remote big push force - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && - - setup_big_push - - ( - cd gitrepo && - - check_push 1 --dry-run --all <<-\EOF && - master - good_bmark - branches/good_branch - new_bmark:new - branches/new_branch:new - bad_bmark1:non-fast-forward - bad_bmark2:non-fast-forward - branches/bad_branch:non-fast-forward - EOF - - check_push 0 --dry-run master good_bmark new_bmark branches/good_branch branches/new_branch <<-\EOF - master - good_bmark - branches/good_branch - new_bmark:new - branches/new_branch:new - EOF - ) && - - 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.4~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 83687d9a06f3:ee6e5e393077 +new changesets f4913a88814f:03482c7b8bca progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +HEAD is now at 8474c74 zero Cloning into './sub_hg_b/sub_git'... +HEAD is now at 8474c74 zero done. +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 a3074c6 good branch +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 18daf2ecf5f4:48d019cafe8b /build/reproducible-path/git-remote-hg-1.0.4~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) +progress revision 2 'bad_branch' (0/2) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 3632354327a3 +new changesets 673fae8aff33 progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 167c6e8..1cc72c1 master -> origin/master - 167c6e8..1cc72c1 branches/default -> origin/branches/default -Updating 167c6e8..1cc72c1 + 1f88303..a2afd08 master -> origin/master + 1f88303..a2afd08 branches/default -> origin/branches/default +Updating 1f88303..a2afd08 Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -4307,7 +4260,7 @@ or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -Cloning into 'gitrepo'... +HEAD is now at e07726b zero /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -4315,76 +4268,104 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 3ec4c1d4b2f4 +new changesets 95acc91dcd52 +HEAD is now at e07726b zero progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - 1e0d298..12710d0 branches/default -> origin/branches/default - 1e0d298..12710d0 master -> origin/master -HEAD is now at 1e0d298 substate_hg_a -Updating 1e0d298..12710d0 + eeac1d9..48f3c63 branches/default -> origin/branches/default + eeac1d9..48f3c63 master -> origin/master +HEAD is now at eeac1d9 substate_hg_a +Updating eeac1d9..48f3c63 Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 +HEAD is now at 0fee673 good branch +searching for changes 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 38d8bd09ca34:c61d75cfb05e -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at c5b71a7 zero -HEAD is now at c5b71a7 zero -/build/reproducible-path/git-remote-hg-1.0.4~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. +added 1 changesets with 1 changes to 1 files +new changesets 094f98f6e4fc +progress revision 1 'default' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~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] -HEAD is now at 95c1990 good branch +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 -new changesets 18d313c9eba5 -Cloning into 'gitrepo'... -progress revision 1 'default' (0/1) +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.4~ds/test/trash directory.main-push/tmp/hgrepo + + fffffff...ce734fb branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...aec6997 branches/good_branch -> branches/good_branch (forced update) + + fffffff...049fc21 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...63e46a9 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...b7d4634 good_bmark -> good_bmark (forced update) + + fffffff...60627c8 master -> master (forced update) + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + + fffffff...60627c8 master -> master (forced update) + + fffffff...b7d4634 good_bmark -> good_bmark (forced update) + + fffffff...aec6997 branches/good_branch -> branches/good_branch (forced update) + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + fffffff...049fc21 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...63e46a9 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...ce734fb branches/bad_branch -> branches/bad_branch (forced update) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 8af5013..3ad75e6 branches/default -> origin/branches/default - 8af5013..3ad75e6 master -> origin/master -HEAD is now at 8af5013 zero_sub_hg_a_x -Updating 8af5013..3ad75e6 + 15e8e6e..8025ab8 branches/default -> origin/branches/default + 15e8e6e..8025ab8 master -> origin/master +HEAD is now at 15e8e6e zero_sub_hg_a_x +Updating 15e8e6e..8025ab8 Fast-forward content_sub_hg_a_x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~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 bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets 1bc0573bcfa3:37e6b3b3bcef -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~ds/test/trash directory.main/tmp/hgrepo - 95c1990..6f60199 branches/good_branch -> branches/good_branch - 8919255..cd716e8 good_bmark -> good_bmark - 8919255..5156bbd master -> master + 0fee673..25623d3 branches/good_branch -> branches/good_branch + fcbe685..fefcba5 good_bmark -> good_bmark + fcbe685..7afe845 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) @@ -4395,81 +4376,41 @@ 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. - 8919255..5156bbd master -> master - 8919255..cd716e8 good_bmark -> good_bmark - 95c1990..6f60199 branches/good_branch -> branches/good_branch + fcbe685..7afe845 master -> master + fcbe685..fefcba5 good_bmark -> good_bmark + 0fee673..25623d3 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.4~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 -HEAD is now at 2ec2f0d zero -HEAD is now at 2ec2f0d zero -HEAD is now at ed52084 good branch -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.4~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.4~ds/test/trash directory.main/tmp/hgrepo - 95c1990..6f60199 branches/good_branch -> branches/good_branch - 8919255..cd716e8 good_bmark -> good_bmark - 8919255..5156bbd master -> master + 0fee673..25623d3 branches/good_branch -> branches/good_branch + fcbe685..fefcba5 good_bmark -> good_bmark + fcbe685..7afe845 master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - 8919255..5156bbd master -> master - 8919255..cd716e8 good_bmark -> good_bmark - 95c1990..6f60199 branches/good_branch -> branches/good_branch + fcbe685..7afe845 master -> master + fcbe685..fefcba5 good_bmark -> good_bmark + 0fee673..25623d3 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.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..e7c3061 branches/good_branch -> branches/good_branch - fffffff..99b26a7 good_bmark -> good_bmark - fffffff..d75dff8 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.4~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..d75dff8 master -> master - fffffff..99b26a7 good_bmark -> good_bmark - fffffff..e7c3061 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.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..e7c3061 branches/good_branch -> branches/good_branch - fffffff..99b26a7 good_bmark -> good_bmark - fffffff..d75dff8 master -> master - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - fffffff..d75dff8 master -> master - fffffff..99b26a7 good_bmark -> good_bmark - fffffff..e7c3061 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch -ok 24 - remote big push dry-run +ok 11 - subcommand sub subsequent recursive update -- merge + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_foreach + +ok 23 - remote big push force expecting success: test_when_finished "rm -rf hgrepo gitrepo*" && @@ -4479,30 +4420,24 @@ ( 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_push 1 --dry-run --all <<-\EOF && + master + good_bmark + branches/good_branch + new_bmark:new + branches/new_branch:new + bad_bmark1:non-fast-forward + bad_bmark2:non-fast-forward + branches/bad_branch:non-fast-forward + EOF + + check_push 0 --dry-run master good_bmark new_bmark branches/good_branch branches/new_branch <<-\EOF + master + good_bmark + branches/good_branch + new_bmark:new + branches/new_branch:new + EOF ) && check_branch hgrepo default one && @@ -4565,34 +4500,41 @@ 1 file changed, 1 insertion(+) create mode 100644 content_sub_git Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 bad_bmark1 +adding remote bookmark bad_bmark2 +adding remote bookmark good_bmark +added 4 changesets with 4 changes to 1 files +new changesets 0a7018819203:1042c8a16221 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~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 ba0ed5fc5c62:7ec5e679efb9 +new changesets 8f930ea7d124:8629f287d39a progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... +HEAD is now at 206dad6 zero /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -Cloning into './sub_hg_a'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 2334cf7d4a18:24d83bbf1b1c -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +Cloning into './sub_hg_a'... +HEAD is now at 206dad6 zero adding changesets adding manifests adding file changes @@ -4600,101 +4542,113 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets ff607974db17:2167db8676ff +new changesets cd7e52720c5e:6a42209a291f +/build/reproducible-path/git-remote-hg-1.0.4~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) progress revision 2 'bad_branch' (0/2) +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +HEAD is now at c33ffa9 good branch +new changesets 0a153d6ea354:2a376118a380 +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 5a29443 zero -HEAD is now at 5a29443 zero -HEAD is now at 850dc8d good branch -Cloning into 'gitrepo'... +HEAD is now at 1823b41 zero /build/reproducible-path/git-remote-hg-1.0.4~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 1823b41 zero adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 13d6c4a95193 +new changesets 713c65aaf7da 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.4~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. +HEAD is now at 17c68e8 good branch +/build/reproducible-path/git-remote-hg-1.0.4~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 -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + aa7bd2a...133338d branches/bad_branch -> branches/bad_branch (forced update) - 850dc8d..c67655b branches/good_branch -> branches/good_branch - + 9888591...e1a3d17 bad_bmark1 -> bad_bmark1 (forced update) - + 9888591...0159d8b bad_bmark2 -> bad_bmark2 (forced update) - 9888591..a03bb9e good_bmark -> good_bmark - 9888591..6d9c3a1 master -> master +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..43caded branches/good_branch -> branches/good_branch + fffffff..6e35ea7 good_bmark -> good_bmark + fffffff..3a59383 master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - 9888591..6d9c3a1 master -> master - 9888591..a03bb9e good_bmark -> good_bmark -/build/reproducible-path/git-remote-hg-1.0.4~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] - 850dc8d..c67655b branches/good_branch -> branches/good_branch + ! [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.4~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..3a59383 master -> master + fffffff..6e35ea7 good_bmark -> good_bmark + fffffff..43caded branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + 9888591...e1a3d17 bad_bmark1 -> bad_bmark1 (forced update) - + 9888591...0159d8b bad_bmark2 -> bad_bmark2 (forced update) - + aa7bd2a...133338d branches/bad_branch -> branches/bad_branch (forced update) -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 bcf65e89bc08:047c33d8991f -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at b197810 zero + ! [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'... /build/reproducible-path/git-remote-hg-1.0.4~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 b197810 zero -HEAD is now at 8333bf0 good branch adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 036b798494bb:22c714a4c0ab +new changesets 23f0dfe9dd87:808660d9f0f7 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.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...617bf8d branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...f052ac2 branches/good_branch -> branches/good_branch (forced update) - + fffffff...9f2459b bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...b43af84 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...4820452 good_bmark -> good_bmark (forced update) - + fffffff...da1a111 master -> master (forced update) + fffffff..43caded branches/good_branch -> branches/good_branch + fffffff..6e35ea7 good_bmark -> good_bmark + fffffff..3a59383 master -> master + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + fffffff..3a59383 master -> master + fffffff..6e35ea7 good_bmark -> good_bmark + fffffff..43caded branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch +Cloning into './sub_hg_b/sub_git'... +done. +/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main/tmp/hgrepo + + 8f5fa74...45d2fb8 branches/bad_branch -> branches/bad_branch (forced update) + 17c68e8..6c188aa branches/good_branch -> branches/good_branch + + 625f363...44af04a bad_bmark1 -> bad_bmark1 (forced update) + + 625f363...065c78e bad_bmark2 -> bad_bmark2 (forced update) + 625f363..9aeaaf4 good_bmark -> good_bmark + 625f363..1f6094f master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...da1a111 master -> master (forced update) - + fffffff...4820452 good_bmark -> good_bmark (forced update) - + fffffff...f052ac2 branches/good_branch -> branches/good_branch (forced update) + 625f363..1f6094f master -> master + 625f363..9aeaaf4 good_bmark -> good_bmark + 17c68e8..6c188aa branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...9f2459b bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...b43af84 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...617bf8d branches/bad_branch -> branches/bad_branch (forced update) + + 625f363...44af04a bad_bmark1 -> bad_bmark1 (forced update) + + 625f363...065c78e bad_bmark2 -> bad_bmark2 (forced update) + + 8f5fa74...45d2fb8 branches/bad_branch -> branches/bad_branch (forced update) /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -hg 475f101cf45193b26b0e68092560b208dd0f8743 24d83bbf1b1c591275b8d99e4ff6426d3098afa0 sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo -hg c84c911c3eaac866fbc4a65edda1818485f80803 13d6c4a95193c132f76aabcc215b05191263b0de sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg d663e2a59c8aa297d4785290b527abe889dd06b5 22c714a4c0abd675ba814097a4698d67a744b84b sub_hg_b /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg c05900fb7014b69aab17d05c9f7a83eecb39cdb9 2a376118a380a41cd3e0fbd488c722a9e921f643 sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg 981a5cdb060c40b77a415c5f3943a78823f9cd2d 713c65aaf7dab3c07c9288c2494f0224f637b0eb sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg a7a24edb5abadd6f073facc116b4a1afbc3cfee7 808660d9f0f70ea1fa27396461ee19a5e86f3990 sub_hg_b /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo git e9a16bb7c08361f85ab0002e4094b4229fefb384 e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_b ok 12 - subcommand sub foreach @@ -4728,30 +4682,50 @@ test_cmp expected actual ) -ok 25 - remote big push force dry-run +ok 24 - remote big push 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 - ) && + setup_big_push ( - 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 - ) + + 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_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 ok 25 - remote big push force dry-run @@ -4779,84 +4753,91 @@ ) Cloning into 'gitrepo'... -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~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 cc57fbbb2e9f:e4665c917824 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~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] -added 2 changesets with 3 changes to 3 files -new changesets 5c98c4ebbc53:dba4107e6134 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' (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 6325b14c7028:2d3cbe6de49b +new changesets 330dd892eae6:8ba1e0e43e5b progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -HEAD is now at 317bb85 zero -[master 7ea0ca4] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp +Cloning into 'gitrepo'... Cloning into './sub_hg'... +HEAD is now at f947661 zero +[master e2c64c3] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~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.4~ds/test/trash directory.main/tmp/hgrepo' -Cloning into 'gitrepo'... -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.4~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.4~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 +no changes found added 1 changesets with 1 changes to 1 files -new changesets 7d2bca347a41 +new changesets 91db5eda311f progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 +To hg::/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main/tmp/hgrepo' adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 3e3c088b0581:d354f26b89a6 +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 2f72fb9b2ec9:2566d2c12fd2 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (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. + url = foobar +HEAD is now at 0534563 zero +HEAD is now at 0534563 zero +/build/reproducible-path/git-remote-hg-1.0.4~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 17618dc good branch no changes found To hg::/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main/tmp/hgrepo' - url = foobar -HEAD is now at 191f044 zero -[master 7e02f6d] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~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] 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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp ok 26 - remote double failed push expecting success: @@ -4888,16 +4869,6 @@ ! grep feature-a out ) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo' ok 13 - subcommand sub sync expecting success: @@ -4962,52 +4933,32 @@ check_branch hgclone/sub_hg default one_sub_hg && check hgclone/sub_git HEAD one_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. /build/reproducible-path/git-remote-hg-1.0.4~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.4~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.4~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 26 - remote double failed push - -expecting success: - test_when_finished "rm -rf gitrepo hgrepo" && - - ( - hg init hgrepo && - cd hgrepo && - 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 - ) && - - ( - cd gitrepo && - git fetch --prune origin - git branch -a > out && - ! grep feature-a out - ) - + + fffffff...105a524 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...ee2f949 branches/good_branch -> branches/good_branch (forced update) + + fffffff...2040a6e bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...e5cc293 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...e9d9e93 good_bmark -> good_bmark (forced update) + + fffffff...6f80571 master -> master (forced update) + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + + fffffff...6f80571 master -> master (forced update) + + fffffff...e9d9e93 good_bmark -> good_bmark (forced update) + + fffffff...ee2f949 branches/good_branch -> branches/good_branch (forced update) + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + fffffff...2040a6e bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...e5cc293 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...105a524 branches/bad_branch -> branches/bad_branch (forced update) Cloning into 'gitrepo'... +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 @@ -5017,14 +4968,9 @@ adding file changes adding remote bookmark feature-a added 2 changesets with 2 changes to 1 files -new changesets 4b18560c7118:cd1004272e65 +new changesets 87bbed1e0b7d:93269c628fba progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~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 Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~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] @@ -5034,10 +4980,10 @@ error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - [deleted] (none) -> origin/feature-a -ok 27 - fetch prune +ok 25 - 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 && @@ -5045,69 +4991,20 @@ echo zero > content && hg add content && hg commit -m zero && - hg up -r null && - echo another > ocontent && - hg add ocontent && + echo one > content && 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 && 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 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.4~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'... -adding changesets -adding manifests -adding file changes -adding remote bookmark feature-a -added 2 changesets with 2 changes to 1 files -new changesets 9b494e32f7bd:0860d87ef47e -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~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 19b5cc1260cb:b3f06f8c288a -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo - - [deleted] (none) -> origin/feature-a -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp ok 27 - fetch prune expecting success: @@ -5152,100 +5049,89 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected +/build/reproducible-path/git-remote-hg-1.0.4~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 7b3822331567:141a49265321 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp Cloning into './sub_hg'... 0 files updated, 0 files merged, 1 files removed, 0 files unresolved +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~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 +created new head adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 9dedc2fbe2e6 +new changesets 98efae95ab32 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into './sub_git'... -done. -[detached HEAD abd1a10] one_sub_hg - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -created new head -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ 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.4~ds/test/trash directory.helper/hgrepo/sub_hg - fffffff..abd1a10 HEAD -> master -0 files updated, 0 files merged, 1 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.4~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 1 files +new changesets 51562487ed54:10d8a19022ec adding changesets adding manifests adding file changes +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets 8130fd45a33b:f67fd30303c8 +new changesets 51562487ed54:f9ee86d33135 WARNING: Branch 'default' has more than one head, consider merging WARNING: Branch 'default' has more than one head, consider merging +Cloning into './sub_git'... 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.4~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.4~ds/test/trash directory.helper/hgrepo/sub_hg - af0c4a1..abd1a10 branches/default -> origin/branches/default +done. +HEAD is now at 987a4f5 zero +[master 3290a1d] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved -[detached HEAD cea1af1] one_sub_git +[detached HEAD c3d60bc] one_sub_hg Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -To /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git - * [new branch] HEAD -> new -created new head -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/gitrepo/ -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -Updating ./sub_hg to ad5511967b96ac6e64e98576ad76d46c2c308187 [git abd1a10] -Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] /build/reproducible-path/git-remote-hg-1.0.4~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] -diff --git a/.hgsubstate b/.hgsubstate -index e84d4b7..0752012 100644 ---- a/.hgsubstate -+++ b/.hgsubstate -@@ -1,2 +1,2 @@ --e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --9dedc2fbe2e6a66cc66399e4c8f71da11a295043 sub_hg -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+ad5511967b96ac6e64e98576ad76d46c2c308187 sub_hg - M .hgsubstate -[master e461617] update_sub - Author: A U Thor - 1 file changed, 2 insertions(+), 2 deletions(-) +no changes found +/build/reproducible-path/git-remote-hg-1.0.4~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] +To hg::/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo' +no changes found +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. +searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets d34b93e1a3f6:cc3245e30f7d -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 +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg + fffffff..c3d60bc HEAD -> master /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -5255,72 +5141,60 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 89078dd663c1 +new changesets b26bf561079e WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'branches/default' (2/2) progress revision 0 'default' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~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] From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 901ca55...838e28a branches/default -> origin/branches/default (forced update) - + 901ca55...838e28a master -> origin/master (forced update) + + baa2de0...f6e5472 branches/default -> origin/branches/default (forced update) + + baa2de0...f6e5472 master -> origin/master (forced update) +no changes found /build/reproducible-path/git-remote-hg-1.0.4~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] +To hg::/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo' no changes found -1 files updated, 0 files merged, 1 files removed, 0 files unresolved -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.4~ds/test/trash directory.helper/hgrepo - fffffff..e461617 master -> master -ok 28 - fetch multiple independent histories +1 local changesets published +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. +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg + 327f162..c3d60bc branches/default -> origin/branches/default +ok 26 - remote double failed push 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 && + echo feature-a > content && + hg commit -m feature-a + hg bookmark feature-a ) && - ( git clone "hg::hgrepo" gitrepo && - check gitrepo HEAD a && + check gitrepo origin/feature-a feature-a && + + ( + cd hgrepo && + hg bookmark -d feature-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 --prune origin + git branch -a > out && + ! grep feature-a out ) -Cloning into '/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/hgrepo/sub_git -cloning subrepo sub_hg from /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 42763e493de2 -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.4~ds/test/trash directory.main-push/tmp/hgrepo - + 9d901d1...c608d90 branches/default -> origin/branches/default (forced update) - + 9d901d1...c608d90 master -> origin/master (forced update) ok 28 - fetch multiple independent histories expecting success: @@ -5347,131 +5221,141 @@ git push origin bookmark ) +[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.4~ds/test/trash directory.helper/hgrepo/sub_git + * [new branch] HEAD -> new +/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +Updating ./sub_hg to 0e7cfbd3ab60451c49f637af89578e7fcba2c08b [git c3d60bc] +Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] +diff --git a/.hgsubstate b/.hgsubstate +index 26441ca..e817b60 100644 +--- a/.hgsubstate ++++ b/.hgsubstate +@@ -1,2 +1,2 @@ +-e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git +-98efae95ab32d78da567869663d8ec80ca787770 sub_hg ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git ++0e7cfbd3ab60451c49f637af89578e7fcba2c08b sub_hg + M .hgsubstate +[master 84717ca] update_sub + Author: A U Thor + 1 file changed, 2 insertions(+), 2 deletions(-) +/build/reproducible-path/git-remote-hg-1.0.4~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 +Cloning into 'gitrepo'... +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + fffffff..84717ca master -> master Cloning into 'gitrepo'... -ok 14 - subcommand sub addstate - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repo hg hgrepo && - ( - cd hgrepo && - setup_repo hg sub_hg_a && - setup_repo hg sub_hg_b && - setup_repo git sub_git && - echo "sub_hg_a = sub_hg_a" > .hgsub && - echo "sub_hg_b = sub_hg_b" >> .hgsub && - echo "sub_git = [git]sub_git" >> .hgsub && - hg add .hgsub && - hg commit -m substate - ) - - git clone hg::hgrepo gitrepo && - - ( - cd gitrepo && - git-hg-helper sub update --force sub_hg_a && - git-hg-helper sub update --force sub_git && - ( - # advance and add a tag to the git repo - cd sub_git && - echo one > content_sub_git && - git add content_sub_git && - git commit -m one_sub_git && - git tag feature-a - ) && - - git-hg-helper sub status --cached > output && - cat output && - grep "^ .*sub_hg_a (.*master.*)$" output && - grep "^-.*sub_hg_b$" output && - grep "^+.*sub_git (feature-a~1)$" output && - git-hg-helper sub status sub_git > output && - cat output && - grep "^+.*sub_git (feature-a)$" output > actual && - test_cmp output actual - ) - /build/reproducible-path/git-remote-hg-1.0.4~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 '/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgclone/sub_git'... adding changesets adding manifests adding file changes adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets da890f43552f +new changesets 0759201c6e97 +/build/reproducible-path/git-remote-hg-1.0.4~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] +done. WARNING: Ignoring invalid bookmark 'bookmark' +adding changesets +adding manifests +adding file changes +adding remote bookmark feature-a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +added 2 changesets with 2 changes to 1 files +new changesets c246f3d7be79:2de16d02e527 +Switched to a new branch 'new' +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (fetch) origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (push) -[bookmark f90dbc2] b +[bookmark b1c13e3] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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'... +updating to branch default +cloning subrepo sub_git from /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git +cloning subrepo sub_hg from /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg +3 files updated, 0 files merged, 0 files removed, 0 files unresolved +no changes found 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.4~ds/test/trash directory.main-push/tmp/hgrepo + - [deleted] (none) -> origin/feature-a 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.4~ds/test/trash directory.main/tmp/hgrepo - * [new branch] bookmark -> bookmark -ok 29 - clone remote with null bookmark, then push +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +ok 27 - fetch prune expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && + test_when_finished "rm -rf gitrepo hgrepo" && ( hg init hgrepo && cd hgrepo && - echo one > content && + echo zero > content && hg add content && - hg commit -m one && + 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 ) && - 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 + # 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 -/build/reproducible-path/git-remote-hg-1.0.4~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 bookmark -added 1 changesets with 1 changes to 1 files -new changesets da890f43552f -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.4~ds/test/trash directory.main-push/tmp/hgrepo (fetch) -origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (push) -[bookmark f90dbc2] b - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 b -/build/reproducible-path/git-remote-hg-1.0.4~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: 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.4~ds/test/trash directory.main-push/tmp/hgrepo +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new branch] bookmark -> bookmark ok 29 - clone remote with null bookmark, then push @@ -5493,23 +5377,81 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual +ok 14 - subcommand sub addstate + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repo hg hgrepo && + ( + cd hgrepo && + setup_repo hg sub_hg_a && + setup_repo hg sub_hg_b && + setup_repo git sub_git && + echo "sub_hg_a = sub_hg_a" > .hgsub && + echo "sub_hg_b = sub_hg_b" >> .hgsub && + echo "sub_git = [git]sub_git" >> .hgsub && + hg add .hgsub && + hg commit -m substate + ) + + git clone hg::hgrepo gitrepo && + + ( + cd gitrepo && + git-hg-helper sub update --force sub_hg_a && + git-hg-helper sub update --force sub_git && + ( + # advance and add a tag to the git repo + cd sub_git && + echo one > content_sub_git && + git add content_sub_git && + git commit -m one_sub_git && + git tag feature-a + ) && + + git-hg-helper sub status --cached > output && + cat output && + grep "^ .*sub_hg_a (.*master.*)$" output && + grep "^-.*sub_hg_b$" output && + grep "^+.*sub_git (feature-a~1)$" output && + git-hg-helper sub status sub_git > output && + cat output && + grep "^+.*sub_git (feature-a)$" output > actual && + test_cmp output actual + ) + +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/gitrepo/ Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~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 +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files (+1 heads) +new changesets 0d98a68a15d8:37fa980abbb2 +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) adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 3f7df71ccbea:433aaa3ab728 +new changesets 5beaa4fc40a8:34304ee06ff9 +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 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +1 files updated, 0 files merged, 1 files removed, 0 files unresolved ok 30 - notes checking known breakage: @@ -5536,88 +5478,71 @@ 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.4~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 2 changesets with 2 changes to 1 files -new changesets b9a1673ad205:445522128f9c -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~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 44e68ae4906c:30d0772e0e3f -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +added 1 changesets with 1 changes to 1 files +new changesets 6d36c67c8346 +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.4~ds/test/trash directory.main-push/tmp/hgrepo + + 07efd4b...a5ddf28 branches/default -> origin/branches/default (forced update) + + 07efd4b...a5ddf28 master -> origin/master (forced update) Cloning into 'gitrepo'... -ok 30 - notes +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 28 - 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 a > a && + hg add a && + hg commit -m a && + hg bookmark -r null bookmark ) && - git clone "hg::hgrepo" gitrepo && - ( + git clone "hg::hgrepo" gitrepo && + check gitrepo HEAD a && cd gitrepo && - echo two > content && - git commit -a -m two && - git push - ) && - - 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 + git checkout --quiet -b bookmark && + git remote -v && + echo b > b && + git add b && + git commit -m b && + git push origin bookmark + ) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 f084acbf5b5a +new changesets b8c20370db4d progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 559dd3c] two +[master 7405553] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~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 a1442089c0f9 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~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'... no changes found searching for changes adding changesets @@ -5625,33 +5550,22 @@ adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - aa1b5f2..559dd3c master -> master -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses - import imp -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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. + 15f3dce..7405553 master -> master +/build/reproducible-path/git-remote-hg-1.0.4~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 './sub_git'... -done. adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 92b4d6f4df29 -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) ---- expected 2025-07-02 21:24:34.690450367 +0000 -+++ actual 2025-07-02 21:24:34.730450367 +0000 +added 2 changesets with 3 changes to 3 files +new changesets c79d00b563e7:c11fdb21b538 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +--- expected 2024-05-30 15:11:25.861091655 +0000 ++++ actual 2024-05-30 15:11:25.997086818 +0000 @@ -1,4 +1,3 @@ --af6d5f3fb2f3f29640a08b528e259650bbb6fb13 +-184b991791884a6cc165015a9b3ed4c729199a73 - f084acbf5b5a33a46ed27ecb5309225196c9cffd + b8c20370db4db7b6b2f922d2ca759a6d105f71f8 not ok 31 - push updates notes # TODO known breakage @@ -5679,35 +5593,72 @@ check_bookmark hgrepo feature-a two -[master c0a3439] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp +/build/reproducible-path/git-remote-hg-1.0.4~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'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~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 +/build/reproducible-path/git-remote-hg-1.0.4~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 - f3397bb11a22d43c7a08ab089bc9d288c4c3777a ./sub_hg_a (heads/master) --db12f3997be0fa98efa67702c0d547bf2e37f512[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) - f3397bb11a22d43c7a08ab089bc9d288c4c3777a ./sub_hg_a (heads/master) --db12f3997be0fa98efa67702c0d547bf2e37f512[hg] ./sub_hg_b +adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..c0a3439 master -> master +adding changesets +new changesets 6e46c028be31 +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets bc4b9b018599 +WARNING: Ignoring invalid bookmark 'bookmark' +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) +origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (fetch) +origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (push) +[bookmark 5e45120] b + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 b Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 206e313d0440 /build/reproducible-path/git-remote-hg-1.0.4~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 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +WARNING: Ignoring invalid bookmark 'bookmark' /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -ok 31 - push updates notes +/build/reproducible-path/git-remote-hg-1.0.4~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'... +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +done. +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new branch] bookmark -> bookmark +ok 29 - clone remote with null bookmark, then push expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -5717,77 +5668,65 @@ 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 origin master && - git branch feature-a && - git push origin feature-a + hg commit -m two ) && - check_bookmark hgrepo feature-a two - -/build/reproducible-path/git-remote-hg-1.0.4~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 + 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 -# passed all 15 test(s) -1..15 -/build/reproducible-path/git-remote-hg-1.0.4~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 170f179df5c2 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master da29510] two +[master 75f7010] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[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.4~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'... no changes found +/build/reproducible-path/git-remote-hg-1.0.4~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 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp 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.4~ds/test/trash directory.main/tmp/hgrepo - de17909..da29510 master -> master -/build/reproducible-path/git-remote-hg-1.0.4~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 afe987b2a9e3 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) + da00c9e..75f7010 master -> master + f19d87642b5ae5870392460ee3e259641fe8b7f6 ./sub_hg_a (heads/master) +-b7d7f3827b8d8a646c8e0626a748b91502199841[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) + f19d87642b5ae5870392460ee3e259641fe8b7f6 ./sub_hg_a (heads/master) +-b7d7f3827b8d8a646c8e0626a748b91502199841[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) /build/reproducible-path/git-remote-hg-1.0.4~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 -[master 6b8217a] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.helper/bin/git-hg-helper:101: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses + import imp +/build/reproducible-path/git-remote-hg-1.0.4~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 1 local changesets published searching for changes To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new branch] feature-a -> feature-a ++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.4~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 32 - push bookmark without changesets @@ -5812,23 +5751,14 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual -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.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..6b8217a master -> master -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new branch] feature-a -> feature-a -Cloning into 'gitrepo'... -ok 32 - push bookmark without changesets +added 2 changesets with 2 changes to 1 files +new changesets b42c041782f5:cad6d3bac5ca +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +ok 30 - notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -5843,13 +5773,18 @@ 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 + ) && - echo "v1.0" > expected && - git --git-dir=gitrepo/.git tag > actual && + 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'... /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -5858,10 +5793,22 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets a31ba1e6d419 +new changesets f671fa665183 +Cloning into 'gitrepo'... progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 f671fa665183 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master c52ce69] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -5873,20 +5820,21 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 1e5b1e3f304a +new changesets b8d7719cbbcf +no changes found progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 9d4e9ff..95ad7c0 master -> origin/master - 9d4e9ff..95ad7c0 branches/default -> origin/branches/default - * [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 -new changesets 1ef3de9aaedd -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Updating 9d4e9ff..95ad7c0 +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..c52ce69 master -> master +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 244c5ad..6fa8c65 master -> origin/master + 244c5ad..6fa8c65 branches/default -> origin/branches/default + * [new tag] v1.0 -> v1.0 +Updating 244c5ad..6fa8c65 Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -5926,25 +5874,7 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~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 28bc59d7b8d5 -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 8f13d6c..15b5f52 master -> origin/master - 8f13d6c..15b5f52 branches/default -> origin/branches/default - * [new tag] v1.0 -> v1.0 -Updating 8f13d6c..15b5f52 -Fast-forward - .hgtags | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 .hgtags -ok 33 - pull tags +ok 31 - push updates notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -5954,59 +5884,76 @@ 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 + echo two > content && + git commit -a -m two && + git push origin master && + git branch feature-a && + git push origin feature-a ) && - cat > expected <<-EOF && - Merge - three - two - one - EOF - hg -R hgrepo log --template "{desc}\n" > actual && - test_cmp expected actual + check_bookmark hgrepo feature-a two +Cloning into 'gitrepo'... marked working directory as branch feature (branches are permanent and global, did you want a bookmark?) +/build/reproducible-path/git-remote-hg-1.0.4~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 c55604eb40f1 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) Cloning into 'gitrepo'... +[master b9df567] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 +no changes found added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 4ba84bccb155:9c9c888826c2 +new changesets c55604eb40f1:3771863d7d20 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) +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.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..b9df567 master -> master Auto-merging content Merge made by the 'ort' strategy. content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~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.4~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'... +no changes found +1 local changesets published +searching for changes +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new branch] feature-a -> feature-a no changes found searching for changes adding changesets @@ -6014,13 +5961,8 @@ adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - ad9d397..5e22c18 master -> master -/build/reproducible-path/git-remote-hg-1.0.4~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 -ok 34 - push merged named branch + 665adfc..601097e master -> master +ok 32 - push bookmark without changesets expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6033,37 +5975,15 @@ hg commit -m one ) && - ( git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git tag v1.0 && - git push --tags - ) && - echo "C O Mitter " > expected && - hg -R hgrepo log --template "{author}\n" -r tip > 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 -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 8159c21a4b2b:1d50b6dad024 -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.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..f610535 master -> master -Cloning into 'gitrepo'... ok 34 - push merged named branch expecting success: @@ -6088,22 +6008,32 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual +Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 +adding changesets added 1 changesets with 1 changes to 1 files -new changesets 2fe098ff6457 +new changesets 0b9dbdc89dcf +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 0b9dbdc89dcf +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.4~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'... no changes found searching for changes adding changesets @@ -6114,11 +6044,17 @@ * [new tag] v1.0 -> v1.0 /build/reproducible-path/git-remote-hg-1.0.4~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 5d6fba0f54b7 +new changesets 54b5fb98d7a0 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + 11244bd..faa1a4a master -> origin/master + 11244bd..faa1a4a branches/default -> origin/branches/default + * [new tag] v1.0 -> v1.0 ok 35 - light tag sets author expecting success: @@ -6148,19 +6084,12 @@ hg -R hgrepo log --template="{branch}\n" -r tip > actual && test_cmp expected actual -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -ok 35 - light tag sets author +Updating 11244bd..faa1a4a +Fast-forward + .hgtags | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 .hgtags +ok 33 - pull tags expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6173,48 +6102,69 @@ hg commit -m one && hg branch feature && echo two > content && - hg commit -m two + hg commit -m two && + hg update default && + echo three > content && + hg commit -m three ) && ( git clone "hg::hgrepo" gitrepo && cd gitrepo && - git branch && - git checkout branches/feature && - git tag v1.0 && - git push --tags + git merge -m Merge -Xtheirs origin/branches/feature && + git push ) && - echo feature > expected && - hg -R hgrepo log --template="{branch}\n" -r tip > actual && + cat > expected <<-EOF && + Merge + three + two + one + EOF + hg -R hgrepo log --template "{desc}\n" > 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'... /build/reproducible-path/git-remote-hg-1.0.4~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 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets b07f39d75194:b28a5172fae7 +new changesets ac803a2a457c:670f8fb6db50 +Cloning into 'gitrepo'... progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'feature' (0/1) * master Switched to a new branch 'branches/feature' branch 'branches/feature' set up to track 'origin/branches/feature'. -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) +/build/reproducible-path/git-remote-hg-1.0.4~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 ac803a2a457c:d3b7ddd0a7b7 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'feature' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~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'... +Auto-merging content +Merge made by the 'ort' strategy. no changes found + content | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) searching for changes adding changesets adding manifests @@ -6224,14 +6174,11 @@ * [new tag] v1.0 -> v1.0 /build/reproducible-path/git-remote-hg-1.0.4~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 1 files -new changesets b07f39d75194:5e28798c6851 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'feature' (0/1) ok 36 - push tag different branch expecting success: @@ -6252,20 +6199,10 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo -* master -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.4~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 +added 1 changesets with 1 changes to 1 files (-1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -ok 36 - push tag different branch + fffffff..f53758f master -> master +ok 34 - push merged named branch expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6273,28 +6210,52 @@ ( 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 ) && + ( git clone "hg::hgrepo" gitrepo && - check_files gitrepo + cd gitrepo && + git tag v1.0 && + git push --tags + ) && + + echo "C O Mitter " > expected && + hg -R hgrepo log --template "{author}\n" -r tip > actual && + test_cmp expected actual Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 1 changesets with 1 changes to 1 files +new changesets f1382c53c8fb +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~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.4~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 +no changes found adding file changes added 2 changesets with 1 changes to 1 files -new changesets 601e53213c04:5cc2f52a1d8b +new changesets c515b27d0516:56426f909ecb +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.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new tag] v1.0 -> v1.0 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 37 - cloning a removed file works @@ -6320,17 +6281,7 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file/test_file" -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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 c611cf4284da:468538629bf7 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 37 - cloning a removed file works +ok 35 - light tag sets author expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6338,31 +6289,53 @@ ( hg init hgrepo && cd hgrepo && - - echo test > dir_or_file && - hg add dir_or_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 + 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 "dir_or_file/test_file" + 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 +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.4~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'... +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets e652003329f5:4fc5855e6cf1 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'feature' (0/1) +* master /build/reproducible-path/git-remote-hg-1.0.4~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 +Switched to a new branch 'branches/feature' +branch 'branches/feature' set up to track 'origin/branches/feature'. adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 9babb5af520e:eae044c18099 +new changesets 4297e9849cfc:42e31f7ac3a3 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a file replaced with a directory @@ -6390,17 +6363,17 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file" -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~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 -new changesets 9babb5af520e:030a35bdda4d -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 38 - cloning a file replaced with a directory +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new tag] v1.0 -> v1.0 +ok 36 - push tag different branch expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6409,23 +6382,19 @@ 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 && + echo test > test_file && + hg add test_file && hg commit -m add && - hg rm dir_or_file + hg rm test_file && + hg commit -m remove ) && git clone "hg::hgrepo" gitrepo && - check_files gitrepo "dir_or_file" + check_files gitrepo Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -6434,7 +6403,16 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 4084e81d8989:3aeac5f7070c +new changesets 0be86505de7b:af527bc86ad0 +/build/reproducible-path/git-remote-hg-1.0.4~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] +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +adding changesets +adding manifests +adding file changes +added 2 changesets with 1 changes to 1 files +new changesets 4979c32ff5f3:9593f96ddedf progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 39 - clone replace directory with a file @@ -6460,17 +6438,7 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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 4d4fb3d8f309:f9924b16904f -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 39 - clone replace directory with a file +ok 37 - cloning a removed file works expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6479,41 +6447,35 @@ 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 + echo test > dir_or_file && + hg add dir_or_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 ) && - 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/test_file" 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 -(branches are permanent and global, did you want a bookmark?) Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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. +marked working directory as branch parent/child +/build/reproducible-path/git-remote-hg-1.0.4~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 3 changesets with 3 changes to 1 files -new changesets 9770c9b6dc71:5b410ac5b42f -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) -marked working directory as branch parent/child -ok 40 - clone can ignore invalid refnames +added 2 changesets with 2 changes to 2 files +new changesets 98ae6131da2c:2d0d1b9d3446 +Cloning into 'gitrepo'... +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +ok 38 - cloning a file replaced with a directory expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6521,35 +6483,32 @@ ( 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 - ) && + mkdir dir_or_file && + echo test > dir_or_file/test_file && + hg add dir_or_file/test_file && + hg commit -m add && - cat > expected <<-\EOF && - tip:Version 1.0:C O Mitter - v1.0:one:H G Wells - EOF + hg rm dir_or_file/test_file && + echo test > dir_or_file && + hg add dir_or_file && + hg commit -m add && - hg -R hgrepo log --template "{tags}:{desc}:{author}\n" > actual && + hg rm dir_or_file + ) && - test_cmp expected actual + git clone "hg::hgrepo" gitrepo && + check_files gitrepo "dir_or_file" -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~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.4~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 3 changesets with 3 changes to 1 files -new changesets 9770c9b6dc71:5b68399cb1ce +new changesets 6895114ba65e:c6d8741e190e WARNING: Ignoring matched branch parent/child progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) @@ -6592,15 +6551,15 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets b8ccf50c53a3 +new changesets 0c20fd3dd633 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~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'... searching for changes adding changesets adding manifests @@ -6613,10 +6572,10 @@ adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets b8ccf50c53a3 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 2 changesets with 2 changes to 2 files +new changesets 3488983c1f04:0985421107a3 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 41 - push annotated tag expecting success: @@ -6640,27 +6599,133 @@ test_cmp expected actual Cloning into 'gitrepo1'... -/build/reproducible-path/git-remote-hg-1.0.4~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. +ok 39 - clone replace directory with a file + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + 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 + ) && + + git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && + check_files gitrepo "test.txt" + +/build/reproducible-path/git-remote-hg-1.0.4~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 +warning: You appear to have cloned an empty repository. +[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.4~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.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new tag] v1.0 -> v1.0 +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new branch] master -> master +Cloning into 'gitrepo2'... +marked working directory as branch parent +(branches are permanent and global, did you want a bookmark?) /build/reproducible-path/git-remote-hg-1.0.4~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 e522f351d13b +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +marked working directory as branch parent/child +ok 42 - timezone issues with negative offsets + +# still have 2 known breakage(s) +# passed all remaining 40 test(s) +1..42 +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 +new changesets 3a75752dcc05:379a4b4e98ca +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) +ok 40 - clone can ignore invalid refnames + +expecting success: + 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" gitrepo && + cd gitrepo && + git tag -m "Version 1.0" v1.0 && + git push --tags + ) && + + 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 + +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~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 45dca0ef3309 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~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 - Date: Mon Sep 26 00:00:00 2016 -0230 - 1 file changed, 1 insertion(+) - create mode 100644 content +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.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new tag] v1.0 -> v1.0 ok 41 - push annotated tag expecting success: @@ -6684,19 +6749,6 @@ test_cmp expected actual Cloning into 'gitrepo1'... -/build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main/tmp/hgrepo - * [new branch] master -> master -Cloning into 'gitrepo2'... /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -6706,22 +6758,6 @@ 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.4~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 e522f351d13b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -ok 42 - timezone issues with negative offsets - -# still have 2 known breakage(s) -# passed all remaining 40 test(s) -1..42 /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -6774,7 +6810,7 @@ adding file changes adding remote bookmark feature-a added 1 changesets with 1 changes to 1 files -new changesets 8e5fadde3244 +new changesets b1876aef478a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~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. @@ -6821,10 +6857,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets a14746c47ddd +new changesets dd7006f07a9b progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master ce5ab59] one +[master 3f9c6e3] one Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~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. @@ -6870,7 +6906,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e9fd84f05296 +new changesets e1d100bcc183 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -6890,21 +6926,21 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets 7929b8fde101:cfbb8495c693 +new changesets 4a51f53527af:4f5615b8bdd5 progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 67e3c22..f1bc196 master -> origin/master - 67e3c22..f1bc196 branches/default -> origin/branches/default -HEAD is now at f1bc196 restored + 08e5f7b..2a0493d master -> origin/master + 08e5f7b..2a0493d branches/default -> origin/branches/default +HEAD is now at 2a0493d restored /build/reproducible-path/git-remote-hg-1.0.4~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 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:1613: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - ! [remote rejected] master -> master (rejected not pushing hg based commit 559596afa519d9e64d47ec959bf896340000a7ee) + ! [remote rejected] master -> master (rejected not pushing hg based commit c096e82fa8b7e8721eea4d4efef0fe707864474a) error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second' - ! [remote rejected] master -> master (rejected not pushing hg based commit 559596afa519d9e64d47ec959bf896340000a7ee) + ! [remote rejected] master -> master (rejected not pushing hg based commit c096e82fa8b7e8721eea4d4efef0fe707864474a) ok 45 - check-hg-commits with fail mode expecting success: @@ -6928,25 +6964,25 @@ or locale.getdefaultlocale()[1] progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - c0fd284..025265c master -> origin/master - c0fd284..025265c branches/default -> origin/branches/default -HEAD is now at 025265c restored + 9e67daf..a4a4251 master -> origin/master + 9e67daf..a4a4251 branches/default -> origin/branches/default +HEAD is now at a4a4251 restored /build/reproducible-path/git-remote-hg-1.0.4~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.4~ds/test/trash directory.main-push/bin/git-remote-hg:1613: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -WARNING: Pushing hg changeset 4f5beb214faa04084fc9d28a2e54953d98d26e76 for 6f0175ada5b07b0fa1db45ef05d416eeb898ffd7 -WARNING: Pushing hg changeset 5d18cc5905d24813887b1138740475915b39302b for 19700ae4d656fd5ea7920b4ec758a13b26376a6e -WARNING: Pushing hg changeset 939b887aa99c95dd1ede5e434e649d36443622c4 for ed128d2b6a759d8e7e1ded91f0aae20b5fe2b7b7 -WARNING: Pushing hg changeset 537781e348f5be282612c1a19d23e5a81e6de49a for 140c243a8737fdcd2da888ecdd0d17a5782c52ee -WARNING: Pushing hg changeset 0508b2de3fb1fd03da064607ae105f860a1c7287 for 025265c27cc957425494bab52e996e9a5cc9e081 +WARNING: Pushing hg changeset 0595a0a48cf36f4e103a49a9ad28e1d1cc704814 for 0b83616b11d9a9521f42f2d4ea5d69ca3072becf +WARNING: Pushing hg changeset 24c0ed4429a0c4611e9b9f5e7dbfcc75e68fb66f for 54bb6f053a4e15ba86637d95d9e9a64f224517db +WARNING: Pushing hg changeset 274f674247d60972c016c1e993c847cb3921e5a1 for 003cbe88d99e49f4efa519ed5ee2cedf2e79a7ec +WARNING: Pushing hg changeset 611f5db2dcba2f017f036cd2dea7c7fdb21954e1 for 058e3799eef25c215073af32f3b03e6844b7f0b6 +WARNING: Pushing hg changeset 450a898a10e1fe32a594ba231f1b0ef01f560433 for a4a42510334457e1bfd7291e3917afb6e6022712 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..025265c master -> master -WARNING: Pushing hg changeset 4f5beb214faa04084fc9d28a2e54953d98d26e76 for 6f0175ada5b07b0fa1db45ef05d416eeb898ffd7 -WARNING: Pushing hg changeset 5d18cc5905d24813887b1138740475915b39302b for 19700ae4d656fd5ea7920b4ec758a13b26376a6e -WARNING: Pushing hg changeset 939b887aa99c95dd1ede5e434e649d36443622c4 for ed128d2b6a759d8e7e1ded91f0aae20b5fe2b7b7 -WARNING: Pushing hg changeset 537781e348f5be282612c1a19d23e5a81e6de49a for 140c243a8737fdcd2da888ecdd0d17a5782c52ee -WARNING: Pushing hg changeset 0508b2de3fb1fd03da064607ae105f860a1c7287 for 025265c27cc957425494bab52e996e9a5cc9e081 + fffffff..a4a4251 master -> master +WARNING: Pushing hg changeset 0595a0a48cf36f4e103a49a9ad28e1d1cc704814 for 0b83616b11d9a9521f42f2d4ea5d69ca3072becf +WARNING: Pushing hg changeset 24c0ed4429a0c4611e9b9f5e7dbfcc75e68fb66f for 54bb6f053a4e15ba86637d95d9e9a64f224517db +WARNING: Pushing hg changeset 274f674247d60972c016c1e993c847cb3921e5a1 for 003cbe88d99e49f4efa519ed5ee2cedf2e79a7ec +WARNING: Pushing hg changeset 611f5db2dcba2f017f036cd2dea7c7fdb21954e1 for 058e3799eef25c215073af32f3b03e6844b7f0b6 +WARNING: Pushing hg changeset 450a898a10e1fe32a594ba231f1b0ef01f560433 for a4a42510334457e1bfd7291e3917afb6e6022712 ok 46 - check-hg-commits with push mode - no local proxy expecting success: @@ -6959,7 +6995,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 6460315c45b8 +new changesets c7e5fbb15d3a progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -6979,34 +7015,34 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets 3ee1ad04da6c:6b1f46f8c574 +new changesets 0932b21a6dbe:56d44aef615e progress revision 1 'default' (0/5) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - be0376b..b620012 master -> origin/master - be0376b..b620012 branches/default -> origin/branches/default -HEAD is now at b620012 restored + 9763ce7..449ef9b master -> origin/master + 9763ce7..449ef9b branches/default -> origin/branches/default +HEAD is now at 449ef9b restored /build/reproducible-path/git-remote-hg-1.0.4~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 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:1613: DeprecationWarning: the imp module is deprecated in favour of importlib and slated for removal in Python 3.12; see the module's documentation for alternative uses import imp -WARNING: Using hg changeset 3ee1ad04da6c0bbdfdd87888e00a6c4f42a3c3c8 for a9fde220e729d1850835ce70a9dc1cae8bc4b5ca -WARNING: Using hg changeset 2ac9f3c659fa53169d59a3b0f8d26fe4ef5402bd for 46ae1590d7b7179484f1893a070547515c0f8e01 -WARNING: Using hg changeset 3f1c18f9f3d9bf552b569ad81b54c9a9a1f16dde for d934c0d720d001dd00495500147fb1a02e3a166e -WARNING: Using hg changeset 68c3eb246ec15e6a130fecb6d1bbd888edc30c8c for fecf8cf8906e417af97d68a944c39f48e58a9f43 -WARNING: Using hg changeset 6b1f46f8c5747e9d86c152589f6d2c92d8d0038c for b6200126d02bc8113590f246e881633947b56620 +WARNING: Using hg changeset 0932b21a6dbebfdc2e5f59b49d8d35a11566b164 for cfcde3f7d238c44f6bb6073497500b1fcbf08b49 +WARNING: Using hg changeset f614de32d91537c712a8937a2d3e73b668a516cb for 49024d3f5e64e485d2bbb10a56282ed83791d893 +WARNING: Using hg changeset 89106a523f01f47855e671fb88da82d64f7bafa1 for 83f01534e06869c03303a31af9afc9f76e2e0738 +WARNING: Using hg changeset 8515e7de04b858280b2ad25a74402f45388706d0 for a3be4c1ef8e8008da5cfed62565e325446550089 +WARNING: Using hg changeset 56d44aef615e671221f2259efa157152d0ba9860 for 449ef9b7db20a66f92cc76427e39357609f35fa5 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.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..b620012 master -> master -WARNING: Using hg changeset 3ee1ad04da6c0bbdfdd87888e00a6c4f42a3c3c8 for a9fde220e729d1850835ce70a9dc1cae8bc4b5ca -WARNING: Using hg changeset 2ac9f3c659fa53169d59a3b0f8d26fe4ef5402bd for 46ae1590d7b7179484f1893a070547515c0f8e01 -WARNING: Using hg changeset 3f1c18f9f3d9bf552b569ad81b54c9a9a1f16dde for d934c0d720d001dd00495500147fb1a02e3a166e -WARNING: Using hg changeset 68c3eb246ec15e6a130fecb6d1bbd888edc30c8c for fecf8cf8906e417af97d68a944c39f48e58a9f43 -WARNING: Using hg changeset 6b1f46f8c5747e9d86c152589f6d2c92d8d0038c for b6200126d02bc8113590f246e881633947b56620 + fffffff..449ef9b master -> master +WARNING: Using hg changeset 0932b21a6dbebfdc2e5f59b49d8d35a11566b164 for cfcde3f7d238c44f6bb6073497500b1fcbf08b49 +WARNING: Using hg changeset f614de32d91537c712a8937a2d3e73b668a516cb for 49024d3f5e64e485d2bbb10a56282ed83791d893 +WARNING: Using hg changeset 89106a523f01f47855e671fb88da82d64f7bafa1 for 83f01534e06869c03303a31af9afc9f76e2e0738 +WARNING: Using hg changeset 8515e7de04b858280b2ad25a74402f45388706d0 for a3be4c1ef8e8008da5cfed62565e325446550089 +WARNING: Using hg changeset 56d44aef615e671221f2259efa157152d0ba9860 for 449ef9b7db20a66f92cc76427e39357609f35fa5 ok 47 - check-hg-commits with push mode - with local proxy expecting success: @@ -7028,7 +7064,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 723d04ef999c +new changesets 832b7a0f0470 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~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. @@ -7038,23 +7074,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jul 2 21:25 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jul 2 21:25 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 30 15:13 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 30 15:13 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs ok 48 - shared-marks unset expecting success: @@ -7086,7 +7122,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets b9e268e82c36 +new changesets 7de1453d7ea7 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~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,23 +7132,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jul 2 21:25 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jul 2 21:25 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 30 15:13 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 30 15:13 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs /build/reproducible-path/git-remote-hg-1.0.4~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 @@ -7136,25 +7172,25 @@ Writing git marks ... no changes found total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jul 2 21:25 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jul 2 21:25 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 30 15:13 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 30 15:13 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs total 20 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone --rw-r--r-- 1 pbuilder1 pbuilder1 0 Jul 2 21:25 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 71 Jul 2 21:25 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 0 May 30 15:13 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 71 May 30 15:13 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs ok 49 - shared-marks set to unset expecting success: @@ -7195,7 +7231,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 2fcae8c5a077 +new changesets 17194ad7c350 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~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. @@ -7207,70 +7243,70 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jul 2 21:25 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jul 2 21:25 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 30 15:13 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 30 15:13 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jul 2 21:25 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jul 2 21:25 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 30 15:13 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 30 15:13 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs /build/reproducible-path/git-remote-hg-1.0.4~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 Jul 2 21:25 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jul 2 21:25 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jul 2 21:25 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 30 15:13 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 30 15:13 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jul 2 21:25 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jul 2 21:25 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 30 15:13 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 30 15:13 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs /build/reproducible-path/git-remote-hg-1.0.4~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 Jul 2 21:25 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Jul 2 21:25 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Jul 2 21:25 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 May 30 15:13 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 May 30 15:13 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Jul 2 21:25 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Jul 2 21:25 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Jul 2 21:25 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 May 30 15:13 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 May 30 15:13 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 May 30 15:13 refs ok 50 - shared-marks unset to set expecting success: @@ -7321,7 +7357,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 51 - push with renamed executable preserves executable bit expecting success: @@ -7394,7 +7430,7 @@ debian/rules override_dh_auto_install make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' dh_auto_install -- prefix=/usr install-doc - make -j42 install DESTDIR=/build/reproducible-path/git-remote-hg-1.0.4\~ds/debian/git-remote-hg AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" prefix=/usr install-doc + make -j20 install DESTDIR=/build/reproducible-path/git-remote-hg-1.0.4\~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.4~ds' if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ : Use chosen Python version ; \ @@ -7426,8 +7462,8 @@ dh_installchangelogs dh_installman dh_python3 -I: dh_python3 tools:113: replacing shebang in debian/git-remote-hg/usr/bin/git-remote-hg I: dh_python3 tools:113: replacing shebang in debian/git-remote-hg/usr/bin/git-hg-helper +I: dh_python3 tools:113: replacing shebang in debian/git-remote-hg/usr/bin/git-remote-hg dh_perl dh_link dh_strip_nondeterminism @@ -7446,12 +7482,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/2268542/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/2268542/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/3065802 and its subdirectories -I: Current time: Wed Jul 2 09:25:32 -12 2025 -I: pbuilder-time-stamp: 1751491532 +I: removing directory /srv/workspace/pbuilder/2268542 and its subdirectories +I: Current time: Fri May 31 05:14:00 +14 2024 +I: pbuilder-time-stamp: 1717082040