Diff of the two buildlogs: -- --- b1/build.log 2025-09-14 22:05:49.648470156 +0000 +++ b2/build.log 2025-09-14 22:11:03.704859575 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Sun Sep 14 09:58:32 -12 2025 -I: pbuilder-time-stamp: 1757887112 +I: Current time: Sun Oct 18 18:28:50 +14 2026 +I: pbuilder-time-stamp: 1792297730 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/forky-reproducible-base.tgz] I: copying local configuration @@ -24,53 +24,85 @@ dpkg-source: info: applying 1001_testsuite_UTF-8.patch I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/3289463/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/3949154/tmp/hooks/D01_modify_environment starting +debug: Running on ionos5-amd64. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 Oct 18 04:29 /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/3949154/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/3949154/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=40 ' - DISTRIBUTION='forky' - HOME='/root' - HOST_ARCH='amd64' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="3" [2]="3" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu") + BASH_VERSION='5.3.3(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=amd64 + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=42 ' + DIRSTACK=() + DISTRIBUTION=forky + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=x86_64 + HOST_ARCH=amd64 IFS=' ' - INVOCATION_ID='007c9de7d0b24612add69eefae646ee7' - 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='3289463' - PS1='# ' - PS2='> ' + INVOCATION_ID=395637202c5346dab3cf0fcae5bee029 + 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=3949154 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.U3Nyz6qu/pbuilderrc_cEY0 --distribution forky --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/forky-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.U3Nyz6qu/b1 --logfile b1/build.log git-remote-hg_1.0.4~ds-3.dsc' - SUDO_GID='110' - SUDO_HOME='/var/lib/jenkins' - SUDO_UID='105' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://46.16.76.132: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.U3Nyz6qu/pbuilderrc_bMsb --distribution forky --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/forky-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.U3Nyz6qu/b2 --logfile b2/build.log git-remote-hg_1.0.4~ds-3.dsc' + SUDO_GID=110 + SUDO_HOME=/var/lib/jenkins + SUDO_UID=105 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://213.165.73.152:3128 I: uname -a - Linux ionos1-amd64 6.12.43+deb13-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.12.43-1 (2025-08-27) x86_64 GNU/Linux + Linux i-capture-the-hostname 6.12.43+deb13-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.12.43-1 (2025-08-27) x86_64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Aug 10 12:30 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/3289463/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Aug 10 2025 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/3949154/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -223,7 +255,7 @@ Get: 95 http://deb.debian.org/debian forky/main amd64 python3-zombie-imp all 0.0.3-1 [11.9 kB] Get: 96 http://deb.debian.org/debian forky/main amd64 sharness all 1.0.0-1.1 [28.6 kB] Get: 97 http://deb.debian.org/debian forky/main amd64 xmlto amd64 0.0.29-2 [27.6 kB] -Fetched 41.6 MB in 1s (31.4 MB/s) +Fetched 41.6 MB in 0s (91.3 MB/s) Preconfiguring packages ... Selecting previously unselected package libexpat1:amd64. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 19917 files and directories currently installed.) @@ -553,8 +585,8 @@ Setting up tzdata (2025b-5) ... Current default time zone: 'Etc/UTC' -Local time is now: Sun Sep 14 21:59:36 UTC 2025. -Universal Time is now: Sun Sep 14 21:59:36 UTC 2025. +Local time is now: Sun Oct 18 04:30:58 UTC 2026. +Universal Time is now: Sun Oct 18 04:30:58 UTC 2026. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17030-1) ... @@ -645,7 +677,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-3_source.changes +I: user script /srv/workspace/pbuilder/3949154/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for forky +I: user script /srv/workspace/pbuilder/3949154/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-3_source.changes dpkg-buildpackage: info: source package git-remote-hg dpkg-buildpackage: info: source version 1.0.4~ds-3 dpkg-buildpackage: info: source distribution unstable @@ -655,7 +691,7 @@ debian/rules clean dh clean dh_auto_clean - make -j40 clean + make -j42 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/ @@ -667,7 +703,7 @@ dh_autoreconf dh_auto_configure dh_auto_build - make -j40 "INSTALL=install --strip-program=true" + make -j42 "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 ; \ @@ -691,7 +727,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 -j40 test + make -j42 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' @@ -700,6 +736,15 @@ /bin/sh bidi.t --verbose /bin/sh helper.t --verbose expecting success: + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) + +expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && setup_repos && @@ -712,15 +757,6 @@ grep origin help expecting success: - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) - -expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && ( @@ -801,7 +837,6 @@ check gitrepo HEAD zero Cloning into 'gitrepo'... -Cloning into 'gitrepo'... ok 1 - setup expecting success: @@ -810,51 +845,47 @@ check gitrepo HEAD zero Cloning into 'gitrepo'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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] /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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files adding changesets -new changesets cb2e2f927fa3 +added 1 changesets with 1 changes to 1 files adding manifests +new changesets 51f8e4bd6cec adding file changes -adding changesets -adding manifests added 1 changesets with 1 changes to 1 files -adding file changes -new changesets cb2e2f927fa3 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -added 1 changesets with 1 changes to 1 files -new changesets cb2e2f927fa3 +new changesets 51f8e4bd6cec 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.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.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 2 - cloning expecting success: @@ -885,19 +916,28 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/branches/next next -/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 +adding changesets added 4 changesets with 4 changes to 4 files +adding manifests new changesets 1e3e49d2cc8f:6674f1c866b5 +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 51f8e4bd6cec +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/4) +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) marked working directory as branch next (branches are permanent and global, did you want a bookmark?) marked working directory as branch next (branches are permanent and global, did you want a bookmark?) -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.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) origin ok 1 - subcommand help @@ -920,49 +960,45 @@ Cloning into 'gitrepo'... Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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] /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] +searching for changes +no changes found 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.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +searching for changes adding changesets adding manifests adding file changes +added 4 changesets with 4 changes to 4 files adding changesets -searching for changes -no changes found +adding manifests +adding changesets +adding file changes adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets cb2e2f927fa3:02a1fe73c863 +new changesets 51f8e4bd6cec:f05e153636be added 2 changesets with 2 changes to 1 files -new changesets cb2e2f927fa3:02a1fe73c863 -searching for changes -adding changesets +new changesets 51f8e4bd6cec:f05e153636be progress revision walk 'bookmarks/master' (0/0) -adding manifests progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) -adding file changes progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) -added 4 changesets with 4 changes to 4 files ok 3 - cloning with branches expecting success: @@ -995,19 +1031,9 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/feature-a feature-a -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) 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] -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.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... ok 1 - encoding expecting success: @@ -1041,25 +1067,10 @@ test_cmp expected actual -ok 2 - subcommand repo - no local proxy - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd gitrepo && - export gitdir=`git rev-parse --git-dir` - # trick to normalize path - ( cd $gitdir/hg/origin/clone && pwd ) >../expected && - ( cd `git-hg-helper repo origin` && pwd ) > ../actual - ) && - - test_cmp expected actual - -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) @@ -1068,14 +1079,6 @@ 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) [master 86bf00d] add foo Author: A U Thor 1 file changed, 1 insertion(+) @@ -1085,54 +1088,77 @@ Author: A U Thor 1 file changed, 1 deletion(-) delete mode 100644 alpha +/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] rm 'foo/bar' [master ea36818] remove foo/bar Author: A U Thor 1 file changed, 1 deletion(-) delete mode 100644 foo/bar -/build/reproducible-path/git-remote-hg-1.0.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 +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.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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] +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.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets adding changesets adding manifests adding file changes +adding remote bookmark feature-a +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets 51f8e4bd6cec:de6efafdf909 +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) -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets cb2e2f927fa3:3a1b56d9c269 -new changesets cb2e2f927fa3:3a1b56d9c269 -no changes found +new changesets 51f8e4bd6cec:de6efafdf909 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) +ok 2 - subcommand repo - no local proxy + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + + ( + cd gitrepo && + export gitdir=`git rev-parse --git-dir` + # trick to normalize path + ( cd $gitdir/hg/origin/clone && pwd ) >../expected && + ( cd `git-hg-helper repo origin` && pwd ) > ../actual + ) && + + test_cmp expected actual + progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) -Cloning into 'gitrepo'... -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 4 - cloning with bookmarks +no changes found expecting success: test_when_finished "rm -rf gitrepo*" && @@ -1173,43 +1199,44 @@ 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 1 changesets with 1 changes to 1 files -new changesets 3a04c30f056f -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 5 changesets with 3 changes to 3 files Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 +/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 devel adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets cb2e2f927fa3:3a1b56d9c269 +new changesets 51f8e4bd6cec:de6efafdf909 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') adding changesets +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) adding manifests @@ -1218,82 +1245,75 @@ adding remote bookmark devel adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets cb2e2f927fa3:3a1b56d9c269 +new changesets 51f8e4bd6cec:de6efafdf909 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] -[devel 96b1c64] 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.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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) adding changesets adding manifests adding file changes -added 5 changesets with 3 changes to 3 files -new changesets 362b656574c3:54f595cbdf1f -[devel 96b1c64] devel +[devel b41a687] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +added 5 changesets with 3 changes to 3 files +new changesets 362b656574c3:54f595cbdf1f progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/5) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -ok 3 - subcommand repo - with local proxy - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd gitrepo && - git rev-parse HEAD > rev-HEAD && - test -s rev-HEAD && - git-hg-helper hg-rev `cat rev-HEAD` > hg-HEAD && - git-hg-helper git-rev `cat hg-HEAD` > git-HEAD && - test_cmp rev-HEAD git-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 -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.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +[devel b41a687] 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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 /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 1 changesets with 1 changes to 1 files +new changesets 5a7df45f9fc1 searching for changes no changes found searching for changes adding changesets adding manifests adding file changes +searching for changes +searching for changes +adding changesets +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +adding changesets +adding manifests +adding manifests +adding file changes +adding file changes added 5 changesets with 3 changes to 3 files +added 1 changesets with 1 changes to 1 files +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] ok 5 - update bookmark expecting success: @@ -1310,15 +1330,26 @@ check_bookmark hgrepo feature-b feature-b +ok 3 - subcommand repo - with local proxy + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repos && + + ( + cd gitrepo && + git rev-parse HEAD > rev-HEAD && + test -s rev-HEAD && + git-hg-helper hg-rev `cat rev-HEAD` > hg-HEAD && + git-hg-helper git-rev `cat hg-HEAD` > git-HEAD && + test_cmp rev-HEAD git-HEAD + ) + Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 5 - update bookmark @@ -1337,62 +1368,15 @@ 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 -adding remote bookmark feature-a -added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets cb2e2f927fa3:cff079cf30f4 -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 1 changesets with 1 changes to 1 files -new changesets babcf6003f87 -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 -[feature-b 9c1e231] 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) 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 cb2e2f927fa3:cff079cf30f4 -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/3) -progress revision 1 'next' (0/1) -[feature-b 9c1e231] 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 2 - file removal expecting success: @@ -1422,21 +1406,63 @@ test_cmp expected actual -/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. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +added 4 changesets with 4 changes to 1 files (+1 heads) +new changesets 51f8e4bd6cec:a0ddad2d6cca +/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'... [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha -searching for changes +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) adding changesets adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files [master 862befc] add beta Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 beta +progress revision walk 'bookmarks/master' (3/3) +/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 file changes +progress revision 0 'master' (0/3) +progress revision 1 'next' (0/1) +adding remote bookmark devel +adding remote bookmark feature-a +added 4 changesets with 4 changes to 1 files (+1 heads) +new changesets 51f8e4bd6cec:a0ddad2d6cca +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +adding changesets +/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 manifests +adding file changes +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/3) +progress revision 1 'next' (0/1) +added 1 changesets with 1 changes to 1 files +new changesets e84146d4c064 +no changes found +[feature-b ea7fc52] 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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 @@ -1446,49 +1472,41 @@ 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.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +[feature-b ea7fc52] 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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 - +added 2 changesets with 2 changes to 2 files +searching for changes +searching for changes +searching for changes +adding changesets +adding manifests +adding file changes +/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. + or locale.getdefaultlocale()[1] +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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 4 - subcommands hg-rev and git-rev expecting success: @@ -1528,8 +1546,6 @@ grep "git marks" output ) -/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 6 - new bookmark expecting success: @@ -1562,23 +1578,43 @@ test_cmp expected actual -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 -searching for changes -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 +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 + added 2 changesets with 2 changes to 2 files new changesets 362b656574c3:7cd99375c843 progress revision walk 'bookmarks/master' (1/1) @@ -1587,35 +1623,29 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 -/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 2 changes to 2 files +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 4 changesets with 4 changes to 1 files -new changesets 6ddc51ad5e3a:6bea493448b4 +new changesets b158fce4a3ea:caabbb2b9069 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/c51151d62b8b-1c13df7f-backup.hg -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 3 - git tags expecting success: @@ -1654,6 +1684,25 @@ test_cmp expected actual +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/2e2f66b9d71a-0b7382ff-backup.hg +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 /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 @@ -1661,31 +1710,28 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets ef247295dc1c +new changesets d465d1c3218e progress revision 4 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - + 0e050fc...51061fc master -> origin/master (forced update) - + 0e050fc...51061fc branches/default -> origin/branches/default (forced update) -HEAD is now at 51061fc four -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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] + + 33a5639...e14db7e master -> origin/master (forced update) + + 33a5639...e14db7e branches/default -> origin/branches/default (forced update) +HEAD is now at e14db7e four +Cloning into '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] -no changes found /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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'... Loading hg marks ... Loading git marks ... Performing garbage collection on git commits ... @@ -1725,35 +1771,16 @@ 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 changesets -adding file changes adding manifests -added 12 changesets with 12 changes to 1 files -new changesets 282b1c6fb33f:72b018d779e7 adding file changes added 12 changesets with 12 changes to 1 files -new changesets 282b1c6fb33f:7c0c772f4ca2 +new changesets ba3b25f830b0:3475d9a225f6 progress revision walk 'bookmarks/master' (11/11) -progress revision walk 'bookmarks/master' (11/11) -progress revision 0 'master' (0/12) progress revision 0 'master' (0/12) ok 7 - authors @@ -1794,6 +1821,20 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected +marked working directory as branch gamma +/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 12 changesets with 12 changes to 1 files +new changesets 2de9369d9bf8:4e5f4035eb65 +progress revision walk 'bookmarks/master' (11/11) +progress revision 0 'master' (0/12) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 7 - authors expecting success: @@ -1834,162 +1875,108 @@ test_cmp actual expected Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -marked working directory as branch gamma -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets fcb5eeaf17ed -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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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'... searching for changes adding changesets adding manifests adding file changes adding remote bookmark not-master -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files added 2 changesets with 1 changes to 1 files new changesets 5889597089fe:3320583a8de0 -new changesets 987af71fc9d3 1 local changesets published -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -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:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) 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.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 -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 8131738..c0744b5 master -> origin/master - 8131738..c0744b5 branches/default -> origin/branches/default -/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-remote-hg: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 2 changes to 1 files -new changesets f99f5ee68399:e709974497c1 -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 f99f5ee68399:e709974497c1 +added 1 changesets with 1 changes to 1 files +new changesets 8d32478e2448 +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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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.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.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. +/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 +adding changesets searching for changes +adding manifests +adding file changes adding changesets +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') adding manifests +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) adding file changes +added 2 changesets with 2 changes to 1 files +new changesets e05fb9b36bf4:b2063963d5e5 added 2 changesets with 2 changes to 2 files -ok 6 - subcommand [some-repo] - -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 && - test -f content_hgrepo && - test -f sub_hg_a/content_sub_hg_a && - test -f sub_hg_b/content_sub_hg_b && - test -f sub_git/content_sub_git - ) && - - check gitrepo HEAD substate && - check gitrepo/sub_hg_a HEAD zero_sub_hg_a && - check gitrepo/sub_hg_b HEAD zero_sub_hg_b && - check gitrepo/sub_git HEAD zero_sub_git - searching for changes adding changesets +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) adding manifests adding file changes added 1 changesets with 0 changes to 0 files +Cloning into 'gitrepo'... 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/hgrepo/.hg/strip-backup/e709974497c1-c1c1e676-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/e709974497c1-c1c1e676-backup.hg -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:154: SyntaxWarning: invalid escape sequence '\w' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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] +/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 searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets c752a2efe3e7:79e639a0d4de -progress revision 2 'default' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +added 1 changesets with 1 changes to 1 files +new changesets f80d095c3a92 +progress revision 1 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + c275c6b..85970e7 master -> origin/master + c275c6b..85970e7 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/b2063963d5e5-d5ce9aa7-backup.hg +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets e05fb9b36bf4:b2063963d5e5 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +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/b2063963d5e5-d5ce9aa7-backup.hg +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 4 - hg branch expecting success: @@ -2023,25 +2010,66 @@ test_cmp expected actual -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - + a86b474...9f4d2a5 master -> origin/master (forced update) - + a86b474...9f4d2a5 branches/default -> origin/branches/default (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] [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.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 0059c0ca8e65:a2e92a49afe0 +new changesets 5d6a9853995f:49ee0260669e +ok 6 - subcommand [some-repo] + +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 && + test -f content_hgrepo && + test -f sub_hg_a/content_sub_hg_a && + test -f sub_hg_b/content_sub_hg_b && + test -f sub_git/content_sub_git + ) && + + check gitrepo HEAD substate && + check gitrepo/sub_hg_a HEAD zero_sub_hg_a && + check gitrepo/sub_hg_b HEAD zero_sub_hg_b && + check gitrepo/sub_git HEAD zero_sub_git + progress revision 2 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - + a86b474...4cec684 master -> origin/master (forced update) - + a86b474...4cec684 branches/default -> origin/branches/default (forced update) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo + + 149837b...15a7fc5 master -> origin/master (forced update) + + 149837b...15a7fc5 branches/default -> origin/branches/default (forced update) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 8 - strip expecting success: @@ -2068,12 +2096,27 @@ check_branch hgrepo default two -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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-push/bin/git-remote-hg: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 +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files (+1 heads) +new changesets b28b7fb9381d:625cdcbb5e21 +progress revision 2 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + + 149837b...32599fa master -> origin/master (forced update) + + 149837b...32599fa branches/default -> origin/branches/default (forced update) ok 8 - strip expecting success: @@ -2100,141 +2143,100 @@ check_branch hgrepo default two -no changes found -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -searching for changes -adding changesets -adding manifests -adding file changes -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -added 1 changesets with 1 changes to 1 files -searching for changes 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -adding changesets -adding manifests -adding file changes Cloning into 'gitrepo'... -added 2 changesets with 3 changes to 3 files -new changesets 3b2eb8f3fef4:4454e1f5e19b -adding changesets -adding manifests -adding file changes -adding remote bookmark 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] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -added 2 changesets with 2 changes to 1 files -new changesets 9751a11052ec:bc506203b7ce -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) searching for changes -/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 -progress revision walk 'bookmarks/default' (1/1) -progress revision 0 'default' (0/2) 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/bin/git-remote-hg: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 added 2 changesets with 2 changes to 1 files -new changesets 00c7d7df327e:590f26d65a91 -progress revision 1 'default' (0/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. - or locale.getdefaultlocale()[1] -[default 96443d8] 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:154: SyntaxWarning: invalid escape sequence '\w' +new changesets a1e58a2d49db:63380c533893 +progress revision walk 'bookmarks/default' (1/1) +progress revision 0 'default' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into './sub_hg_a'... +[default 1175468] two + 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -progress revision walk 'bookmarks/default' (1/1) -progress revision 0 'default' (0/2) +/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 /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:154: SyntaxWarning: invalid escape sequence '\w' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) 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. +/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] +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ 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.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - c3feeba..96443d8 default -> default +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +added 2 changesets with 2 changes to 2 files +searching for changes adding changesets adding manifests adding file changes -/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 1 changesets with 1 changes to 1 files -new changesets 97d1fdbf2e07 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[default af56ea4] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) searching for changes adding changesets +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 + 437bd9e..1175468 default -> default +To hg::../hgrepo2 + * [new branch] branches/default -> branches/default adding manifests + * [new branch] master -> master + * [new branch] not-master -> not-master + ! [rejected] alpha -> alpha (already exists) +error: failed to push some refs to 'hg::../hgrepo2' adding file changes -/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] -added 2 changesets with 2 changes to 2 files +adding remote bookmark master +hint: Updates were rejected because the tag already exists in the remote. +added 2 changesets with 2 changes to 1 files +new changesets a1e58a2d49db:1dacfba114fc +progress revision walk 'bookmarks/default' (1/1) +progress revision 0 'default' (0/2) ok 9 - remote push with master bookmark expecting success: @@ -2258,41 +2260,10 @@ check_branch hgrepo default one -no changes found -searching for changes -searching for changes -To hg::../hgrepo2 - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] not-master -> not-master - ! [rejected] alpha -> alpha (already exists) -error: failed to push some refs to 'hg::../hgrepo2' -hint: Updates were rejected because the tag already exists in the remote. -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -[master (root-commit) 64caca5] one +Cloning into 'gitrepo'... +[default 84c8c01] two 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.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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 -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..af56ea4 default -> default + 1 file changed, 1 insertion(+), 1 deletion(-) ok 5 - hg tags expecting success: @@ -2332,7 +2303,11 @@ test_cmp expected actual -no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -2342,30 +2317,78 @@ Date: Mon Jan 1 00:00:00 2007 +0000 1 file changed, 1 insertion(+) create mode 100644 alpha -searching for changes +/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) 64caca5] one + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content +no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 ea3e397] add beta Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0100 1 file changed, 1 insertion(+) create mode 100644 beta -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::../hgrepo - * [new branch] 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] [master d7a1343] add gamma Author: A U Thor Date: Mon Jan 1 00:00:00 2007 -0100 1 file changed, 1 insertion(+) create mode 100644 gamma +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] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets +added 1 changesets with 1 changes to 1 files +adding manifests +adding file changes [master 79cd3e4] add delta Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0130 1 file changed, 1 insertion(+) create mode 100644 delta +added 2 changesets with 3 changes to 3 files +new changesets 8364dc9efb08:207ab78a191d +no changes found +[master f12dbdf] add epsilon + Author: A U Thor + Date: Mon Jan 1 00:00:00 2007 -0130 + 1 file changed, 1 insertion(+) + create mode 100644 epsilon +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + fffffff..84c8c01 default -> default +searching for changes +progress revision walk 'bookmarks/master' (1/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +progress revision 0 'master' (0/2) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::../hgrepo + * [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] +no changes found +changeset: 0:6e2126489d3d +tag: tip +user: A U Thor +date: Mon Jan 01 00:00:00 2007 +0230 +summary: one + ok 9 - remote push with master bookmark expecting success: @@ -2389,40 +2412,7 @@ check_branch hgrepo default one -[master f12dbdf] add epsilon - Author: A U Thor - Date: Mon Jan 1 00:00:00 2007 -0130 - 1 file changed, 1 insertion(+) - create mode 100644 epsilon -adding changesets -adding manifests -adding file changes -changeset: 0:6e2126489d3d -tag: tip -user: A U Thor -date: Mon Jan 01 00:00:00 2007 +0230 -summary: one - -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 -added 1 changesets with 1 changes to 1 files -new changesets 5cff376c628b -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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. +/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 10 - remote push from master branch @@ -2440,41 +2430,120 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero -no changes found -no changes found /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into './sub_hg_a'... +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 searching for changes adding changesets adding manifests adding file changes -Cloning into './sub_git'... +added 5 changesets with 5 changes to 5 files +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 -done. -To hg::../hgrepo - * [new branch] master -> master +new changesets 39791d7eb7cd +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) searching for changes -Cloning into 'gitrepo'... 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 +To hg::../hgrepo + * [new branch] master -> master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into './sub_hg_b'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 changeset: 0:6e2126489d3d tag: tip user: A U Thor date: Mon Jan 01 00:00:00 2007 +0230 summary: one +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.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 e68c6d587131 /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] +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/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 dd569803e5ad +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +Cloning into './sub_git'... +done. +ok 11 - remote cloning + +expecting success: + test_when_finished "rm -rf gitrepo*" && + + ( + git clone "hg::hgrepo" gitrepo && + mv gitrepo gitrepo2 && + cd gitrepo2 && + git fetch + ) + +Cloning into 'gitrepo'... ok 10 - remote push from master branch expecting success: @@ -2491,6 +2560,10 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 7 - subcommand sub initial update (hg and git subrepos) expecting success: @@ -2516,116 +2589,44 @@ check gitrepo/sub_hg_a/sub_hg_a_x HEAD zero_sub_hg_a_x && check gitrepo/sub_hg_b/sub_git HEAD zero_sub_git -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 9623d83a2728 -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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 11 - remote cloning - -expecting success: - test_when_finished "rm -rf gitrepo*" && - - ( - git clone "hg::hgrepo" gitrepo && - mv gitrepo gitrepo2 && - cd gitrepo2 && - git fetch - ) - -Cloning into 'gitrepo'... -Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files -new changesets 87c8f82b00d0:21e96c99dac4 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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. +/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 changesets -adding manifests -adding file changes adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 724eab82ac89 -added 1 changesets with 1 changes to 1 files -new changesets 9623d83a2728 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +new changesets dd569803e5ad progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/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 - ) - -Cloning into 'gitrepo'... +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 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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'... /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.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 -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 724eab82ac89 -searching for changes +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) no changes found -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files ok 12 - moving remote clone expecting success: @@ -2647,39 +2648,41 @@ check_bookmark hgrepo devel devel -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 ffe7b16d2114 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) Cloning into 'gitrepo'... -no changes found /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -ok 12 - moving remote clone +ok 11 - remote cloning expecting success: test_when_finished "rm -rf gitrepo*" && ( - cd hgrepo && - hg bookmark devel - ) && - - ( git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git checkout --quiet devel && - echo devel > content && - git commit -a -m devel && - git push --quiet - ) && + mv gitrepo gitrepo2 && + cd gitrepo2 && + git fetch + ) - check_bookmark hgrepo devel devel +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +ok 6 - test timezones +# passed all 6 test(s) +1..6 /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 @@ -2688,89 +2691,64 @@ adding manifests adding file changes adding remote bookmark devel -ok 6 - test timezones - -# passed all 6 test(s) -1..6 -Cloning into 'gitrepo'... added 1 changesets with 1 changes to 1 files -new changesets 9623d83a2728 -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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -[devel 9bbe17c] 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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] +new changesets dd569803e5ad +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) adding changesets adding manifests adding file changes -adding remote bookmark devel added 1 changesets with 1 changes to 1 files -new changesets 724eab82ac89 +new changesets ffe7b16d2114 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 -[devel 4de5138] devel +[devel 84d0359] 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 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.main-push/bin/git-remote-hg: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 13 - remote update bookmark +ok 12 - moving remote clone expecting success: test_when_finished "rm -rf gitrepo*" && ( + cd hgrepo && + hg bookmark devel + ) && + + ( 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 + git checkout --quiet devel && + echo devel > content && + git commit -a -m devel && + git push --quiet ) && - check_bookmark hgrepo feature-b feature-b + check_bookmark hgrepo devel devel -searching for changes -Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 13 - remote update bookmark expecting success: @@ -2787,41 +2765,48 @@ check_bookmark hgrepo feature-b feature-b -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways Cloning into 'gitrepo'... +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 remote bookmark devel added 2 changesets with 2 changes to 1 files -new changesets 9623d83a2728:4a7cda3bd0b6 -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] -[feature-b a475b3f] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +new changesets dd569803e5ad:7153c593724e adding changesets adding manifests adding file changes adding remote bookmark devel -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -added 2 changesets with 2 changes to 1 files -new changesets 724eab82ac89:3a6cdca3ecab +added 1 changesets with 1 changes to 1 files +new changesets ffe7b16d2114 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -[feature-b 1cf255f] feature-b +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[feature-b 339760a] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +[devel 840937a] 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -2830,25 +2815,25 @@ 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 -added 1 changesets with 1 changes to 1 files -/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 -Cloning into 'gitrepo'... searching for changes +added 1 changesets with 1 changes to 1 files 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) added 1 changesets with 1 changes to 1 files +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 14 - remote new bookmark expecting success: @@ -2875,19 +2860,79 @@ check_branch hgrepo default bump 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] +ok 13 - remote 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.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 2 changesets with 3 changes to 3 files -new changesets 54b119351b67:2f5904987153 +adding remote bookmark devel +adding remote bookmark feature-b +added 3 changesets with 3 changes to 1 files +new changesets dd569803e5ad:488ee90a65b6 +adding changesets +adding manifests +adding file changes +adding remote bookmark devel +added 2 changesets with 2 changes to 1 files +new changesets ffe7b16d2114:44d2daabf191 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +[feature-b 477eaea] 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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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.main-push/bin/git-remote-hg: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'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +[master a1eb9d2] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) ok 14 - remote new bookmark expecting success: @@ -2918,117 +2963,146 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 136fc58d6ec7:33d81becd5ca +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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 -adding remote bookmark devel -adding remote bookmark feature-b +added 1 changesets with 1 changes to 1 files +new changesets 9127ad6ee5de +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' +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-push/bin/git-remote-hg: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 9623d83a2728:1bbf1d5eec88 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) 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 724eab82ac89:d4b4fd2b97f2 -/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] +new changesets ffe7b16d2114:96eba0e7fe93 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) +/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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +ok 15 - remote push diverged + +expecting success: + test_when_finished "rm -rf gitrepo*" && + + ( + cd hgrepo && + hg checkout tip^ && + hg bookmark diverge + ) && + + git clone "hg::hgrepo" gitrepo && + + ( + cd hgrepo && + echo "bump bookmark" > content && + hg commit -m "bump bookmark" + ) && + + ( + cd gitrepo && + git checkout --quiet diverge && + echo diverge > content && + git commit -a -m diverge && + check_push 1 <<-\EOF + diverge:non-fast-forward + EOF + ) && + + check_bookmark hgrepo diverge "bump bookmark" + Cloning into './sub_hg_a'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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) 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 2e2c6ac50569:b842a16e5892 +new changesets b88c8b4f4626:5aae13ba20f9 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 5f24728] diverged +[master e979666] diverged Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -[master 3339066] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 80bbcf9ac679 -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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into './sub_hg_a/sub_hg_a_x'... +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into './sub_hg_b'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 -searching for changes adding changesets adding manifests adding file changes +adding changesets added 1 changesets with 1 changes to 1 files -new changesets ceeefb297ae4 -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' -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) +new changesets 6b2f4f2eba75 +adding manifests +adding file changes +adding remote bookmark devel +adding remote bookmark diverge +adding remote bookmark feature-b +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +added 4 changesets with 4 changes to 1 files +new changesets dd569803e5ad:9127ad6ee5de +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.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -3040,7 +3114,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 6f8c3d74f1f3 +new changesets 3e174bd634ff 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' @@ -3049,46 +3123,20 @@ 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] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 860387c9a91d:f85ffb977543 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 15 - remote push diverged - -expecting success: - test_when_finished "rm -rf gitrepo*" && - - ( - cd hgrepo && - hg checkout tip^ && - hg bookmark diverge - ) && - - git clone "hg::hgrepo" gitrepo && - - ( - cd hgrepo && - echo "bump bookmark" > content && - hg commit -m "bump bookmark" - ) && - - ( - cd gitrepo && - git checkout --quiet diverge && - echo diverge > content && - git commit -a -m diverge && - check_push 1 <<-\EOF - diverge:non-fast-forward - EOF - ) && - - check_bookmark hgrepo diverge "bump bookmark" - +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into './sub_hg_b'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +created new head ok 15 - remote push diverged expecting success: @@ -3120,6 +3168,19 @@ check_bookmark hgrepo diverge "bump bookmark" +[diverge 4bb4c5a] 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.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 5d40220bd213:d4648a45411b +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 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -3130,7 +3191,6 @@ m = re.match(b'^(.+?) ext:\((.+)\)$', name) Cloning into './sub_hg_b/sub_git'... done. -1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 8 - subcommand sub initial recursive update expecting success: @@ -3138,72 +3198,6 @@ test_sub_update -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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 4 changesets with 4 changes to 1 files -new changesets 724eab82ac89:6f8c3d74f1f3 -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/4) -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b -added 4 changesets with 4 changes to 1 files -new changesets 9623d83a2728:ceeefb297ae4 -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/4) -created new head -[diverge 3d3eb4c] diverge - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -created new head -[diverge 64596ba] 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-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 3eec684b43a8 -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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -3218,7 +3212,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 73e23168d70c +new changesets aa7ae0ba606d 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' @@ -3227,22 +3221,6 @@ 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) -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'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') @@ -3277,15 +3255,14 @@ 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 724eab82ac89:3eec684b43a8 +added 4 changesets with 4 changes to 1 files +new changesets ffe7b16d2114:3e174bd634ff +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.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/4) adding changesets adding manifests adding file changes @@ -3293,45 +3270,55 @@ adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets 9623d83a2728:73e23168d70c +new changesets dd569803e5ad:aa7ae0ba606d 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 5baee13] 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -[feature-c 5bc8a26] feature-c +[feature-c b9369a8] feature-c Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +created new head /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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. +[diverge d596a05] 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 +WARNING: various enhanced features might fail in subtle ways no changes found 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] added 1 changesets with 1 changes to 1 files (+1 heads) -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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 90a9092c7fba +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) ok 17 - remote new bookmark multiple branch head -expecting success: +checking known breakage: test_when_finished "rm -rf gitrepo hgrepo" && ( @@ -3368,9 +3355,90 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) +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'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 ffe7b16d2114:90a9092c7fba +WARNING: Branch 'default' has more than one head, consider merging +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/4) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +[feature-c 49bd7b0] 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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 0eceb26ad31d +/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) +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +[master f58f804] copy + Author: A U Thor + 1 file changed, 2 insertions(+) + create mode 100644 content-copy +[master feb187e] 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.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 17 - remote new bookmark multiple branch head -checking known breakage: +expecting success: test_when_finished "rm -rf gitrepo hgrepo" && ( @@ -3407,54 +3475,71 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo + e7eaba1..feb187e master -> master +1 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.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 +not ok 18 - push commits with copy and rename # TODO known breakage + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo && LC_ALL=C" && + + LC_ALL=C.UTF-8 + export LC_ALL + + ( + hg init hgrepo && + cd hgrepo && + + echo test >> "æ rø" && + hg add "æ rø" && + echo test >> "ø~?" && + hg add "ø~?" && + hg commit -m add-utf-8 && + echo test >> "æ rø" && + hg commit -m test-utf-8 && + hg rm "ø~?" && + hg mv "æ rø" "ø~?" && + hg commit -m hg-mv-utf-8 + ) && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git -c core.quotepath=false ls-files > ../actual + ) && + echo "ø~?" > expected && + 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 4ebccf307767 +new changesets 9e500ba2dcef 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 4ebccf307767 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master fd123cb] copy - Author: A U Thor - 1 file changed, 2 insertions(+) - create mode 100644 content-copy -[master 1d5061c] moved - Author: A U Thor - 1 file changed, 0 insertions(+), 0 deletions(-) - rename content-copy => content-moved (100%) -[master fd123cb] copy +[master 2d28acf] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master 1d5061c] moved +[master d722fd4] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) @@ -3462,10 +3547,7 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) +warning: filename contains '?', which is reserved on Windows: 'ø~?' Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') @@ -3473,75 +3555,31 @@ m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 no changes found -no changes found -searching for changes -adding changesets -adding manifests searching for changes -adding file changes adding changesets adding manifests -added 2 changesets with 2 changes to 2 files adding file changes -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - cb71a20..1d5061c master -> master 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..1d5061c master -> master + fffffff..d722fd4 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] adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets edd9144f6732:abd76a5bd826 +new changesets 0ad30b2be589:febdbd053571 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 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -not ok 18 - push commits with copy and rename # TODO known breakage - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo && LC_ALL=C" && - - LC_ALL=C.UTF-8 - export LC_ALL - - ( - hg init hgrepo && - cd hgrepo && - - echo test >> "æ rø" && - hg add "æ rø" && - echo test >> "ø~?" && - hg add "ø~?" && - hg commit -m add-utf-8 && - echo test >> "æ rø" && - hg commit -m test-utf-8 && - hg rm "ø~?" && - hg mv "æ rø" "ø~?" && - hg commit -m hg-mv-utf-8 - ) && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git -c core.quotepath=false ls-files > ../actual - ) && - echo "ø~?" > expected && - test_cmp expected actual - /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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into './sub_hg_a'... ok 18 - push commits with copy and rename expecting success: @@ -3574,20 +3612,25 @@ echo "ø~?" > expected && test_cmp expected actual -Cloning into './sub_hg_a'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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 2 changesets with 3 changes to 3 files -new changesets a3008c9df9e5:4398f52e74df +new changesets 3ed86eff5718:cf8e7bde25a2 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -3602,14 +3645,60 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) warning: filename contains '?', which is reserved on Windows: 'ø~?' -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 +adding changesets +adding manifests +adding file changes +added 3 changesets with 4 changes to 2 files +new changesets d66f1bec7789:4ae0098c033b +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) /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 19 - fetch special filenames + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo && LC_ALL=C" && + + mkdir -p tmp && cd tmp && + + LC_ALL=C.UTF-8 + export LC_ALL + + ( + hg init hgrepo && + cd hgrepo && + + echo one >> content && + hg add content && + hg commit -m one + ) && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + + echo test >> "æ rø" && + git add "æ rø" && + git commit -m utf-8 && + + git push + ) && + + (cd hgrepo && + hg update && + hg manifest > ../actual + ) && + + printf "content\næ rø\n" > expected && + test_cmp expected actual + adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 8786dd38dc71 +new changesets 03c71a491894 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' @@ -3631,10 +3720,9 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 816c622d4bb1:5896a9a0dc37 +new changesets 7d575edf20eb:a7247f483a5d progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -3644,32 +3732,40 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) Cloning into './sub_hg_b/sub_git'... -warning: filename contains '?', which is reserved on Windows: 'ø~?' done. Cloning into 'gitrepo'... +warning: filename contains '?', which is reserved on Windows: 'ø~?' /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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 4 changes to 2 files -new changesets 481bc32a04dd:5c54d5d183a0 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) +added 1 changesets with 1 changes to 1 files +new changesets 5857b17a65d8 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 2f9a607] 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.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) adding changesets adding manifests adding file changes added 3 changesets with 4 changes to 2 files -new changesets 481bc32a04dd:43bbbfaa5d0c +new changesets bb703b190ca5:e503f80403ce progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) ok 19 - fetch special filenames @@ -3710,48 +3806,21 @@ printf "content\næ rø\n" > expected && test_cmp expected actual -ok 19 - fetch special filenames - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo && LC_ALL=C" && - - mkdir -p tmp && cd tmp && - - LC_ALL=C.UTF-8 - export LC_ALL - - ( - hg init hgrepo && - cd hgrepo && - - echo one >> content && - hg add content && - hg commit -m one - ) && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - - echo test >> "æ rø" && - git add "æ rø" && - git commit -m utf-8 && - - git push - ) && - - (cd hgrepo && - hg update && - hg manifest > ../actual - ) && - - printf "content\næ rø\n" > expected && - test_cmp expected actual - +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +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 + a1311d0..2f9a607 master -> master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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] searching for changes @@ -3759,25 +3828,65 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 51d7ebcc7434 +new changesets 0efd63c30ea5 progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - b7551ea..703dc54 master -> origin/master - b7551ea..703dc54 branches/default -> origin/branches/default -Updating b7551ea..703dc54 + 9e533e7..9aea2b8 master -> origin/master + 9e533e7..9aea2b8 branches/default -> origin/branches/default +Updating 9e533e7..9aea2b8 Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Cloning into 'gitrepo'... +ok 20 - push special filenames + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo*" && + + setup_big_push + + ( + cd gitrepo && + + check_push 1 --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 + ) && + + if test "$CAPABILITY_PUSH" = "t" + then + # cap push handles refs one by one + # so it will push all requested it can + check_branch hgrepo default six && + check_branch hgrepo good_branch eight && + check_branch hgrepo bad_branch "bad branch" && + check_branch hgrepo new_branch ten && + check_bookmark hgrepo good_bmark three && + check_bookmark hgrepo bad_bmark1 one && + check_bookmark hgrepo bad_bmark2 one && + check_bookmark hgrepo new_bmark six + else + 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 + fi + Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' @@ -3788,73 +3897,38 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets adding changesets adding manifests adding file changes -adding manifests -adding file changes added 1 changesets with 1 changes to 1 files -added 1 changesets with 1 changes to 1 files -new changesets 80c6a3463f67 -new changesets 80c6a3463f67 -progress revision walk 'bookmarks/master' (0/0) +new changesets e44dff0b0547 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -progress revision 0 'master' (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] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 71edfbb83212 -progress revision 2 'default' (0/1) -[master 8c33908] utf-8 - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 "\303\246 r\303\270" -[master 8c33908] utf-8 +[master 4eb302b] 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.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - ea4b42f..78adf1d branches/default -> origin/branches/default - ea4b42f..78adf1d master -> origin/master -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 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 - 3f5b9cc..8c33908 master -> master searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +new changesets 0586d85e01b7 +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 + 70d0b2f..4a92038 branches/default -> origin/branches/default + 70d0b2f..4a92038 master -> origin/master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..8c33908 master -> master -HEAD is now at ea4b42f substate_hg_a +HEAD is now at 70d0b2f substate_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -3863,8 +3937,14 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +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..4eb302b 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] searching for changes @@ -3872,11 +3952,21 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 1a7b65f115a0 +new changesets 344d1c2efa1b 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 - 2ef6605..b9a7b7b branches/default -> origin/branches/default - 2ef6605..b9a7b7b master -> origin/master + 7ab785b..e6f860f branches/default -> origin/branches/default + 7ab785b..e6f860f master -> origin/master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +HEAD is now at 7ab785b zero_sub_hg_a_x +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -3926,60 +4016,6 @@ check_bookmark hgrepo new_bmark fi -HEAD is now at 2ef6605 zero_sub_hg_a_x -ok 20 - push special filenames - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && - - setup_big_push - - ( - cd gitrepo && - - check_push 1 --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 - ) && - - if test "$CAPABILITY_PUSH" = "t" - then - # cap push handles refs one by one - # so it will push all requested it can - check_branch hgrepo default six && - check_branch hgrepo good_branch eight && - check_branch hgrepo bad_branch "bad branch" && - check_branch hgrepo new_branch ten && - check_bookmark hgrepo good_bmark three && - check_bookmark hgrepo bad_bmark1 one && - check_bookmark hgrepo bad_bmark2 one && - check_bookmark hgrepo new_bmark six - else - 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 - fi - -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 @@ -3999,17 +4035,10 @@ test_sub_update --rebase 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 @@ -4020,28 +4049,14 @@ adding remote bookmark bad_bmark1 adding remote bookmark bad_bmark2 adding remote bookmark good_bmark -adding changesets -adding manifests -added 4 changesets with 4 changes to 1 files -new changesets bbd0333f35c8:42364b9f63cf -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 bbd0333f35c8:42364b9f63cf +new changesets a669a11dbb2b:bd1c657bc5f8 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 8735a01 zero -HEAD is now at 8735a01 zero -HEAD is now at 8735a01 zero -HEAD is now at 8735a01 zero -HEAD is now at e60791f good branch -HEAD is now at e60791f good branch +HEAD is now at 5419750 zero +HEAD is now at 5419750 zero +HEAD is now at 7453af1 good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -4052,9 +4067,9 @@ 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 - e60791f..b27c9b7 branches/good_branch -> branches/good_branch - dbd54a3..d431749 good_bmark -> good_bmark - dbd54a3..7d1a014 master -> master + 7453af1..f93bfab branches/good_branch -> branches/good_branch + d239bfc..20ee2bc good_bmark -> good_bmark + d239bfc..fd7bde4 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) @@ -4065,14 +4080,40 @@ 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. - dbd54a3..7d1a014 master -> master - dbd54a3..d431749 good_bmark -> good_bmark - e60791f..b27c9b7 branches/good_branch -> branches/good_branch + d239bfc..fd7bde4 master -> master + d239bfc..20ee2bc good_bmark -> good_bmark + 7453af1..f93bfab branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 4c5fa24ab9c7:9b329fb3c778 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 356c868 zero +HEAD is now at 356c868 zero +HEAD is now at 060b83c 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -4106,9 +4147,9 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..b27c9b7 branches/good_branch -> branches/good_branch - fffffff..d431749 good_bmark -> good_bmark - fffffff..7d1a014 master -> master + fffffff..c7433cb branches/good_branch -> branches/good_branch + fffffff..5c9dfee good_bmark -> good_bmark + fffffff..08a357d 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) @@ -4119,33 +4160,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. - fffffff..7d1a014 master -> master - fffffff..d431749 good_bmark -> good_bmark - fffffff..b27c9b7 branches/good_branch -> branches/good_branch + fffffff..08a357d master -> master + fffffff..5c9dfee good_bmark -> good_bmark + fffffff..c7433cb 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 c96974c8b632:65ba43a986d1 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ok 21 - remote big push expecting success: @@ -4222,6 +4244,53 @@ fi ) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 5e9d65d1be98:0d81ce6e4cfb +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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 de59a66eb96e:ce8a1430068f +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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 21 - remote big push expecting success: @@ -4298,46 +4367,13 @@ fi ) -/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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into './sub_hg_a'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 b39626a7e508:4729f4a9c03e -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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 18b0a374daf1 +new changesets d60573dae771 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' @@ -4355,23 +4391,13 @@ m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 56eb5916a9f8:acc30013c0c9 +new changesets 96991877fc88:443cde2e13b5 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -4381,30 +4407,23 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) 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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 bad_bmark -adding remote bookmark good_bmark -adding file changes adding remote bookmark bad_bmark adding remote bookmark good_bmark added 3 changesets with 3 changes to 1 files -new changesets d66bb798f055:e5d3c23ee378 -added 3 changesets with 3 changes to 1 files -new changesets d66bb798f055:e5d3c23ee378 -done. -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'bad_branch' (0/2) +new changesets e4e527532d0a:623354def2b3 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) @@ -4412,6 +4431,22 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 4d948e2c7b20 +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 98b17a4..c285999 master -> origin/master + 98b17a4..c285999 branches/default -> origin/branches/default +Updating 98b17a4..c285999 +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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -4426,10 +4461,10 @@ adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets 91d12a785af7 +new changesets a6d6f84cfc89 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 4bb29e2..e2be84a good_bmark -> good_bmark - 4bb29e2..ad4c9a2 master -> master + a206284..caa2b24 good_bmark -> good_bmark + a206284..4045254 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' @@ -4437,71 +4472,29 @@ 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. - 4bb29e2..ad4c9a2 master -> master - 4bb29e2..e2be84a good_bmark -> good_bmark + a206284..4045254 master -> master + a206284..caa2b24 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +Cloning into '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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 91d12a785af7 -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..e2be84a good_bmark -> good_bmark - fffffff..ad4c9a2 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..ad4c9a2 master -> master - fffffff..e2be84a 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 f90ddd321472 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - b139bfd..7d01015 master -> origin/master - b139bfd..7d01015 branches/default -> origin/branches/default -Updating b139bfd..7d01015 -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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 @@ -4511,21 +4504,38 @@ or locale.getdefaultlocale()[1] progress revision 3 'bad_branch' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 5d6ecf4..c36c0c3 branches/bad_branch -> origin/branches/bad_branch - 4bb29e2..c36c0c3 bad_bmark -> origin/bad_bmark - + e2be84a...4bb29e2 good_bmark -> origin/good_bmark (forced update) - + ad4c9a2...4bb29e2 master -> origin/master (forced update) -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 - 5d6ecf4..c36c0c3 branches/bad_branch -> origin/branches/bad_branch - 4bb29e2..ad4c9a2 branches/default -> origin/branches/default - 4bb29e2..c36c0c3 bad_bmark -> origin/bad_bmark -/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. + f31ce1d..070d715 branches/bad_branch -> origin/branches/bad_branch + a206284..070d715 bad_bmark -> origin/bad_bmark + + caa2b24...a206284 good_bmark -> origin/good_bmark (forced update) + + 4045254...a206284 master -> origin/master (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 +adding remote bookmark bad_bmark +adding remote bookmark good_bmark +added 3 changesets with 3 changes to 1 files +new changesets 450d5bab7217:46c58b6b67c4 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 '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 7548bba04c7e +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 + 8926292..c8c4685 branches/default -> origin/branches/default + 8926292..c8c4685 master -> origin/master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +HEAD is now at 8926292 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -4534,8 +4544,6 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -4546,8 +4554,8 @@ 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 - 4bb29e2..e2be84a good_bmark -> good_bmark - 4bb29e2..ad4c9a2 master -> master + a206284..caa2b24 good_bmark -> good_bmark + a206284..4045254 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' @@ -4555,8 +4563,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. - 4bb29e2..ad4c9a2 master -> master - 4bb29e2..e2be84a good_bmark -> good_bmark + a206284..4045254 master -> master + a206284..caa2b24 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 @@ -4603,12 +4611,102 @@ 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.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 a4812ba4bbd2 +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 + 2c11df5..cfa9c02 branches/default -> origin/branches/default + 2c11df5..cfa9c02 master -> origin/master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +HEAD is now at 2c11df5 zero_sub_hg_a_x +Successfully rebased and updated detached HEAD. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 8b1016fbcf20 +new changesets e02c04bd7bc4 +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..9696fbc good_bmark -> good_bmark + fffffff..b52de3b 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..b52de3b master -> master + fffffff..9696fbc 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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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-push/bin/git-remote-hg: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 + 118ca17..5c0ece1 branches/bad_branch -> origin/branches/bad_branch + 7281768..b52de3b branches/default -> origin/branches/default + 7281768..5c0ece1 bad_bmark -> origin/bad_bmark /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -4624,12 +4722,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. -progress revision 2 'default' (0/1) ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a - b789bd5..f149199 branches/default -> origin/branches/default - b789bd5..f149199 master -> origin/master ok 22 - remote big push non fast forward expecting success: @@ -4674,88 +4768,15 @@ 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -HEAD is now at b789bd5 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 5cb329b6712b -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 - 0e03331..2f36fe6 branches/default -> origin/branches/default - 0e03331..2f36fe6 master -> origin/master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -HEAD is now at 0e03331 zero_sub_hg_a_x -Successfully rebased and updated detached HEAD. -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -ok 10 - subcommand sub subsequent recursive update -- rebase - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --merge - Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 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 5db23b3cb42d:7ea1cb5235ac adding changesets adding manifests adding file changes @@ -4763,24 +4784,13 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 2b0bc565d382:eb9d83c86dcb -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) +new changesets f2cdc2bbbfae:8f8927958937 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at d94f45d zero -HEAD is now at 901005e zero -HEAD is now at d94f45d zero -HEAD is now at 901005e zero -HEAD is now at c1b4c1c good branch -HEAD is now at 0aa888f 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 +HEAD is now at b5b70be zero +HEAD is now at b5b70be zero +HEAD is now at 8f37a55 good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -4796,22 +4806,48 @@ 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 - + 9b118c4...6c2c803 branches/bad_branch -> branches/bad_branch (forced update) - c1b4c1c..3951ed9 branches/good_branch -> branches/good_branch - + 43085c9...c3f3698 bad_bmark1 -> bad_bmark1 (forced update) - + 43085c9...4c12d28 bad_bmark2 -> bad_bmark2 (forced update) - 43085c9..61397a5 good_bmark -> good_bmark - 43085c9..a718ecf master -> master + + 6c0a317...84652c0 branches/bad_branch -> branches/bad_branch (forced update) + 8f37a55..d8fa744 branches/good_branch -> branches/good_branch + + 3d3641b...c28f96d bad_bmark1 -> bad_bmark1 (forced update) + + 3d3641b...ad9246e bad_bmark2 -> bad_bmark2 (forced update) + 3d3641b..2853040 good_bmark -> good_bmark + 3d3641b..68d859e master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - 43085c9..a718ecf master -> master - 43085c9..61397a5 good_bmark -> good_bmark - c1b4c1c..3951ed9 branches/good_branch -> branches/good_branch + 3d3641b..68d859e master -> master + 3d3641b..2853040 good_bmark -> good_bmark + 8f37a55..d8fa744 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + 43085c9...c3f3698 bad_bmark1 -> bad_bmark1 (forced update) - + 43085c9...4c12d28 bad_bmark2 -> bad_bmark2 (forced update) - + 9b118c4...6c2c803 branches/bad_branch -> branches/bad_branch (forced update) + + 3d3641b...c28f96d bad_bmark1 -> bad_bmark1 (forced update) + + 3d3641b...ad9246e bad_bmark2 -> bad_bmark2 (forced update) + + 6c0a317...84652c0 branches/bad_branch -> branches/bad_branch (forced update) +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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 be009fb59878:1d876e82c133 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at b5a99a5 zero +HEAD is now at b5a99a5 zero +HEAD is now at 5a3503c good branch Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') @@ -4822,6 +4858,10 @@ adding changesets adding manifests adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 708fa885aea7:435a3c779cd8 +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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -4870,37 +4910,22 @@ 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...d998c25 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...0a3e118 branches/good_branch -> branches/good_branch (forced update) - + fffffff...f1d711b bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...18e906f bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...b1634fc good_bmark -> good_bmark (forced update) - + fffffff...1568f56 master -> master (forced update) + + fffffff...fbb94f6 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...479cdfa branches/good_branch -> branches/good_branch (forced update) + + fffffff...28b41f4 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...355de20 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...e954d06 good_bmark -> good_bmark (forced update) + + fffffff...9b98dc0 master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...1568f56 master -> master (forced update) - + fffffff...b1634fc good_bmark -> good_bmark (forced update) - + fffffff...0a3e118 branches/good_branch -> branches/good_branch (forced update) + + fffffff...9b98dc0 master -> master (forced update) + + fffffff...e954d06 good_bmark -> good_bmark (forced update) + + fffffff...479cdfa branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...f1d711b bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...18e906f bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...d998c25 branches/bad_branch -> branches/bad_branch (forced update) -added 2 changesets with 3 changes to 3 files -new changesets 265043bc1d58:eb9d29bb802c -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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into './sub_hg_a'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) + + fffffff...28b41f4 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...355de20 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...fbb94f6 branches/bad_branch -> branches/bad_branch (forced update) ok 23 - remote big push force expecting success: @@ -4940,13 +4965,24 @@ 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-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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 4e0629eab798:fb9e20cf7577 +new changesets e3950010871e:34359096705e 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:154: SyntaxWarning: invalid escape sequence '\w' @@ -4968,7 +5004,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 6033a28b73b0 +new changesets 836626408bf9 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' @@ -4986,6 +5022,23 @@ m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 5d4eaf4ab0b1:8a67f7f88662 +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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into './sub_hg_b/sub_git'... +done. ok 23 - remote big push force expecting success: @@ -5025,23 +5078,6 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets c0447d73aca6:c5c16bc0ccef -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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into './sub_hg_b/sub_git'... -done. /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5053,20 +5089,30 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 5ca11ec81a7a +new changesets 2a1516e11e00 progress revision 2 'default' (0/1) -Cloning into 'gitrepo'... From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 5047bad..dd6cc48 master -> origin/master - 5047bad..dd6cc48 branches/default -> origin/branches/default + b9fbe84..34fde85 master -> origin/master + b9fbe84..34fde85 branches/default -> origin/branches/default +Updating b9fbe84..34fde85 +Fast-forward + .hgsubstate | 2 +- + 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Updating 5047bad..dd6cc48 -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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 @@ -5078,23 +5124,13 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets e5faca2630d3:8a5045615f19 +new changesets 1c237ab47e27:d989629221e1 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-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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -HEAD is now at 3c310d1 zero -HEAD is now at 3c310d1 zero -HEAD is now at d62695a good branch +HEAD is now at 7470967 zero +HEAD is now at 7470967 zero +HEAD is now at 45bb427 good branch /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 @@ -5102,22 +5138,17 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets c6afb7b7c775 +new changesets 30e8a8ed9d1d 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 - 1f88331..bcfcf8b branches/default -> origin/branches/default - 1f88331..bcfcf8b master -> origin/master -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) + 70058c4..346299d branches/default -> origin/branches/default + 70058c4..346299d master -> origin/master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -HEAD is now at 1f88331 substate_hg_a -Updating 1f88331..bcfcf8b +HEAD is now at 70058c4 substate_hg_a +Updating 70058c4..346299d Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -5129,22 +5160,6 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 ec2d770b19a3:a5dbba1f1d28 -/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 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5155,9 +5170,9 @@ 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 - d62695a..29bb044 branches/good_branch -> branches/good_branch - 802c6ae..18a93d3 good_bmark -> good_bmark - 802c6ae..fe4f5df master -> master + 45bb427..4942555 branches/good_branch -> branches/good_branch + 48ae70b..9f99738 good_bmark -> good_bmark + 48ae70b..32fe7f2 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) @@ -5168,33 +5183,43 @@ 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. - 802c6ae..fe4f5df master -> master - 802c6ae..18a93d3 good_bmark -> good_bmark -adding changesets - d62695a..29bb044 branches/good_branch -> branches/good_branch -adding manifests + 48ae70b..32fe7f2 master -> master + 48ae70b..9f99738 good_bmark -> good_bmark + 45bb427..4942555 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark -adding file changes * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) -added 1 changesets with 1 changes to 1 files ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) -new changesets 9d281af6db48 +/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 a0af9188f537 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 - f4059f8..3cf8b21 branches/default -> origin/branches/default - f4059f8..3cf8b21 master -> origin/master + 472097e..0d68fa8 branches/default -> origin/branches/default + 472097e..0d68fa8 master -> origin/master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -HEAD is now at f4059f8 zero_sub_hg_a_x -Updating f4059f8..3cf8b21 +HEAD is now at 472097e zero_sub_hg_a_x +Updating 472097e..0d68fa8 Fast-forward -HEAD is now at fdbb576 zero 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5205,25 +5230,16 @@ 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 - d62695a..29bb044 branches/good_branch -> branches/good_branch - 802c6ae..18a93d3 good_bmark -> good_bmark - 802c6ae..fe4f5df master -> master + 45bb427..4942555 branches/good_branch -> branches/good_branch + 48ae70b..9f99738 good_bmark -> good_bmark + 48ae70b..32fe7f2 master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - 802c6ae..fe4f5df master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') - 802c6ae..18a93d3 good_bmark -> good_bmark -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) - d62695a..29bb044 branches/good_branch -> branches/good_branch + 48ae70b..32fe7f2 master -> master + 48ae70b..9f99738 good_bmark -> good_bmark + 45bb427..4942555 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -HEAD is now at fdbb576 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] no changes found @@ -5235,7 +5251,11 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -HEAD is now at 6a8ea5c good branch +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 11 - subcommand sub subsequent recursive update -- merge expecting success: @@ -5243,6 +5263,69 @@ test_sub_foreach +/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 366348676c98:8246125da1a4 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 1542418 zero +HEAD is now at 1542418 zero +HEAD is now at 7b02d64 good branch +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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..62e9fb5 branches/good_branch -> branches/good_branch + fffffff..e897e12 good_bmark -> good_bmark + fffffff..83972b6 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..83972b6 master -> master + fffffff..e897e12 good_bmark -> good_bmark + fffffff..62e9fb5 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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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..62e9fb5 branches/good_branch -> branches/good_branch + fffffff..e897e12 good_bmark -> good_bmark + fffffff..83972b6 master -> master + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + fffffff..83972b6 master -> master + fffffff..e897e12 good_bmark -> good_bmark + fffffff..62e9fb5 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 expecting success: @@ -5288,54 +5371,11 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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..6bbb7fb branches/good_branch -> branches/good_branch - fffffff..51a42ac good_bmark -> good_bmark - fffffff..20bf1ad 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..20bf1ad master -> master - fffffff..51a42ac good_bmark -> good_bmark - fffffff..6bbb7fb 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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..6bbb7fb branches/good_branch -> branches/good_branch - fffffff..51a42ac good_bmark -> good_bmark - fffffff..20bf1ad master -> master - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - fffffff..20bf1ad master -> master - fffffff..51a42ac good_bmark -> good_bmark - fffffff..6bbb7fb branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.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 24 - remote big push dry-run expecting success: @@ -5381,11 +5421,21 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -[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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 7ed47970a7ef:19c30d633e48 +Cloning into 'gitrepo'... +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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5401,40 +5451,46 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 9e364151d7b2:984e0aa468e9 +new changesets 90efd8b153b9:f657d70b2d7e +/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] progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into './sub_hg_a'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +HEAD is now at 8c7cd52 zero +HEAD is now at 8c7cd52 zero +HEAD is now at 8d5fd95 good branch /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 07ee941b3391:9052caa9a93f -HEAD is now at ac1e61c zero +new changesets 061ec5faa69e:3c7bcc6592ed progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -HEAD is now at ac1e61c zero -HEAD is now at 9ed2695 good branch -/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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into './sub_hg_a'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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_hg_a/sub_hg_a_x'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5445,29 +5501,31 @@ 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 - + 0627018...7950a9a branches/bad_branch -> branches/bad_branch (forced update) - 9ed2695..8daa660 branches/good_branch -> branches/good_branch - + 9ae08d4...a9cbdad bad_bmark1 -> bad_bmark1 (forced update) - + 9ae08d4...1bbf2c4 bad_bmark2 -> bad_bmark2 (forced update) - 9ae08d4..6c98474 good_bmark -> good_bmark - 9ae08d4..2a0df8b master -> master + + bc742d1...ade51c3 branches/bad_branch -> branches/bad_branch (forced update) + 8d5fd95..b25c47e branches/good_branch -> branches/good_branch + + 2fda572...7d4d149 bad_bmark1 -> bad_bmark1 (forced update) + + 2fda572...2caaec3 bad_bmark2 -> bad_bmark2 (forced update) + 2fda572..30a3e6b good_bmark -> good_bmark + 2fda572..eccd170 master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - 9ae08d4..2a0df8b master -> master - 9ae08d4..6c98474 good_bmark -> good_bmark - 9ed2695..8daa660 branches/good_branch -> branches/good_branch + 2fda572..eccd170 master -> master + 2fda572..30a3e6b good_bmark -> good_bmark + 8d5fd95..b25c47e branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + 9ae08d4...a9cbdad bad_bmark1 -> bad_bmark1 (forced update) - + 9ae08d4...1bbf2c4 bad_bmark2 -> bad_bmark2 (forced update) - + 0627018...7950a9a branches/bad_branch -> branches/bad_branch (forced update) + + 2fda572...7d4d149 bad_bmark1 -> bad_bmark1 (forced update) + + 2fda572...2caaec3 bad_bmark2 -> bad_bmark2 (forced update) + + bc742d1...ade51c3 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 4463d77f6add:9d3d330596bd -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +added 1 changesets with 1 changes to 1 files +new changesets d9c1108c49e4 +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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5476,7 +5534,7 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into './sub_hg_a/sub_hg_a_x'... +Cloning into './sub_hg_b'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5486,37 +5544,25 @@ adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets f105a87e20f5 -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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +added 2 changesets with 3 changes to 3 files +new changesets e1eb636a72bf:896eec332e58 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into './sub_hg_b'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 3f353d707fa4:87f020479702 -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] adding changesets @@ -5526,33 +5572,23 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 4cb4f848b0d4:cb9a46980961 +new changesets d4dc2bf77f07:1f27b6479d58 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into './sub_hg_b/sub_git'... -done. -HEAD is now at e094669 zero -HEAD is now at e094669 zero -HEAD is now at 7b66a23 good branch /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] +HEAD is now at 72a99ee zero /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +HEAD is now at 72a99ee zero /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +HEAD is now at e6b8ac6 good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5573,34 +5609,9 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -ok 25 - remote big push force dry-run - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero && - echo one > content && - hg commit -m one - ) && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git reset --hard HEAD^ && - echo two > content && - git commit -a -m two && - test_expect_code 1 git push && - test_expect_code 1 git push - ) - -hg 28bd377badbecb16a9d372283ced1e8da406b894 9d3d330596bd789a37271e9c7b46e66108776e0b sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo -hg 70470e418399aac70b8605e23d1a00573a616ac2 f105a87e20f5b65878bc1a3b7f07fea89c86f359 sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg 9301ca5b516fe504c12d253b24609e51c1ba8f19 87f0204797028833b9558cd397afadd1add17ed4 sub_hg_b /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg a12fb0d38e94e20d3962fe4cb633690fd3c18d69 3c7bcc6592ed9272a4496f895fa11aa50fba3eab sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg d945cfcdd72d836954c10035e801c32ccfd7ad8f d9c1108c49e4748d467f9f15456a18a42522ff6e sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg e17301886bdcac23fca851e40f123b9e068b8857 896eec332e58c7e86da43fd2366b5cc3f9638ec6 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 @@ -5642,38 +5653,22 @@ 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...63909f5 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...f258c6e branches/good_branch -> branches/good_branch (forced update) - + fffffff...d4670c6 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...a033f3b bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...a29b7f4 good_bmark -> good_bmark (forced update) - + fffffff...365926e master -> master (forced update) + + fffffff...f7cf714 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...607b6c1 branches/good_branch -> branches/good_branch (forced update) + + fffffff...a156404 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...23ed8d7 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...b782403 good_bmark -> good_bmark (forced update) + + fffffff...61aae73 master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...365926e master -> master (forced update) - + fffffff...a29b7f4 good_bmark -> good_bmark (forced update) - + fffffff...f258c6e branches/good_branch -> branches/good_branch (forced update) + + fffffff...61aae73 master -> master (forced update) + + fffffff...b782403 good_bmark -> good_bmark (forced update) + + fffffff...607b6c1 branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...d4670c6 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...a033f3b bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...63909f5 branches/bad_branch -> branches/bad_branch (forced update) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 2 changes to 1 files -new changesets bfe89cef651f:56816f9f353b -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) + + fffffff...a156404 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...23ed8d7 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...f7cf714 branches/bad_branch -> branches/bad_branch (forced update) ok 25 - remote big push force dry-run expecting success: @@ -5699,31 +5694,31 @@ test_expect_code 1 git push ) -HEAD is now at 871ea50 zero -[master 8e49876] two - 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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' -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. +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets 6b439ee7a0f4:58cb1c72970e +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +HEAD is now at 3f3f436 zero +[master 6961cf8] 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5734,7 +5729,7 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets b4b52bc57f82:7d6acca1ca1e +new changesets 71dbb06765cf:9b73a251f714 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. @@ -5742,9 +5737,42 @@ WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found +ok 25 - remote big push force dry-run + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero && + echo one > content && + hg commit -m one + ) && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git reset --hard HEAD^ && + echo two > content && + git commit -a -m two && + test_expect_code 1 git push && + test_expect_code 1 git push + ) + 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' +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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' @@ -5752,7 +5780,18 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) Cloning into './sub_hg'... -Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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' 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. @@ -5788,74 +5827,31 @@ ! grep feature-a out ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 changesets adding manifests -adding manifests -adding file changes adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 8369397567ee:1b972cae467f added 1 changesets with 1 changes to 1 files -new changesets b8c4c3b054cc +new changesets a586411b75a4 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -HEAD is now at 07dfc0e zero -Cloning into 'gitrepo'... url = foobar -[master 5b894f9] two - 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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] -/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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -WARNING: capability_push is disabled, only do so when really sure /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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-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. -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 13 - subcommand sub sync expecting success: @@ -5920,17 +5916,57 @@ check_branch hgclone/sub_hg default one_sub_hg && check hgclone/sub_git HEAD one_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 feature-a added 2 changesets with 2 changes to 1 files -new changesets ad87119b4140:3faa089df742 +new changesets 9c9246c3cedd:6f8c0d06f1d0 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +HEAD is now at 2c5d37b zero +[master dc532ad] 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-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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] -progress revision walk 'bookmarks/master' (1/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) 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. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 feature-a +added 2 changesets with 2 changes to 1 files +new changesets 9c9246c3cedd:7e96ddec264f +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 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' @@ -5977,6 +6013,11 @@ 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 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/tmp/hgrepo @@ -6025,81 +6066,85 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -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 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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] +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) adding changesets adding manifests adding file changes -adding remote bookmark feature-a -adding changesets -created new head -adding manifests -adding file changes -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ -added 2 changesets with 2 changes to 1 files -new changesets c8ffa91ac631:634d162ff381 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) added 2 changesets with 3 changes to 3 files -new changesets c324a0963952:5b383ebbfbac +new changesets 9567a738f4c9:2d33098447c2 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. +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-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets aee35ee55b1b:a12c88d69503 -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 remote bookmark feature-a +added 2 changesets with 2 changes to 1 files +new changesets 4f1760d63577:a537a4cd76ff +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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into './sub_hg'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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] -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.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +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. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 64ef1a33d0ae +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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into './sub_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] +Cloning into './sub_git'... +done. 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 +[detached HEAD 4be60f2] one_sub_hg + 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -6148,54 +6193,91 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files (+1 heads) +new changesets 83df8e2a7249:1177e194dd04 +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 /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, 1 files removed, 0 files unresolved +no changes found +searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 456a0c6f5e1d -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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg + fffffff..4be60f2 HEAD -> master +1 files updated, 0 files merged, 1 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 + 7ed4451..4be60f2 branches/default -> origin/branches/default +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +[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 +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 -Cloning into './sub_git'... searching for changes adding changesets adding manifests adding file changes -done. added 1 changesets with 1 changes to 1 files -new changesets a91fcfbd9ed1 +new changesets abf9f4c0c94e WARNING: Branch 'default' has more than one head, consider merging +/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] 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/tmp/hgrepo - + cddad21...e215573 branches/default -> origin/branches/default (forced update) - + cddad21...e215573 master -> origin/master (forced update) -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -[detached HEAD 4b6ad12] one_sub_hg + + c86848c...cb4d002 branches/default -> origin/branches/default (forced update) + + c86848c...cb4d002 master -> origin/master (forced update) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Updating ./sub_hg to bc51d28f0e3f220a61034f69c6db72348fcf28f7 [git 4be60f2] +Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] +diff --git a/.hgsubstate b/.hgsubstate +index 810e01e..14a2e5c 100644 +--- a/.hgsubstate ++++ b/.hgsubstate +@@ -1,2 +1,2 @@ +-e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git +-64ef1a33d0ae88a3cf8444413bf3decc54c6b947 sub_hg ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git ++bc51d28f0e3f220a61034f69c6db72348fcf28f7 sub_hg + M .hgsubstate +[master 9176b18] update_sub Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) + 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 ok 28 - fetch multiple independent histories expecting success: @@ -6222,121 +6304,140 @@ git push origin bookmark ) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files created new head -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - fffffff..4b6ad12 HEAD -> 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] 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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) +no changes found /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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..9176b18 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] -/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 adding changesets adding manifests -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - bab1f52..4b6ad12 branches/default -> origin/branches/default adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets 3d02bf69f843:7bb6a69f732a +new changesets a81db8f7bcb4:8f2bf9b35cc7 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) -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +Cloning into '/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgclone/sub_git'... +done. 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 -To /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git - * [new branch] HEAD -> new +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 1 files updated, 0 files merged, 1 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] +0 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Updating ./sub_hg to e3198015cb72a01ce7f34540c768cf4308723af8 [git 4b6ad12] -Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] -diff --git a/.hgsubstate b/.hgsubstate -index d54dd27..d164164 100644 ---- a/.hgsubstate -+++ b/.hgsubstate -@@ -1,2 +1,2 @@ --e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --456a0c6f5e1db12f8d20a00e19b87d78b4100739 sub_hg -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+e3198015cb72a01ce7f34540c768cf4308723af8 sub_hg - M .hgsubstate -[master 98ad991] 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:154: SyntaxWarning: invalid escape sequence '\w' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 adding changesets adding manifests adding file changes adding remote bookmark bookmark -searching for changes -adding changesets -adding manifests -adding file changes +added 1 changesets with 1 changes to 1 files +new changesets e457d3a8692b +WARNING: Ignoring invalid bookmark 'bookmark' +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] -added 1 changesets with 1 changes to 1 files -added 1 changesets with 1 changes to 1 files -new changesets fdc1bdbd9641 +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 + ) + searching for changes adding changesets adding manifests adding file changes -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - fffffff..98ad991 master -> master added 1 changesets with 1 changes to 1 files -new changesets 3481268a640a +new changesets 7c3ebbae3438 WARNING: Branch 'default' has more than one head, consider merging -WARNING: Ignoring invalid bookmark 'bookmark' +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) progress revision walk 'branches/default' (2/2) progress revision 0 'default' (0/2) -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +[bookmark 5b0dc6e] b + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 b From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + 5d6ab8b...b52aa2b branches/default -> origin/branches/default (forced update) - + 5d6ab8b...b52aa2b master -> origin/master (forced update) -Cloning into '/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgclone/sub_git'... + + ca59b16...32a1062 branches/default -> origin/branches/default (forced update) + + ca59b16...32a1062 master -> origin/master (forced update) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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: @@ -6363,26 +6464,6 @@ git push origin bookmark ) -done. -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 5531f56] b - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 b -Switched to a new branch 'new' -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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/bin/git-remote-hg: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: Ignoring invalid bookmark 'bookmark' searching for changes @@ -6392,7 +6473,6 @@ 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 -0 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 29 - clone remote with null bookmark, then push expecting success: @@ -6418,82 +6498,50 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 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 - ) - adding changesets adding manifests adding file changes adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets 085a6774744d +new changesets 7c6535e74bab WARNING: Ignoring invalid bookmark 'bookmark' 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 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 96ea439] b +[bookmark a3f52bc] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b +adding changesets +adding manifests +adding file changes /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +added 2 changesets with 2 changes to 1 files /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) +new changesets 25ac30089bf6:6955e5a2feaf +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.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 no changes found WARNING: Ignoring invalid bookmark 'bookmark' searching for changes @@ -6501,18 +6549,9 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -adding changesets -adding manifests -adding file changes -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new branch] bookmark -> bookmark -added 2 changesets with 2 changes to 1 files -new changesets 1b75e0d9102a:a65fdfae1c7f -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 29 - clone remote with null bookmark, then push +ok 30 - notes -expecting success: +checking known breakage: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -6520,19 +6559,27 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one && - echo two > content && - hg commit -m two + hg commit -m one ) && git clone "hg::hgrepo" gitrepo && + + ( + 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 -ok 30 - notes +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 -checking known breakage: +expecting success: test_when_finished "rm -rf hgrepo gitrepo" && ( @@ -6540,68 +6587,92 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one - ) && - - git clone "hg::hgrepo" gitrepo && - - ( - cd gitrepo && + hg commit -m one && echo two > content && - git commit -a -m two && - git push + hg commit -m two ) && + git clone "hg::hgrepo" gitrepo && hg -R hgrepo log --template "{node}\n\n" > expected && git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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] -/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 1 changesets with 1 changes to 1 files -new changesets f62c911fb5fd -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +added 2 changesets with 3 changes to 3 files +new changesets 0ce8dbc6ad1e:bcd03dc45167 adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -new changesets d53b9d6735dd:095cb5c78474 -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -[master 4494a20] two +Cloning into 'gitrepo'... +added 1 changesets with 1 changes to 1 files +new changesets d32822a46817 +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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +[master 0b9e21b] 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 1 files +new changesets 7e3168e0145c:388127785b0f +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.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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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'... +no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +searching for changes +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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 + 3501e0d..0b9e21b master -> master ok 30 - notes expecting success: @@ -6628,31 +6699,20 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -Cloning into 'gitrepo'... -no changes found -searching for changes -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - b3c821a..4494a20 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] ---- expected 2025-09-14 22:04:13.360377776 +0000 -+++ actual 2025-09-14 22:04:13.440378382 +0000 +new changesets bea8877378dc +--- expected 2026-10-18 04:32:51.067174238 +0000 ++++ actual 2026-10-18 04:32:51.103174238 +0000 @@ -1,4 +1,3 @@ --6f5f8f722b1868f480ea11526d8dffb5459276b3 +-600123d4f3eaa6c7331d396ae5d08216d6276135 - f62c911fb5fdbbc4c745b8bfea23c9c6df1cb711 + d32822a46817bb5e944a4627c708bed68a19a496 -adding changesets -adding manifests -adding file changes not ok 31 - push updates notes # TODO known breakage expecting success: @@ -6679,14 +6739,11 @@ check_bookmark hgrepo feature-a two -added 2 changesets with 3 changes to 3 files -new changesets 6a9e73c7b433:9fb75282cb1d -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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] @@ -6694,71 +6751,108 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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'... /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 './sub_git'... +done. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +[detached HEAD cea1af1] one_sub_git + 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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 1e87c0528090 +new changesets 0a7a2daa5381 +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.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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... -[master 8393120] two +[master 53e97de] 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:154: SyntaxWarning: invalid escape sequence '\w' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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/bin/git-remote-hg: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 + 227c640033a3d883306c1034e901fb2379656e4a ./sub_hg_a (heads/master) +-737037b61d622abe44144392c80b98fcc66eabc1[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) + 227c640033a3d883306c1034e901fb2379656e4a ./sub_hg_a (heads/master) +-737037b61d622abe44144392c80b98fcc66eabc1[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7ad4462bf266 -/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 +new changesets 0a7a2daa5381 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +[master 53e97de] 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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 -new changesets 1e87c0528090 -no changes found -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..53e97de 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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) +ok 15 - subcommand sub status + +# passed all 15 test(s) +1..15 +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..8393120 master -> master -[master 8393120] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 8f94757..53e97de master -> master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -6789,73 +6883,15 @@ 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] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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'... -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 -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -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 - 6908908..8393120 master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 - 9e07ab3521beadfb6f089de8b14750076f32b4da ./sub_hg_a (heads/master) --81710ef6bd85e3adccad28e9653a7f377852cb22[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) - 9e07ab3521beadfb6f089de8b14750076f32b4da ./sub_hg_a (heads/master) --81710ef6bd85e3adccad28e9653a7f377852cb22[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~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 -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 32 - push bookmark without changesets expecting success: @@ -6878,34 +6914,34 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual -+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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 f5cf5e7b8a37 +new changesets 5e5bdb3af501 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 52c0e9c] two +[master c50c71c] 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-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 @@ -6913,29 +6949,37 @@ 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..52c0e9c master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) + fffffff..c50c71c master -> 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 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 3503f96eda32 +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 1 local changesets published -adding changesets -adding manifests -adding file changes 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 -added 1 changesets with 1 changes to 1 files -new changesets 6c2db065fb6c -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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 32 - push bookmark without changesets expecting success: @@ -6958,26 +7002,18 @@ git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 1 changesets with 1 changes to 1 files -new changesets ab19b1dbbe7a +new changesets a00d407b939d progress revision 1 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - b1fabe3..a3b7abe master -> origin/master - b1fabe3..a3b7abe branches/default -> origin/branches/default + ba56fde..b8847e7 master -> origin/master + ba56fde..b8847e7 branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -Updating b1fabe3..a3b7abe +Updating ba56fde..b8847e7 Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -7028,15 +7064,16 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 86500abe2b85 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +new changesets 7fd6bdbc0fe7 marked working directory as branch feature (branches are permanent and global, did you want a bookmark?) +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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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] searching for changes @@ -7044,13 +7081,13 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets bec8a7f7be97 +new changesets 01b648aec676 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 - 8d38a1e..cfb3fa0 master -> origin/master - 8d38a1e..cfb3fa0 branches/default -> origin/branches/default + e790f60..db968aa master -> origin/master + e790f60..db968aa branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -Updating 8d38a1e..cfb3fa0 +Updating e790f60..db968aa Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -7090,7 +7127,6 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual -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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') @@ -7103,10 +7139,8 @@ adding changesets adding manifests adding file changes -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets eeafc27ead2c:d048d2768139 +new changesets 7fd6bdbc0fe7:a381d63151eb progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) @@ -7129,8 +7163,9 @@ adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - b58c7bb..8aae210 master -> master -1 files updated, 0 files merged, 0 files removed, 0 files unresolved + 7b20770..869fcb8 master -> master +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) ok 34 - push merged named branch expecting success: @@ -7155,21 +7190,31 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual +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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 079ed72864ba:168f6690e2c3 +new changesets 424120a5e98a:ef182bf3bb7b 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 Auto-merging content Merge made by the 'ort' strategy. content | 2 +- @@ -7178,7 +7223,13 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 366f9dbce2da +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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -7191,23 +7242,20 @@ 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..ae3661c master -> 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] +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..c38b617 master -> master 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 -new changesets 42d82caf6578 -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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new tag] v1.0 -> v1.0 ok 34 - push merged named branch expecting success: @@ -7232,18 +7280,6 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && 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] -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 tag] v1.0 -> v1.0 ok 35 - light tag sets author expecting success: @@ -7284,34 +7320,39 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 6f1353fabf81 +new changesets 315a51248dfc progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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] +Cloning into 'gitrepo'... no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') searching for changes +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) 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 -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 2 changes to 1 files +new changesets 4f5171381b1c:5b75514d0192 ok 35 - light tag sets author expecting success: @@ -7341,11 +7382,6 @@ hg -R hgrepo log --template="{branch}\n" -r tip > actual && test_cmp expected actual -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets c64abcd30287:fa7b47b52aae progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'feature' (0/1) @@ -7356,8 +7392,6 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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/bin/git-remote-hg: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 @@ -7370,11 +7404,6 @@ 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 tag] v1.0 -> v1.0 -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 36 - push tag different branch expecting success: @@ -7395,13 +7424,20 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 1 files -new changesets bd4c12afedd6:cfc4e814f0fb +new changesets 1c7017f98e24:383f94fed913 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'feature' (0/1) @@ -7415,6 +7451,7 @@ /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 +Cloning into 'gitrepo'... searching for changes adding changesets adding manifests @@ -7422,27 +7459,6 @@ 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" && - - ( - 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 - ) && - - git clone "hg::hgrepo" gitrepo && - check_files gitrepo - -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -7455,10 +7471,10 @@ adding manifests adding file changes added 2 changesets with 1 changes to 1 files -new changesets 0da60817d42d:0becf43619c5 +new changesets a4340aa7894d:e5aa8837abd6 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -ok 37 - cloning a removed file works +ok 36 - push tag different branch expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -7467,34 +7483,17 @@ hg init hgrepo && cd hgrepo && - echo test > dir_or_file && - hg add dir_or_file && + echo test > test_file && + hg add test_file && hg commit -m add && - hg rm dir_or_file && - mkdir dir_or_file && - echo test > dir_or_file/test_file && - hg add dir_or_file/test_file && - hg commit -m replase + hg rm test_file && + hg commit -m remove ) && git clone "hg::hgrepo" gitrepo && - check_files gitrepo "dir_or_file/test_file" + check_files gitrepo -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 bb4d93e26e84:c3d22407ab81 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ok 37 - cloning a removed file works expecting success: @@ -7519,19 +7518,33 @@ check_files gitrepo "dir_or_file/test_file" 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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 +adding manifests +adding file changes added 2 changesets with 2 changes to 2 files -new changesets e8105d8092b4:859b40bbb18b +new changesets 3c4ce9637bda:c2603744527b +added 2 changesets with 1 changes to 1 files +new changesets f92a37f4150c:19c191a866db +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 38 - cloning a file replaced with a directory @@ -7559,20 +7572,48 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file" +ok 37 - cloning a removed file works + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + 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 + ) && + + 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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 bd8dfc34c64c:21dc7f72f1e3 +new changesets 8c92271f66c1:da900893773a 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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 38 - cloning a file replaced with a directory expecting success: @@ -7598,11 +7639,6 @@ 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 @@ -7611,7 +7647,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets e61e0ea6465c:d23ce8941361 +new changesets a31f1b21fc1b:72932d2ec507 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 39 - clone replace directory with a file @@ -7637,22 +7673,35 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" +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-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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] adding changesets adding manifests adding file changes +Cloning into 'gitrepo'... added 2 changesets with 2 changes to 2 files -new changesets 2131df8700f8:67569d316f65 +new changesets 0d5258a40348:c0ae36c2d8bf progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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 ok 39 - clone replace directory with a file expecting success: @@ -7676,27 +7725,14 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" -marked working directory as branch parent/child -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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 3 changesets with 3 changes to 1 files -new changesets f9ac0c2e2cbb:31a0beb16268 +new changesets 651a066c5218:d4bd356247d5 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 +(branches are permanent and global, did you want a bookmark?) ok 40 - clone can ignore invalid refnames expecting success: @@ -7728,23 +7764,38 @@ marked working directory as branch parent/child Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 29aaf3e0b79c +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] -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files -new changesets ed763c328cf3:0ab401bc84a5 +new changesets e45d9efba5c8:4c0f54490c34 WARNING: Ignoring matched branch parent/child +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'parent' (0/1) @@ -7752,13 +7803,11 @@ 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 -new changesets 6fd203f6f491 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) ok 40 - clone can ignore invalid refnames expecting success: @@ -7788,27 +7837,9 @@ test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 tag] v1.0 -> v1.0 -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 41 - push annotated tag expecting success: @@ -7832,48 +7863,39 @@ 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. - or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets de58c3b169d4 -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] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 +adding changesets +adding manifests +adding file changes warning: You appear to have cloned an empty repository. +added 1 changesets with 1 changes to 1 files +new changesets 2724588e9ded [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-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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 /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 @@ -7887,10 +7909,35 @@ 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:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +no changes found +/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 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 +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 41 - push annotated tag expecting success: @@ -7914,29 +7961,18 @@ 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] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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) +/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 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 warning: You appear to have cloned an empty repository. [master (root-commit) 9f40cc0] two Author: A U Thor @@ -8007,7 +8043,7 @@ adding file changes adding remote bookmark feature-a added 1 changesets with 1 changes to 1 files -new changesets 87940d92360d +new changesets 856cd5592848 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:154: SyntaxWarning: invalid escape sequence '\w' @@ -8062,10 +8098,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets adbc1d336c90 +new changesets 380732e3faa6 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 472ee73] one +[master 5b7e7ab] 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:154: SyntaxWarning: invalid escape sequence '\w' @@ -8127,7 +8163,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 84e60afe2a59 +new changesets 45b549e37558 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -8155,12 +8191,12 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets b279dff0a594:f946b3101549 +new changesets 4cd0bafa8889:8a8edb61412a 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 - 3df30c6..a339c44 master -> origin/master - 3df30c6..a339c44 branches/default -> origin/branches/default -HEAD is now at a339c44 restored + 5781ba5..cb02fa3 master -> origin/master + 5781ba5..cb02fa3 branches/default -> origin/branches/default +HEAD is now at cb02fa3 restored /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -8169,9 +8205,9 @@ 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.second - ! [remote rejected] master -> master (rejected not pushing hg based commit 2b0d9d09cea82a52097b4426be1a0da10d6531b4) + ! [remote rejected] master -> master (rejected not pushing hg based commit 2664776c56a4dbd88fc49324cf8814e7e3c0268e) 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 2b0d9d09cea82a52097b4426be1a0da10d6531b4) + ! [remote rejected] master -> master (rejected not pushing hg based commit 2664776c56a4dbd88fc49324cf8814e7e3c0268e) ok 45 - check-hg-commits with fail mode expecting success: @@ -8207,27 +8243,27 @@ 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 - 5e28afe..e19f8b8 master -> origin/master - 5e28afe..e19f8b8 branches/default -> origin/branches/default -HEAD is now at e19f8b8 restored + 88fa301..ee3b7d5 master -> origin/master + 88fa301..ee3b7d5 branches/default -> origin/branches/default +HEAD is now at ee3b7d5 restored /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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: Pushing hg changeset 004ea04779679534cc7d15470c7362af289a3d1a for 6309bb62018d6712289f93e1cac56d76398f8f1d -WARNING: Pushing hg changeset bebbcb1b50aa980fa3f755f16e180e3cd792e3b5 for 4e650e15967339700f6e8391a4d065562e5bbf62 -WARNING: Pushing hg changeset 568cf9b238008af6ee4f6680f96781434ef34819 for 02cd775648727f3e47f7d43141ded41a212cd731 -WARNING: Pushing hg changeset 5d812434319ed8f7a5c32de14d5b78b991e8a481 for f4731f50ad875e0fc42102b01f932833e6630a0b -WARNING: Pushing hg changeset 67bf6a9a1862c037524fd1f79c8a60b560973882 for e19f8b8db9cfa1a4645a1f3922fb2632d64f65a7 +WARNING: Pushing hg changeset 5ebf4d4ae6b1e277f9c996b48a8e5ba23845582d for 4ea5f0b7234a9ffcd52e570d145ba2d6d1620278 +WARNING: Pushing hg changeset 1df6255e3b6f7b265018d1db228cbe7838ba92a4 for a1a204bccfd20a7473d5c24fb586f45e0a1ecb56 +WARNING: Pushing hg changeset 69d56b6da54d621e046c7ff9533d5c6ca6f704e3 for 879097429156cf17f06be38b7751cea7230fb48e +WARNING: Pushing hg changeset 7290e0588697a3d60f4987edde3ded4f004adecf for 142ca8389acbd73b5d93da59f9a3b19cbe5305f2 +WARNING: Pushing hg changeset bce08e60af82ced6ae5b475879446f206e518bac for ee3b7d5d023b7ce49800a2f232d3b4b224cd6755 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..e19f8b8 master -> master -WARNING: Pushing hg changeset 004ea04779679534cc7d15470c7362af289a3d1a for 6309bb62018d6712289f93e1cac56d76398f8f1d -WARNING: Pushing hg changeset bebbcb1b50aa980fa3f755f16e180e3cd792e3b5 for 4e650e15967339700f6e8391a4d065562e5bbf62 -WARNING: Pushing hg changeset 568cf9b238008af6ee4f6680f96781434ef34819 for 02cd775648727f3e47f7d43141ded41a212cd731 -WARNING: Pushing hg changeset 5d812434319ed8f7a5c32de14d5b78b991e8a481 for f4731f50ad875e0fc42102b01f932833e6630a0b -WARNING: Pushing hg changeset 67bf6a9a1862c037524fd1f79c8a60b560973882 for e19f8b8db9cfa1a4645a1f3922fb2632d64f65a7 + fffffff..ee3b7d5 master -> master +WARNING: Pushing hg changeset 5ebf4d4ae6b1e277f9c996b48a8e5ba23845582d for 4ea5f0b7234a9ffcd52e570d145ba2d6d1620278 +WARNING: Pushing hg changeset 1df6255e3b6f7b265018d1db228cbe7838ba92a4 for a1a204bccfd20a7473d5c24fb586f45e0a1ecb56 +WARNING: Pushing hg changeset 69d56b6da54d621e046c7ff9533d5c6ca6f704e3 for 879097429156cf17f06be38b7751cea7230fb48e +WARNING: Pushing hg changeset 7290e0588697a3d60f4987edde3ded4f004adecf for 142ca8389acbd73b5d93da59f9a3b19cbe5305f2 +WARNING: Pushing hg changeset bce08e60af82ced6ae5b475879446f206e518bac for ee3b7d5d023b7ce49800a2f232d3b4b224cd6755 ok 46 - check-hg-commits with push mode - no local proxy expecting success: @@ -8244,7 +8280,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 4dd5686adc38 +new changesets f1eff3f731cd progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -8272,12 +8308,12 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets dae87cdce13d:f579535436c0 +new changesets c86752a12d75:5d8006fa05e6 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 - 0ad60ad..b4b84ca master -> origin/master - 0ad60ad..b4b84ca branches/default -> origin/branches/default -HEAD is now at b4b84ca restored + 60b2ca8..853a000 master -> origin/master + 60b2ca8..853a000 branches/default -> origin/branches/default +HEAD is now at 853a000 restored /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -8285,23 +8321,23 @@ /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: Using hg changeset dae87cdce13de10801a8b9f4d5e7ba8ccc58d082 for cf59490269747e2a2e33b8f02451c43e5381017b -WARNING: Using hg changeset 55a0cb861b3addfed006c484606cadf0290e8d7f for 3825eb837637e9d1649b043c958696f5c67132e7 -WARNING: Using hg changeset acaed75bf660ab5f45d9bf43a55a216d0ed3f22f for aa9aedabaf8f589ea79f5995aa975bd58561e5fc -WARNING: Using hg changeset 14a4aab2012e5d9918a6705fa341e7c9a60cbad7 for 1c0b680f7006518f76d203ef84ae227c878edbb1 -WARNING: Using hg changeset f579535436c0b683da1a04211b7dbc3bad37c756 for b4b84ca16bc1bc95e5b68db078ebdea2d144c00a +WARNING: Using hg changeset c86752a12d75136c88bd0d024eaa6a10450fe906 for 979f589e91341f5fcba213130c21eb8181036661 +WARNING: Using hg changeset 467ee0a086593f11f1c8cfd88004562d21f2e007 for 5ed4e54e47744262a6b0f0e84b3203c189760ab9 +WARNING: Using hg changeset 05324efcda2772e2f447b083695e19fe901db1d6 for 55d1f85e3b251c908ba8a8d9283fb9513aaed0d7 +WARNING: Using hg changeset 89c8444bf3fc1e6977a7708e306c49a1badbcb4e for df42d019a9e97bae2a999ea10f0f37d7485e27d2 +WARNING: Using hg changeset 5d8006fa05e663338e5471466eb9a095c71c712e for 853a0004243d8f2141df79bc32c361bd57238550 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..b4b84ca master -> master -WARNING: Using hg changeset dae87cdce13de10801a8b9f4d5e7ba8ccc58d082 for cf59490269747e2a2e33b8f02451c43e5381017b -WARNING: Using hg changeset 55a0cb861b3addfed006c484606cadf0290e8d7f for 3825eb837637e9d1649b043c958696f5c67132e7 -WARNING: Using hg changeset acaed75bf660ab5f45d9bf43a55a216d0ed3f22f for aa9aedabaf8f589ea79f5995aa975bd58561e5fc -WARNING: Using hg changeset 14a4aab2012e5d9918a6705fa341e7c9a60cbad7 for 1c0b680f7006518f76d203ef84ae227c878edbb1 -WARNING: Using hg changeset f579535436c0b683da1a04211b7dbc3bad37c756 for b4b84ca16bc1bc95e5b68db078ebdea2d144c00a + fffffff..853a000 master -> master +WARNING: Using hg changeset c86752a12d75136c88bd0d024eaa6a10450fe906 for 979f589e91341f5fcba213130c21eb8181036661 +WARNING: Using hg changeset 467ee0a086593f11f1c8cfd88004562d21f2e007 for 5ed4e54e47744262a6b0f0e84b3203c189760ab9 +WARNING: Using hg changeset 05324efcda2772e2f447b083695e19fe901db1d6 for 55d1f85e3b251c908ba8a8d9283fb9513aaed0d7 +WARNING: Using hg changeset 89c8444bf3fc1e6977a7708e306c49a1badbcb4e for df42d019a9e97bae2a999ea10f0f37d7485e27d2 +WARNING: Using hg changeset 5d8006fa05e663338e5471466eb9a095c71c712e for 853a0004243d8f2141df79bc32c361bd57238550 ok 47 - check-hg-commits with push mode - with local proxy expecting success: @@ -8327,7 +8363,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 660a3b7121f9 +new changesets 1afddc4653b9 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:154: SyntaxWarning: invalid escape sequence '\w' @@ -8341,23 +8377,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 14 22:05 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 14 22:05 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 18 04:33 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 18 04:33 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs ok 48 - shared-marks unset expecting success: @@ -8393,7 +8429,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets d1658143d7c2 +new changesets 8b3ea39160c1 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:154: SyntaxWarning: invalid escape sequence '\w' @@ -8407,39 +8443,39 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 14 22:05 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 14 22:05 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 18 04:33 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 18 04:33 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) /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 second with shared; performing gc +WARNING: seeded marks of origin with shared; performing gc /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -ERROR: found both .git/hg/second/marks-git and .git/hg/marks-git -WARNING: gc for second failed -WARNING: seeded marks of origin with shared; performing gc +ERROR: found both .git/hg/origin/marks-git and .git/hg/marks-git +WARNING: gc for origin failed +WARNING: seeded marks of second with shared; performing gc /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' @@ -8454,28 +8490,26 @@ Writing hg marks ... Writing git marks ... no changes found -progress revision walk 'branches/default' (0/0) -progress revision 0 'default' (0/1) total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 14 22:05 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 14 22:05 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs -total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 14 22:05 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 14 22:05 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 18 04:33 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 18 04:33 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs +total 20 +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 0 Oct 18 04:33 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 71 Oct 18 04:33 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs ok 49 - shared-marks set to unset expecting success: @@ -8520,7 +8554,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 8881e9b9960e +new changesets 13467851f124 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:154: SyntaxWarning: invalid escape sequence '\w' @@ -8536,25 +8570,25 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 14 22:05 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 14 22:05 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 18 04:33 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 18 04:33 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 14 22:05 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 14 22:05 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 18 04:33 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 18 04:33 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -8563,25 +8597,25 @@ or locale.getdefaultlocale()[1] no changes found total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 14 22:05 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 14 22:05 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 18 04:33 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 18 04:33 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 14 22:05 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 14 22:05 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 18 04:33 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 18 04:33 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -8591,23 +8625,23 @@ WARNING: using marks of remote origin as shared marks no changes found total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Sep 14 22:05 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Sep 14 22:05 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Oct 18 04:33 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Oct 18 04:33 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Sep 14 22:05 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Sep 14 22:05 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Sep 14 22:05 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Oct 18 04:33 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Oct 18 04:33 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Oct 18 04:33 refs ok 50 - shared-marks unset to set expecting success: @@ -8660,7 +8694,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: @@ -8735,7 +8769,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 -j40 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 -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[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 ; \ @@ -8795,12 +8829,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: not including original source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/3949154/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/3949154/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/3289463 and its subdirectories -I: Current time: Sun Sep 14 10:05:48 -12 2025 -I: pbuilder-time-stamp: 1757887548 +I: removing directory /srv/workspace/pbuilder/3949154 and its subdirectories +I: Current time: Sun Oct 18 18:34:02 +14 2026 +I: pbuilder-time-stamp: 1792298042