Diff of the two buildlogs: -- --- b1/build.log 2025-02-22 20:07:03.564982156 +0000 +++ b2/build.log 2025-02-22 20:20:27.272515779 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Fri Mar 27 14:23:08 -12 2026 -I: pbuilder-time-stamp: 1774664588 +I: Current time: Sun Feb 23 10:07:05 +14 2025 +I: pbuilder-time-stamp: 1740254825 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz] I: copying local configuration @@ -24,52 +24,84 @@ dpkg-source: info: applying 1001_testsuite_UTF-8.patch I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/1810657/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/991445/tmp/hooks/D01_modify_environment starting +debug: Running on ionos1-amd64. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 Feb 22 20:07 /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/991445/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/991445/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build/reproducible-path' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' - BUILD_ARCH='amd64' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=42 ' - DISTRIBUTION='unstable' - HOME='/root' - HOST_ARCH='amd64' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu") + BASH_VERSION='5.2.37(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=amd64 + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=20 ' + DIRSTACK=() + DISTRIBUTION=unstable + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=x86_64 + HOST_ARCH=amd64 IFS=' ' - INVOCATION_ID='33ccdb334a5c4645a541a5afa09b1b77' - 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='1810657' - PS1='# ' - PS2='> ' + INVOCATION_ID=b4f043a83326449481b777a7e067a23c + 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=991445 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.u1doO9mO/pbuilderrc_7kJn --distribution unstable --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.u1doO9mO/b1 --logfile b1/build.log git-remote-hg_1.0.4~ds-3.dsc' - SUDO_GID='111' - SUDO_UID='106' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://213.165.73.152:3128' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.u1doO9mO/pbuilderrc_n3Tw --distribution unstable --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.u1doO9mO/b2 --logfile b2/build.log git-remote-hg_1.0.4~ds-3.dsc' + SUDO_GID=110 + SUDO_UID=105 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://46.16.76.132:3128 I: uname -a - Linux ionos15-amd64 6.12.9+bpo-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.12.9-1~bpo12+1 (2025-01-19) x86_64 GNU/Linux + Linux i-capture-the-hostname 6.1.0-31-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.128-1 (2025-02-07) x86_64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Nov 22 2024 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/1810657/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Nov 22 14:40 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/991445/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -234,7 +266,7 @@ Get: 107 http://deb.debian.org/debian unstable/main amd64 python3-zombie-imp all 0.0.2-2 [11.7 kB] Get: 108 http://deb.debian.org/debian unstable/main amd64 sharness all 1.0.0-1.1 [28.6 kB] Get: 109 http://deb.debian.org/debian unstable/main amd64 xmlto amd64 0.0.28-3.1 [27.2 kB] -Fetched 51.7 MB in 3s (15.7 MB/s) +Fetched 51.7 MB in 17s (2971 kB/s) Preconfiguring packages ... Selecting previously unselected package liblocale-gettext-perl. (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 ... 19775 files and directories currently installed.) @@ -600,8 +632,8 @@ Setting up tzdata (2025a-2) ... Current default time zone: 'Etc/UTC' -Local time is now: Sat Mar 28 02:24:34 UTC 2026. -Universal Time is now: Sat Mar 28 02:24:34 UTC 2026. +Local time is now: Sat Feb 22 20:09:22 UTC 2025. +Universal Time is now: Sat Feb 22 20:09:22 UTC 2025. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17029-2) ... @@ -704,7 +736,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/991445/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for unstable +I: user script /srv/workspace/pbuilder/991445/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 @@ -714,7 +750,7 @@ debian/rules clean dh clean dh_auto_clean - make -j42 clean + make -j20 clean make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' rm -f doc/git-remote-hg.1 rm -f -r bin/ @@ -726,7 +762,7 @@ dh_autoreconf dh_auto_configure dh_auto_build - make -j42 "INSTALL=install --strip-program=true" + make -j20 "INSTALL=install --strip-program=true" make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ : Use chosen Python version ; \ @@ -750,7 +786,7 @@ a2x -d manpage -f manpage doc/git-remote-hg.txt make[1]: Leaving directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' dh_auto_test - make -j42 test + make -j20 test make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' make -C test make[2]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds/test' @@ -759,6 +795,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 && @@ -771,15 +816,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*" && ( @@ -852,11 +888,6 @@ adding manifests adding file changes added 4 changesets with 4 changes to 4 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) ok 1 - setup expecting success: @@ -873,47 +904,61 @@ check gitrepo HEAD zero 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.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: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: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: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 /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 -new changesets 7ced05adeaab 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) -/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 changesets +adding changesets +adding manifests +adding manifests adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 7ced05adeaab -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +adding file changes +adding file changes adding changesets adding manifests +added 1 changesets with 1 changes to 1 files adding file changes +new changesets dbae74fa03a4 +added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files -new changesets 7ced05adeaab +new changesets dbae74fa03a4 +new changesets dbae74fa03a4 +added 4 changesets with 4 changes to 4 files +new changesets 1e3e49d2cc8f:6674f1c866b5 +progress revision walk 'bookmarks/master' (0/0) 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) +progress revision 0 'master' (0/1) +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/4) ok 2 - cloning expecting success: @@ -944,17 +989,12 @@ 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] marked working directory as branch next (branches are permanent and global, did you want a bookmark?) -adding changesets -adding manifests -adding file changes -added 4 changesets with 4 changes to 4 files -new changesets 1e3e49d2cc8f:6674f1c866b5 -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) marked working directory as branch next (branches are permanent and global, did you want a bookmark?) origin @@ -977,53 +1017,44 @@ test_cmp expected actual +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 4 changes to 4 files +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) -Cloning into 'gitrepo'... -/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/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. 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 7ced05adeaab:ce1196de19c6 -Cloning into 'gitrepo'... -searching for changes -no changes found -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'next' (0/1) -searching for changes 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 4 changesets with 4 changes to 4 files -adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 7ced05adeaab:ce1196de19c6 +new changesets dbae74fa03a4:c7cdf46238a5 +added 2 changesets with 2 changes to 1 files +new changesets dbae74fa03a4:c7cdf46238a5 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'next' (0/1) progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) @@ -1059,36 +1090,13 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/feature-a feature-a -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) -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.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' +/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) -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 - +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 1 - encoding expecting success: @@ -1122,6 +1130,8 @@ test_cmp expected actual +/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 (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) @@ -1140,30 +1150,77 @@ 1 file changed, 1 deletion(-) delete mode 100644 alpha rm 'foo/bar' +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) [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.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) 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.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 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 + +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg: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 +searching for changes adding file changes +adding changesets adding remote bookmark feature-a +adding manifests +adding file changes added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 7ced05adeaab:96dd6ee1767b +new changesets dbae74fa03a4:1f4ae03fc192 +added 5 changesets with 3 changes to 3 files +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'next' (0/1) +adding changesets +adding manifests +adding file changes +adding remote bookmark feature-a +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets dbae74fa03a4:1f4ae03fc192 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:154: SyntaxWarning: invalid escape 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 - cloning with bookmarks expecting success: @@ -1185,22 +1242,6 @@ check_bookmark hgrepo devel devel -/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 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 7ced05adeaab:96dd6ee1767b -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'next' (0/1) -no changes found ok 4 - cloning with bookmarks expecting success: @@ -1222,98 +1263,107 @@ check_bookmark hgrepo devel devel -searching for changes Cloning into 'gitrepo'... -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.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.bidi/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-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 '\(' + 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) -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-push/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.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) 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 7ced05adeaab:96dd6ee1767b -/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. +new changesets dbae74fa03a4:1f4ae03fc192 +/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' (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:154: SyntaxWarning: invalid escape 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 -new changesets c49b415d253b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[devel 3d4f8f7] 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.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. +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.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes adding remote bookmark devel adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 7ced05adeaab:96dd6ee1767b +new changesets dbae74fa03a4:1f4ae03fc192 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 60ae633] devel + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes -added 5 changesets with 3 changes to 3 files -new changesets 362b656574c3:54f595cbdf1f -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) -[devel 3d4f8f7] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +added 1 changesets with 1 changes to 1 files +new changesets 03254c7b6e6e /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. +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[devel 60ae633] 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.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 no changes found +/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) 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 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files ok 3 - subcommand repo - with local proxy expecting success: @@ -1330,20 +1380,15 @@ test_cmp rev-HEAD git-HEAD ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +searching for changes no changes found -/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) searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files +added 5 changesets with 3 changes to 3 files ok 5 - update bookmark expecting success: @@ -1361,19 +1406,10 @@ check_bookmark hgrepo feature-b feature-b 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' +/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.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files ok 5 - update bookmark expecting success: @@ -1391,10 +1427,14 @@ 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' +/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. + 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 @@ -1403,64 +1443,39 @@ adding remote bookmark devel adding remote bookmark feature-a added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets 7ced05adeaab:a31cf785accd -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/3) -progress revision 1 'next' (0/1) -Cloning into 'gitrepo'... -[feature-b ad57c46] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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/bin/git-remote-hg: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 dbae74fa03a4:27ab24b5cf72 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 7ced05adeaab:a31cf785accd +new changesets dbae74fa03a4:27ab24b5cf72 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -[feature-b ad57c46] feature-b +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/3) +progress revision 1 'next' (0/1) +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) +[feature-b 9ea8635] 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.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets d2d35b714f15 -searching for changes -progress revision walk 'bookmarks/master' (0/0) -adding changesets -progress revision 0 'master' (0/1) -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/bin/git-remote-hg: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 9ea8635] 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) ok 2 - file removal expecting success: @@ -1490,20 +1505,47 @@ test_cmp expected actual +/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 (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha -no changes found [master 862befc] add beta Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 beta +adding changesets +adding manifests +/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] +adding file changes +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +added 1 changesets with 1 changes to 1 files +new changesets ae2ea9608e98 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 6 - new bookmark expecting success: @@ -1536,12 +1578,9 @@ 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.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.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 ok 6 - new bookmark expecting success: @@ -1574,11 +1613,15 @@ test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +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.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 '\(' @@ -1622,13 +1665,6 @@ grep "git marks" output ) -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 '\(' @@ -1646,11 +1682,6 @@ 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 @@ -1660,17 +1691,20 @@ 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 837de7cd5197:95233bd1157b +new changesets 85a952e61e70:10ed5422f9af 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/4c9232ec8565-51d5d0cf-backup.hg ok 3 - git tags expecting success: @@ -1709,104 +1743,49 @@ test_cmp expected actual -/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) -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: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:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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/383abac8854f-a7e0b9f8-backup.hg /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found searching for changes -searching for changes -adding changesets adding changesets adding manifests -adding manifests -adding file changes adding file changes added 1 changesets with 1 changes to 1 files searching for changes -added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 83e0b0cd9055 -progress revision 4 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - + bb9ffb9...647b42c master -> origin/master (forced update) - + bb9ffb9...647b42c branches/default -> origin/branches/default (forced update) -HEAD is now at 647b42c four -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/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 12 changesets with 12 changes to 1 files -new changesets ed9fa461d275:073960cba59b -progress revision walk 'bookmarks/master' (11/11) -progress revision 0 'master' (0/12) +added 1 changesets with 1 changes to 1 files (+1 heads) +new changesets fd09cb2b65bf +progress revision 4 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + + 802b9ed...3b3c5e2 master -> origin/master (forced update) + + 802b9ed...3b3c5e2 branches/default -> origin/branches/default (forced update) +HEAD is now at 3b3c5e2 four 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) -ok 7 - authors - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && - - ( - hg init hgrepo && - cd hgrepo && - - echo one >> content && - hg add content && - hg commit -m one && - - echo two >> content && - hg commit -m two - ) && - - git clone "hg::hgrepo" gitrepo && - - ( - cd hgrepo && - hg strip 1 && - - echo three >> content && - hg commit -m three && - - echo four >> content && - hg commit -m four - ) && - - ( - cd gitrepo && - git fetch && - git log --format="%s" origin/master > ../actual - ) && - - hg -R hgrepo log --template "{desc}\n" > expected && - test_cmp actual expected - /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.main/bin/git-remote-hg: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 Loading hg marks ... Loading git marks ... Performing garbage collection on git commits ... @@ -1816,12 +1795,16 @@ Trimmed git marks from #12 down to #2 Writing hg marks ... Writing git marks ... +/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] Loading hg marks ... Trimmed hg marks from #5 down to #0 Writing hg marks ... Loading git marks ... Trimmed git marks from #12 down to #2 Writing git marks ... +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways ok 5 - subcommand gc expecting success: @@ -1846,11 +1829,16 @@ test_cmp expected actual +Cloning into 'gitrepo'... adding changesets adding manifests +/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 file changes added 12 changesets with 12 changes to 1 files -new changesets 0ae56711385f:3270f66d602c +new changesets 1b90e185dc91:6c273272e295 progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) ok 7 - authors @@ -1892,56 +1880,90 @@ hg -R hgrepo log --template "{desc}\n" > expected && test_cmp actual expected +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 12 changesets with 12 changes to 1 files +new changesets 9a9780555bf3:5580893f055c +progress revision walk 'bookmarks/master' (11/11) +progress revision 0 'master' (0/12) marked working directory as branch gamma +ok 7 - authors + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + + echo one >> content && + hg add content && + hg commit -m one && + + echo two >> content && + hg commit -m two + ) && + + git clone "hg::hgrepo" gitrepo && + + ( + cd hgrepo && + hg strip 1 && + + echo three >> content && + hg commit -m three && + + echo four >> content && + hg commit -m four + ) && + + ( + cd gitrepo && + git fetch && + git log --format="%s" origin/master > ../actual + ) && + + hg -R hgrepo log --template "{desc}\n" > expected && + 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) -Cloning into 'gitrepo'... /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: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.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 1e1285aee490 +new changesets 106c9d877cca 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.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) searching for changes adding changesets adding manifests adding file changes adding remote bookmark not-master +Cloning into 'gitrepo'... added 2 changesets with 1 changes to 1 files new changesets 5889597089fe:3320583a8de0 1 local changesets published +/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 1 'default' (0/1) progress revision 2 'gamma' (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] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 68eb841cebaf:3ca710962339 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -1950,64 +1972,93 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 68eb841cebaf:6b069cbbbda7 +new changesets 7f69fda8429e:e71f2df848aa 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' +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.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: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:154: SyntaxWarning: invalid escape 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.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] +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/e71f2df848aa-5d58e081-backup.hg searching for changes no changes found -searching for changes +adding changesets +adding manifests +adding file changes searching for changes adding changesets adding manifests adding file changes +searching for changes +added 2 changesets with 2 changes to 1 files +new changesets bca846c0e808:02dcb7db790a adding changesets -added 2 changesets with 2 changes to 2 files +added 1 changesets with 1 changes to 1 files adding manifests +new changesets 32917b4e8ce8 adding file changes +added 2 changesets with 2 changes to 2 files searching for changes adding changesets +progress revision walk 'bookmarks/master' (1/1) +progress revision 1 'default' (0/1) adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 418994e8d276 +progress revision 0 'master' (0/2) added 1 changesets with 0 changes to 0 files +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + f777f70..eeaaaa3 master -> origin/master + f777f70..eeaaaa3 branches/default -> origin/branches/default searching for changes -progress revision 1 'default' (0/1) searching for changes -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - ac008ae..8eefa08 master -> origin/master - ac008ae..8eefa08 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-push/hgrepo/.hg/strip-backup/3ca710962339-9fc2f0ee-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/hgrepo/.hg/strip-backup/6b069cbbbda7-cbae1864-backup.hg +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/02dcb7db790a-e20129d9-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' + 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.main/bin/git-remote-hg: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 07486a1656c8:e6e07c2cb146 /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 2 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo + + f33dc3e...2243a43 master -> origin/master (forced update) + + f33dc3e...2243a43 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] ok 6 - subcommand [some-repo] +searching for changes expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && @@ -2040,16 +2091,9 @@ check gitrepo/sub_hg_b HEAD zero_sub_hg_b && check gitrepo/sub_git HEAD zero_sub_git -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 -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets 3f5c7022f00a:07fbfdd1f9f0 ok 4 - hg branch expecting success: @@ -2083,30 +2127,16 @@ test_cmp expected actual -progress revision 2 'default' (0/2) -searching for changes -adding changesets -adding manifests -adding file changes added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets c83ecf378e90:78ef15afcecd +new changesets 14ed3e29df8b:369fc982c400 +progress revision 2 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + + 3fb4eaa...7c87417 master -> origin/master (forced update) + + 3fb4eaa...7c87417 branches/default -> origin/branches/default (forced update) [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha -progress revision 2 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - + 600976f...191c635 master -> origin/master (forced update) - + 600976f...191c635 branches/default -> origin/branches/default (forced update) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - + 4fb9252...d7d308c master -> origin/master (forced update) - + 4fb9252...d7d308c 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.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 8 - strip expecting success: @@ -2133,7 +2163,10 @@ check_branch hgrepo default two -no changes found +/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 8 - strip expecting success: @@ -2160,6 +2193,9 @@ check_branch hgrepo default two +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found searching for changes adding changesets adding manifests @@ -2168,49 +2204,41 @@ 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.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) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... adding changesets adding manifests -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding file changes adding remote bookmark master added 2 changesets with 2 changes to 1 files -new changesets 0f353545c7a3:661f92cb865b +new changesets a6fad6de3835:49ab10842607 +/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) 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] -adding changesets -adding manifests -adding file changes -adding remote bookmark master -added 2 changesets with 2 changes to 1 files -new changesets 0f353545c7a3:661f92cb865b +[default d57c654] 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) searching for changes -progress revision walk 'bookmarks/default' (1/1) -progress revision 0 'default' (0/2) adding changesets adding manifests adding file changes @@ -2219,60 +2247,70 @@ new changesets 16869bbe54be 1 local changesets published progress revision 1 'default' (0/1) -[default 696a1d4] two +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.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] +[master (root-commit) e9a16bb] zero_sub_git Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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) -[default 696a1d4] two + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +adding changesets +adding manifests +adding file changes +adding remote bookmark master +added 2 changesets with 2 changes to 1 files +new changesets e9143d9a00ed:26dceeac7064 +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.main/bin/git-remote-hg: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 +[default 5af99c6] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +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/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] searching for changes adding changesets adding manifests adding file changes -Cloning into 'gitrepo'... +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 + 7ba9b6d..d57c654 default -> default /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) -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 -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - e4fcff3..696a1d4 default -> default +Cloning into 'gitrepo'... +searching for changes +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 +added 1 changesets with 1 changes to 1 files /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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/hgrepo + fffffff..5af99c6 default -> default +searching for changes +no changes found searching for changes adding changesets adding manifests adding file changes -/build/reproducible-path/git-remote-hg-1.0.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 -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] -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..696a1d4 default -> default +added 2 changesets with 2 changes to 2 files ok 9 - remote push with master bookmark -searching for changes expecting success: test_when_finished "rm -rf hgrepo gitrepo*" && @@ -2294,19 +2332,7 @@ check_branch hgrepo default one -adding changesets -adding changesets -adding manifests -adding manifests -adding file changes -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 4b8b16198f2a:9ce4c4a25418 -added 2 changesets with 2 changes to 2 files -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ searching for changes -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) searching for changes To hg::../hgrepo2 * [new branch] branches/default -> branches/default @@ -2314,21 +2340,27 @@ * [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. +/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/gitrepo/.git/ [master (root-commit) 64caca5] one Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 049fea2f6cb4:c6e529a26013 +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) -hint: Updates were rejected because the tag already exists in the remote. ok 9 - remote push with master 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 expecting success: test_when_finished "rm -rf hgrepo gitrepo*" && @@ -2350,19 +2382,23 @@ check_branch hgrepo default one -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 Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/gitrepo/.git/ -searching for changes -adding changesets -adding manifests -adding file changes +/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) [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 -To hg::../hgrepo - * [new branch] master -> master +Cloning into './sub_hg_a'... ok 5 - hg tags expecting success: @@ -2402,17 +2438,21 @@ 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) +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:154: SyntaxWarning: invalid escape 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 './sub_hg_a'... +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:154: SyntaxWarning: invalid escape 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) a663549] add alpha Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0000 @@ -2420,16 +2460,6 @@ create mode 100644 alpha /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:154: SyntaxWarning: invalid escape 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) -changeset: 0:6e2126489d3d -tag: tip -user: A U Thor -date: Mon Jan 01 00:00:00 2007 +0230 -summary: one - [master ea3e397] add beta Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0100 @@ -2437,15 +2467,46 @@ create mode 100644 beta /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 [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 +no changes found +[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 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 + +added 1 changesets with 1 changes to 1 files +new changesets 71f4b2179705 +[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 +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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::../hgrepo + * [new branch] master -> master ok 10 - remote push from master branch expecting success: @@ -2462,70 +2523,31 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero -added 1 changesets with 1 changes to 1 files -[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 -new changesets 8b79a8d942df -[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 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::../hgrepo - * [new branch] master -> master +/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:154: SyntaxWarning: invalid escape 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'... +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.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:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] changeset: 0:6e2126489d3d tag: tip user: A U Thor date: Mon Jan 01 00:00:00 2007 +0230 summary: one -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets c49d6268d00d -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] -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_git'... -done. -Cloning into 'gitrepo'... 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.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 10 - remote push from master branch expecting success: @@ -2542,17 +2564,28 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 91de9e5ecd1f +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.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.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 +Cloning into './sub_git'... +done. ok 7 - subcommand sub initial update (hg and git subrepos) expecting success: @@ -2578,14 +2611,26 @@ check gitrepo/sub_hg_a/sub_hg_a_x HEAD zero_sub_hg_a_x && check gitrepo/sub_hg_b/sub_git HEAD zero_sub_git +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + 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 5 changesets with 5 changes to 5 files +new changesets 87c8f82b00d0:21e96c99dac4 +adding changesets +adding manifests +adding file changes +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/5) added 1 changesets with 1 changes to 1 files -new changesets 5555391380eb +new changesets b25fe9b67839 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) ok 11 - remote cloning expecting success: @@ -2599,57 +2644,48 @@ ) 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.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files -new changesets 87c8f82b00d0:21e96c99dac4 -/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 -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) -added 1 changesets with 1 changes to 1 files -new changesets 5555391380eb -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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.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 /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 -new changesets a498958a8243 +/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 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets bbf71d050db6 +adding changesets +adding manifests +adding file changes +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +added 1 changesets with 1 changes to 1 files +new changesets b25fe9b67839 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +searching for changes no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 5 changes to 5 files ok 11 - remote cloning expecting success: @@ -2663,10 +2699,28 @@ ) 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] +no changes found +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets bbf71d050db6 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 12 - moving remote clone expecting success: @@ -2688,57 +2742,22 @@ check_bookmark hgrepo devel devel -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -Cloning into 'gitrepo'... -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: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 a498958a8243 -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) -/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.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -added 1 changesets with 1 changes to 1 files -new changesets 5555391380eb -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[devel 4f4b4d8] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +Cloning into 'gitrepo'... +no changes found +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:154: SyntaxWarning: invalid escape 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 -/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 12 - moving remote clone expecting success: @@ -2760,44 +2779,23 @@ check_bookmark hgrepo devel devel +/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 +adding remote bookmark devel added 1 changesets with 1 changes to 1 files -ok 6 - test timezones - -# passed all 6 test(s) -1..6 +new changesets b25fe9b67839 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 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) +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] adding changesets @@ -2805,10 +2803,17 @@ adding file changes adding remote bookmark devel added 1 changesets with 1 changes to 1 files -new changesets a498958a8243 +new changesets bbf71d050db6 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel 29061f6] devel +[devel 17284a7] 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) +[devel f61abac] 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' @@ -2819,44 +2824,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 -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -added 2 changesets with 2 changes to 1 files -new changesets 5555391380eb:2de9f188b9b8 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -[feature-b 3d58a5f] feature-b - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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 no changes found searching for changes adding changesets adding manifests adding file changes +searching for changes +added 1 changesets with 1 changes to 1 files +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/bin/git-remote-hg: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_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 -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files ok 13 - remote update bookmark expecting success: @@ -2874,95 +2860,127 @@ check_bookmark hgrepo feature-b feature-b 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' +/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) -ok 14 - remote new bookmark +ok 13 - remote update bookmark expecting success: test_when_finished "rm -rf gitrepo*" && - git clone "hg::hgrepo" gitrepo && - - ( - cd hgrepo && - hg checkout default && - echo bump > content && - hg commit -m bump - ) && - ( + git clone "hg::hgrepo" gitrepo && cd gitrepo && - echo diverge > content && - git commit -a -m diverged && - check_push 1 <<-\EOF - master:non-fast-forward - EOF + git checkout --quiet -b feature-b && + echo feature-b > content && + git commit -a -m feature-b && + git push --quiet origin feature-b ) && - check_branch hgrepo default bump + check_bookmark hgrepo feature-b feature-b +/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: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' +/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. + 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 a498958a8243:1d52a54646ed +new changesets b25fe9b67839:cc6ad1151c07 +adding changesets +adding manifests +adding file changes +adding remote bookmark devel +added 2 changesets with 2 changes to 1 files +new changesets bbf71d050db6:fb90e81761ce progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -[feature-b 21aacce] feature-b +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +[feature-b 3cf301f] 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) +[feature-b 4b8c3b3] 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) +/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 -adding remote bookmark devel -adding remote bookmark feature-b -added 3 changesets with 3 changes to 1 files -new changesets 5555391380eb:af51d967fe72 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) +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] -Cloning into 'gitrepo'... -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:154: SyntaxWarning: invalid escape 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 +Cloning into 'gitrepo'... 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-remote-hg:154: SyntaxWarning: invalid escape 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] +ok 14 - remote new bookmark + +expecting success: + test_when_finished "rm -rf gitrepo*" && + + git clone "hg::hgrepo" gitrepo && + + ( + cd hgrepo && + hg checkout default && + echo bump > content && + hg commit -m bump + ) && + + ( + cd gitrepo && + echo diverge > content && + git commit -a -m diverged && + check_push 1 <<-\EOF + master:non-fast-forward + EOF + ) && + + check_branch hgrepo default bump + +Cloning into 'gitrepo'... adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets aba534ec2dfc:f5b34c2a08fe -[master 1b668aa] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +new changesets 2a88f5e1d03a:0a3e71dc0f57 +/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' (1/1) progress revision 0 'master' (0/2) ok 14 - remote new bookmark @@ -2995,166 +3013,159 @@ 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/bin/git-remote-hg: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 +/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 eddb7a47b7e1 -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) +adding remote bookmark devel +adding remote bookmark feature-b +added 3 changesets with 3 changes to 1 files +new changesets b25fe9b67839:994dc49436ca /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 manifests +adding file changes +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +adding remote bookmark devel +adding remote bookmark feature-b +added 3 changesets with 3 changes to 1 files +new changesets bbf71d050db6:3d0a917039eb /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] +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) 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) -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 a498958a8243:e3032e5ac124 -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" - -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved /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) adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 1037c46cf558:9ae8baf61619 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +new changesets 42a0dcb9d990:31d46e663a39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark devel) +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +[master 4c44a9a] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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'... +[master 2010a32] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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.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 '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -[master 0504550] diverged - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg: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. +adding changesets +/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: 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 7743094502ef -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -adding changesets +new changesets 7a659610a0d6 +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + ! [rejected] master -> master (non-fast-forward) 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 5555391380eb:eddb7a47b7e1 -/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' +/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.main-push/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 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7afb7eee7bd2 -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo +new changesets 703df3afc208 +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-push/hgrepo' +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) -progress revision walk 'bookmarks/master' (3/3) -progress revision 0 'master' (0/4) +added 1 changesets with 1 changes to 1 files +new changesets e110fe8e6fa5 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +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) -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 '\(' @@ -3190,28 +3201,40 @@ check_bookmark hgrepo diverge "bump bookmark" +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) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 4228fe0e4606:eea1450c48e3 +new changesets 05ef65e9f58e:60a7ffea2271 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -created new head -[diverge 54c5e1e] diverge - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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.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.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) Cloning into './sub_hg_b/sub_git'... done. ok 8 - subcommand sub initial recursive update @@ -3221,11 +3244,61 @@ test_sub_update -Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +adding remote bookmark devel +adding remote bookmark diverge +adding remote bookmark feature-b +added 4 changesets with 4 changes to 1 files +new changesets bbf71d050db6:7a659610a0d6 +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 b25fe9b67839:703df3afc208 +progress revision walk 'bookmarks/master' (3/3) +progress revision 0 'master' (0/4) +created new head +created new head +[diverge 44b9ccf] diverge + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[diverge 8a440d5] 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 3e6785d4d05a +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 '\(' @@ -3240,7 +3313,7 @@ adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets a77e0bd4849d +new changesets 6d0567c9cb4a 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' @@ -3249,8 +3322,22 @@ 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-push/bin/git-remote-hg: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 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 + ok 16 - remote update bookmark diverge expecting success: @@ -3268,18 +3355,17 @@ check_bookmark hgrepo feature-c feature-c Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -adding remote bookmark devel -adding remote bookmark diverge -adding remote bookmark feature-b +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) -added 4 changesets with 4 changes to 1 files -new changesets a498958a8243:7afb7eee7bd2 +/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 @@ -3290,55 +3376,54 @@ adding remote bookmark devel adding remote bookmark diverge adding remote bookmark feature-b -progress revision walk 'bookmarks/master' (3/3) +added 5 changesets with 5 changes to 1 files (+1 heads) +new changesets bbf71d050db6:3e6785d4d05a +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 +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 5555391380eb:a77e0bd4849d +new changesets b25fe9b67839:6d0567c9cb4a WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/4) -created new head -[feature-c f1714a5] feature-c +[feature-c 0a0bb14] feature-c Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg: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) -[diverge 3430a07] diverge +[feature-c 93f354a] feature-c Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 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 (+1 heads) -/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 6a9c00fc4d29 -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 checking known breakage: @@ -3378,145 +3463,174 @@ test `hg log -f content-moved | grep -c changeset` -eq 3 ) -ok 16 - remote update bookmark diverge +ok 17 - remote new bookmark multiple branch head expecting success: - test_when_finished "rm -rf gitrepo*" && + test_when_finished "rm -rf gitrepo hgrepo" && ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) && + 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 + cp content content-copy && + # recent git-fast-export is (too) picky in recognizing copies + # although git-log is not as picky; + # since https://github.com/git/git/commit/8096e1d385660c159d9d47e69b2be63cf22e4f31 + # a copy is only marked if source filed not modified as well + # (though destination file can be modified) + echo one >> content-copy && + git add content content-copy && + git commit -m copy && + git mv content-copy content-moved + git commit -m moved && + git push origin master ) && - check_bookmark hgrepo feature-c feature-c + ( + hg -R hgrepo update && + test_cmp gitrepo/content hgrepo/content + test_cmp gitrepo/content-moved hgrepo/content-moved + cd hgrepo && + test `hg log -f content-moved | grep -c changeset` -eq 3 + ) 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' +/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.main-push/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 +Cloning into 'gitrepo'... 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 a498958a8243:6a9c00fc4d29 -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' +added 1 changesets with 1 changes to 1 files +new changesets cb4ad956748c +/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-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ [master (root-commit) e9a16bb] zero_sub_git Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content_sub_git -[feature-c 40fa481] 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 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) 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] added 1 changesets with 1 changes to 1 files -new changesets c10b5eec48fd +new changesets cb4ad956748c progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -no changes found -[master 569e8d6] copy +[master 321a0ac] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master 5b7d6ae] moved +[master a35dd42] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) +[master 321a0ac] copy + Author: A U Thor + 1 file changed, 2 insertions(+) + create mode 100644 content-copy /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) +[master a35dd42] 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-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] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files searching for changes adding changesets adding manifests adding file changes +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + fffffff..a35dd42 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/hgrepo - b4a339b..5b7d6ae master -> master -ok 17 - remote new bookmark multiple branch head + a8ab45a..a35dd42 master -> master +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] +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets a1d88f77fe4d:2643cc365c80 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +ok 18 - push commits with copy and rename expecting success: - test_when_finished "rm -rf gitrepo hgrepo" && + test_when_finished "rm -rf hgrepo gitrepo && LC_ALL=C" && + + LC_ALL=C.UTF-8 + export LC_ALL ( hg init hgrepo && cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) && - git clone "hg::hgrepo" gitrepo && + 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 && - cp content content-copy && - # recent git-fast-export is (too) picky in recognizing copies - # although git-log is not as picky; - # since https://github.com/git/git/commit/8096e1d385660c159d9d47e69b2be63cf22e4f31 - # a copy is only marked if source filed not modified as well - # (though destination file can be modified) - echo one >> content-copy && - git add content content-copy && - git commit -m copy && - git mv content-copy content-moved - git commit -m moved && - git push origin master + git -c core.quotepath=false ls-files > ../actual ) && + echo "ø~?" > expected && + test_cmp expected actual - ( - hg -R hgrepo update && - test_cmp gitrepo/content hgrepo/content - test_cmp gitrepo/content-moved hgrepo/content-moved - cd hgrepo && - test `hg log -f content-moved | grep -c changeset` -eq 3 - ) - -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.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) not ok 18 - push commits with copy and rename # TODO known breakage expecting success: @@ -3549,76 +3663,32 @@ echo "ø~?" > expected && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... -adding changesets -adding manifests -/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+)') -adding file changes -/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 2 changesets with 3 changes to 3 files -new changesets 750565391c3e:482962268112 -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] -warning: filename contains '?', which is reserved on Windows: 'ø~?' /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 -new changesets 58aa6d7d3b5b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) 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) -[master 2da86a2] copy - Author: A U Thor - 1 file changed, 2 insertions(+) - create mode 100644 content-copy -[master ff8d590] 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-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] +warning: filename contains '?', which is reserved on Windows: 'ø~?' adding changesets adding manifests adding file changes +warning: filename contains '?', which is reserved on Windows: 'ø~?' added 2 changesets with 3 changes to 3 files -new changesets 2e8be22bb7a6:ea118376ff82 +new changesets 92b2c7fe894f:2a9b2f066354 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 -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 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..ff8d590 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 '\(' @@ -3630,15 +3700,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] -1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 057bdc0bccc7 +new changesets 0cc99b2e4a77 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -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 '\(' @@ -3652,69 +3720,42 @@ 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 18 - push commits with copy and rename - -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/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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: 'ø~?' /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 772aa98bd5eb:ec090322b551 +new changesets 1a48187b65d5:f11719251776 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +warning: filename contains '?', which is reserved on Windows: 'ø~?' /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.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'... +/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) +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) adding changesets adding manifests adding file changes -Cloning into './sub_hg_b/sub_git'... added 3 changesets with 4 changes to 2 files -done. -new changesets ab418c5e864f:a6a85c8e001d +new changesets 95ee192418e9:79c40a2348f9 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) ok 19 - fetch special filenames @@ -3755,83 +3796,15 @@ printf "content\næ rø\n" > expected && test_cmp expected actual -warning: filename contains '?', which is reserved on Windows: 'ø~?' -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 '\(' - 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 -warning: filename contains '?', which is reserved on Windows: 'ø~?' -added 1 changesets with 1 changes to 1 files -new changesets e93e622946be -/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) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 7fe574956639 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - ce2025b..7eeca20 master -> origin/master - ce2025b..7eeca20 branches/default -> origin/branches/default -[master 44fdd58] 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) -Updating ce2025b..7eeca20 -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-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 -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 - eed64c0..44fdd58 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-remote-hg:154: SyntaxWarning: invalid escape 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 3 changesets with 4 changes to 2 files -new changesets 80d8d57ac901:460c71687db9 +new changesets 95ee192418e9:be7172f43c8a progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 19 - fetch special filenames expecting success: @@ -3870,31 +3843,135 @@ printf "content\næ rø\n" > expected && test_cmp expected actual +/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 '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) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 1a3d515f538f +progress revision 2 'default' (0/1) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 53349ab..c49468f master -> origin/master + 53349ab..c49468f branches/default -> origin/branches/default +Updating 53349ab..c49468f +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) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 7acc42f6032a +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 3b53650] utf-8 + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 "\303\246 r\303\270" +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-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+)') +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: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: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) +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 7acc42f6032a +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 3b53650] 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) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..3b53650 master -> master searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7e767cc70e1e +new changesets 1749866f4005 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 - 850288a..9f2d594 branches/default -> origin/branches/default - 850288a..9f2d594 master -> origin/master + 4c4baaa..8742bdf branches/default -> origin/branches/default + 4c4baaa..8742bdf 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 850288a substate_hg_a +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +HEAD is now at 4c4baaa 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 '\(' 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:154: SyntaxWarning: invalid escape 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 +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 7728301..3b53650 master -> master +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg: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 5480a4edff4d +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +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 + 3c5faa7..9250dba branches/default -> origin/branches/default + 3c5faa7..9250dba master -> origin/master ok 20 - push special filenames expecting success: @@ -3940,39 +4017,11 @@ check_bookmark hgrepo new_bmark fi -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 9e6854641d82 -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 - f5d64e5..0faf77a branches/default -> origin/branches/default - f5d64e5..0faf77a 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 f5d64e5 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 '\(' 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] -no changes found +HEAD is now at 3c5faa7 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 '\(' @@ -3981,37 +4030,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) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 837b3eb3d22b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master 47a3e94] 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-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -ok 9 - subcommand sub subsequent recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update --rebase - -/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 -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..47a3e94 master -> master -1 files updated, 0 files merged, 0 files removed, 0 files unresolved ok 20 - push special filenames expecting success: @@ -4057,15 +4075,36 @@ check_bookmark hgrepo new_bmark fi +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +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 9 - subcommand sub subsequent recursive update + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update --rebase + +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/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] -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 @@ -4073,56 +4112,14 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 8fa5e5a097ea:e41c70980ecf +new changesets e6c3bcbdbf58:c7188b7390ed progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at e9c669a zero -HEAD is now at e9c669a zero -HEAD is now at cae1867 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 '\(' - 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 - cae1867..06ac9ce branches/good_branch -> branches/good_branch - b02d3bd..742e118 good_bmark -> good_bmark - b02d3bd..2203c94 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/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. - b02d3bd..2203c94 master -> master - b02d3bd..742e118 good_bmark -> good_bmark - cae1867..06ac9ce 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.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 @@ -4130,27 +4127,21 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets f62d73cdbce2:41294d454d3b +new changesets e6c3bcbdbf58:840ea6ccb1e4 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 4af0aa6 zero -HEAD is now at 4af0aa6 zero -HEAD is now at ed9d7bd 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+)') -/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 f7d6f2a7124c:12aa67fa6bf4 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +HEAD is now at 55344c3 zero +HEAD is now at 55344c3 zero +HEAD is now at 9175dc3 good branch +HEAD is now at 55344c3 zero +HEAD is now at 55344c3 zero +HEAD is now at bac818c 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 '\(' @@ -4184,9 +4175,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..ed0f58f branches/good_branch -> branches/good_branch - fffffff..59dd8fc good_bmark -> good_bmark - fffffff..7a5353f master -> master + fffffff..3a85294 branches/good_branch -> branches/good_branch + fffffff..905ddfb good_bmark -> good_bmark + fffffff..cddbced 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) @@ -4197,14 +4188,59 @@ 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..7a5353f master -> master - fffffff..59dd8fc good_bmark -> good_bmark - fffffff..ed0f58f branches/good_branch -> branches/good_branch + fffffff..cddbced master -> master + fffffff..905ddfb good_bmark -> good_bmark + fffffff..3a85294 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + bac818c..bf447ee branches/good_branch -> branches/good_branch + e49a7c6..905ddfb good_bmark -> good_bmark + e49a7c6..cddbced 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/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. + e49a7c6..cddbced master -> master + e49a7c6..905ddfb good_bmark -> good_bmark + bac818c..bf447ee 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.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 84e69657c0a1:2aca7ca55989 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 21 - remote big push expecting success: @@ -4281,80 +4317,6 @@ 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 58f9cd2b499c:50b7107fbe4a -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 c5e67316d580 -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) -/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) -/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 bbfca3d07097:88fddb16dc9a -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 21 - remote big push expecting success: @@ -4431,42 +4393,133 @@ fi ) -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' +/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/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) +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 0b2dcb2b5055:698f8f6b93ee +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 c49d802392da +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) +/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) +/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 097e046f79e4:b0841044a82a +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. +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 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-remote-hg: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 +searching for changes +adding remote bookmark bad_bmark +adding remote bookmark good_bmark adding remote bookmark bad_bmark adding remote bookmark good_bmark -added 3 changesets with 3 changes to 1 files -new changesets 612d8dd1596c:a17559883cbc -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 f8dcd3f3a98f +new changesets df58a236f406 +added 3 changesets with 3 changes to 1 files +added 3 changesets with 3 changes to 1 files +new changesets f3e2c2d53b87:20c367ddd3d7 +new changesets f3e2c2d53b87:20c367ddd3d7 progress revision 2 'default' (0/1) +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'bad_branch' (0/2) +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'bad_branch' (0/2) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - d4682eb..2453307 master -> origin/master - d4682eb..2453307 branches/default -> origin/branches/default -Updating d4682eb..2453307 + bba0781..47dd527 master -> origin/master + bba0781..47dd527 branches/default -> origin/branches/default +Updating bba0781..47dd527 Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -4487,16 +4540,42 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets b0bd9a5de939 +new changesets 06225ac5ec0b 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 - d171d0b..d2d5335 branches/default -> origin/branches/default - d171d0b..d2d5335 master -> origin/master + ce70aca..2934ebb branches/default -> origin/branches/default + ce70aca..2934ebb 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 d171d0b substate_hg_a +HEAD is now at ce70aca 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 313400fb5509 +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 + 0782a11..aca5109 branches/default -> origin/branches/default + 0782a11..aca5109 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 0782a11 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+)') @@ -4520,10 +4599,10 @@ adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets a47a426ed827 +new changesets 696b021ccef1 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - dba4263..145b535 good_bmark -> good_bmark - dba4263..f975ea3 master -> master + 20168f0..486b638 good_bmark -> good_bmark + 20168f0..ddb0f1e 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' @@ -4531,71 +4610,95 @@ 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. - dba4263..f975ea3 master -> master - dba4263..145b535 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.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' + 20168f0..ddb0f1e master -> master + 20168f0..486b638 good_bmark -> good_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/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-push/bin/git-remote-hg: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 ec33c7dc2601 -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 -no changes found -progress revision 3 'bad_branch' (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 - 5fa3b5e..eeb6e38 branches/default -> origin/branches/default - 5fa3b5e..eeb6e38 master -> origin/master -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 5cf8b67..9abdaef branches/bad_branch -> origin/branches/bad_branch - dba4263..9abdaef bad_bmark -> origin/bad_bmark - + 145b535...dba4263 good_bmark -> origin/good_bmark (forced update) - + f975ea3...dba4263 master -> origin/master (forced update) -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' +new changesets 696b021ccef1 +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..486b638 good_bmark -> good_bmark + fffffff..ddb0f1e 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. + ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) + ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) + fffffff..ddb0f1e master -> master + fffffff..486b638 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.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) /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+)') -HEAD is now at 5fa3b5e zero_sub_hg_a_x /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) -Successfully rebased and updated detached HEAD. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +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.main-push/bin/git-remote-hg: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+)') /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 +no changes found +updating bookmark good_bmark +2 local changesets published +progress revision 3 'bad_branch' (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) -/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 bad_bmark -adding remote bookmark good_bmark -added 3 changesets with 3 changes to 1 files -new changesets 5bdc34094358:b8777c1e191b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'bad_branch' (0/2) -no changes found +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + ffe4058..2d87185 branches/bad_branch -> origin/branches/bad_branch + 20168f0..2d87185 bad_bmark -> origin/bad_bmark + + 486b638...20168f0 good_bmark -> origin/good_bmark (forced update) + + ddb0f1e...20168f0 master -> origin/master (forced update) +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 + ffe4058..2d87185 branches/bad_branch -> origin/branches/bad_branch + 20168f0..ddb0f1e branches/default -> origin/branches/default + 20168f0..2d87185 bad_bmark -> origin/bad_bmark +ok 10 - subcommand sub subsequent recursive update -- rebase + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update --merge + /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 '\(' @@ -4606,8 +4709,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 - dba4263..145b535 good_bmark -> good_bmark - dba4263..f975ea3 master -> master + 20168f0..486b638 good_bmark -> good_bmark + 20168f0..ddb0f1e 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' @@ -4615,8 +4718,25 @@ 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. - dba4263..f975ea3 master -> master - dba4263..145b535 good_bmark -> good_bmark + 20168f0..ddb0f1e master -> master + 20168f0..486b638 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.main-push/bin/git-remote-hg: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] 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. ! [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 @@ -4663,90 +4783,6 @@ 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) -/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 - -/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 28e12d90026b -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..ec6d7c6 good_bmark -> good_bmark - fffffff..3c57026 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..3c57026 master -> master - fffffff..ec6d7c6 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.main-push/bin/git-remote-hg: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 - 0353996..3836bb6 branches/bad_branch -> origin/branches/bad_branch - c2018a3..3c57026 branches/default -> origin/branches/default - c2018a3..3836bb6 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 '\(' - 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 - ! [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. - ! [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 expecting success: @@ -4792,10 +4828,15 @@ check_bookmark hgrepo new_bmark six 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 @@ -4807,18 +4848,34 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 2487b8c81b87:2848cea214c2 +new changesets 9bb194afe12b:b4ce5083f41e +/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 c07dbe09aa44:9fcb3402d670 +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 8832dd0 zero -HEAD is now at 8832dd0 zero -HEAD is now at 605f45e 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 75c85d1 zero +HEAD is now at 96859ba zero +HEAD is now at 75c85d1 zero +HEAD is now at 96859ba zero +HEAD is now at 1aa9da2 good branch +HEAD is now at 9a9aed4 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 '\(' @@ -4834,75 +4891,118 @@ 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 - + afc1dca...066de87 branches/bad_branch -> branches/bad_branch (forced update) - 605f45e..1762772 branches/good_branch -> branches/good_branch - + 25c41b5...a941a5d bad_bmark1 -> bad_bmark1 (forced update) - + 25c41b5...b90bfcb bad_bmark2 -> bad_bmark2 (forced update) - 25c41b5..668ad82 good_bmark -> good_bmark - 25c41b5..bcfe62f master -> master + + c072fc7...fa4d900 branches/bad_branch -> branches/bad_branch (forced update) + 1aa9da2..b4a0933 branches/good_branch -> branches/good_branch + + 0bca709...20418b8 bad_bmark1 -> bad_bmark1 (forced update) + + 0bca709...2fb7879 bad_bmark2 -> bad_bmark2 (forced update) + 0bca709..ae6ab09 good_bmark -> good_bmark + 0bca709..92604bf master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - 25c41b5..bcfe62f master -> master - 25c41b5..668ad82 good_bmark -> good_bmark - 605f45e..1762772 branches/good_branch -> branches/good_branch + 0bca709..92604bf master -> master + 0bca709..ae6ab09 good_bmark -> good_bmark + 1aa9da2..b4a0933 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + 25c41b5...a941a5d bad_bmark1 -> bad_bmark1 (forced update) - + 25c41b5...b90bfcb bad_bmark2 -> bad_bmark2 (forced update) - + afc1dca...066de87 branches/bad_branch -> branches/bad_branch (forced update) + + 0bca709...20418b8 bad_bmark1 -> bad_bmark1 (forced update) + + 0bca709...2fb7879 bad_bmark2 -> bad_bmark2 (forced update) + + c072fc7...fa4d900 branches/bad_branch -> branches/bad_branch (forced update) 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-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 +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + + fffffff...28a5bb6 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...38e0b37 branches/good_branch -> branches/good_branch (forced update) + + fffffff...17e196b bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...9ebb2c6 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...ae4aad3 good_bmark -> good_bmark (forced update) + + fffffff...ef64dbd master -> master (forced update) + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + + fffffff...ef64dbd master -> master (forced update) + + fffffff...ae4aad3 good_bmark -> good_bmark (forced update) + + fffffff...38e0b37 branches/good_branch -> branches/good_branch (forced update) + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + fffffff...17e196b bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...9ebb2c6 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...28a5bb6 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 5653ba32a2c4:0cc0f32e60b4 +new changesets 559e90aad247:4e9dfe1fa189 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.main-push/bin/git-remote-hg: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] /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 -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 f7d5839e7bbd:d8fe7fa69f2d Cloning into './sub_hg_a'... -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) -HEAD is now at 8b56114 zero -HEAD is now at 8b56114 zero -HEAD is now at 00a184b 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 e594c941b3cb:4e115ca3a7e5 +new changesets 80ec08e9a005:c489c913422e 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' @@ -4918,6 +5018,8 @@ 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] ok 23 - remote big push force expecting success: @@ -4957,115 +5059,13 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/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 -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + fffffff...8d33540 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...7b1ac9c branches/good_branch -> branches/good_branch (forced update) - + fffffff...9e0432b bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...5c462d4 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...888106f good_bmark -> good_bmark (forced update) - + fffffff...54cfe21 master -> master (forced update) - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - + fffffff...54cfe21 master -> master (forced update) - + fffffff...888106f good_bmark -> good_bmark (forced update) - + fffffff...7b1ac9c branches/good_branch -> branches/good_branch (forced update) - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + fffffff...9e0432b bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...5c462d4 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...8d33540 branches/bad_branch -> branches/bad_branch (forced update) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets acf468bb3b03 +new changesets a48a56f3b82e 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) -/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) -/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 8040b2ba3295:d4915563889c -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 '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) ok 23 - remote big push force expecting success: @@ -5105,24 +5105,28 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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) /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 fb4d0622e7c7 -progress revision 2 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 225edcc..a62bd75 master -> origin/master - 225edcc..a62bd75 branches/default -> origin/branches/default -Updating 225edcc..a62bd75 -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] +added 2 changesets with 3 changes to 3 files +new changesets e60c119d102e:f157341078c5 +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 '\(' @@ -5131,6 +5135,12 @@ 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 '\(' + 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 @@ -5138,33 +5148,20 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 987c71fa3763 -Cloning into 'gitrepo'... +new changesets c6f2bf3247d4 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 - a07e10c..2bc4883 branches/default -> origin/branches/default - a07e10c..2bc4883 master -> origin/master +Cloning into 'gitrepo'... +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + 13209e7..a231ab8 master -> origin/master + 13209e7..a231ab8 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) -/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 a07e10c substate_hg_a -Updating a07e10c..2bc4883 +Updating 13209e7..a231ab8 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.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 @@ -5176,33 +5173,61 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets f49c9ceb5f3c:98711b1b26ec +new changesets a1097ce5ae89:51538452278c 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) +HEAD is now at 8f8a93d 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+)') +/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 8f8a93d zero +HEAD is now at 40fa952 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) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -HEAD is now at 8bd7cf9 zero searching for changes adding changesets adding manifests adding file changes -HEAD is now at 8bd7cf9 zero added 1 changesets with 1 changes to 1 files -new changesets fb8a523ae206 -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 - 6a66568..24f6f1b branches/default -> origin/branches/default - 6a66568..24f6f1b master -> origin/master -HEAD is now at 905025f good branch +new changesets 8e31be4cd6e8 +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 + 9f5fafe..5a33499 branches/default -> origin/branches/default + 9f5fafe..5a33499 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. + 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 a1097ce5ae89:ff7e3355bd64 +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) -HEAD is now at 6a66568 zero_sub_hg_a_x -Updating 6a66568..24f6f1b +HEAD is now at 9f5fafe substate_hg_a +Updating 9f5fafe..5a33499 Fast-forward - content_sub_hg_a_x | 2 +- + .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+)') @@ -5212,9 +5237,10 @@ 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 8f8a93d zero +HEAD is now at 8f8a93d 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 /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 '\(' @@ -5225,9 +5251,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 - 905025f..c218ac3 branches/good_branch -> branches/good_branch - 35d2f4c..0f581ee good_bmark -> good_bmark - 35d2f4c..63c2df5 master -> master + 40fa952..3573965 branches/good_branch -> branches/good_branch + 2f46a53..83f2ffa good_bmark -> good_bmark + 2f46a53..b946735 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) @@ -5238,14 +5264,34 @@ 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. - 35d2f4c..63c2df5 master -> master - 35d2f4c..0f581ee good_bmark -> good_bmark - 905025f..c218ac3 branches/good_branch -> branches/good_branch + 2f46a53..b946735 master -> master + 2f46a53..83f2ffa good_bmark -> good_bmark +HEAD is now at 6e77404 good branch + 40fa952..3573965 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) +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets a453dc7e49fc +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 + 7241c5d..26088f7 branches/default -> origin/branches/default + 7241c5d..26088f7 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 7241c5d zero_sub_hg_a_x +Updating 7241c5d..26088f7 +Fast-forward + content_sub_hg_a_x | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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 '\(' @@ -5254,13 +5300,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) -ok 11 - subcommand sub subsequent recursive update -- merge - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_foreach - /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 '\(' @@ -5271,37 +5310,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 - 905025f..c218ac3 branches/good_branch -> branches/good_branch - 35d2f4c..0f581ee good_bmark -> good_bmark - 35d2f4c..63c2df5 master -> master + 40fa952..3573965 branches/good_branch -> branches/good_branch + 2f46a53..83f2ffa good_bmark -> good_bmark + 2f46a53..b946735 master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - 35d2f4c..63c2df5 master -> master - 35d2f4c..0f581ee good_bmark -> good_bmark - 905025f..c218ac3 branches/good_branch -> branches/good_branch + 2f46a53..b946735 master -> master + 2f46a53..83f2ffa good_bmark -> good_bmark + 40fa952..3573965 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_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) -/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 d7bd16c1bb1c:4a7726756508 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at e2757e1 zero -HEAD is now at e2757e1 zero -HEAD is now at 5f127cd 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 '\(' @@ -5310,9 +5328,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 - fffffff..c2c1eb1 branches/good_branch -> branches/good_branch - fffffff..71c0977 good_bmark -> good_bmark - fffffff..ea2b44b master -> master + fffffff..813e523 branches/good_branch -> branches/good_branch + fffffff..9cb79a6 good_bmark -> good_bmark + fffffff..914d845 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) @@ -5323,14 +5341,32 @@ 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..ea2b44b master -> master - fffffff..71c0977 good_bmark -> good_bmark - fffffff..c2c1eb1 branches/good_branch -> branches/good_branch + fffffff..914d845 master -> master + fffffff..9cb79a6 good_bmark -> good_bmark + fffffff..813e523 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +/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 11 - subcommand sub subsequent recursive update -- merge + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_foreach + /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-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 '\(' @@ -5339,15 +5375,16 @@ 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..c2c1eb1 branches/good_branch -> branches/good_branch - fffffff..71c0977 good_bmark -> good_bmark - fffffff..ea2b44b master -> master + fffffff..813e523 branches/good_branch -> branches/good_branch + fffffff..9cb79a6 good_bmark -> good_bmark + fffffff..914d845 master -> master * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - fffffff..ea2b44b master -> master - fffffff..71c0977 good_bmark -> good_bmark - fffffff..c2c1eb1 branches/good_branch -> branches/good_branch + fffffff..914d845 master -> master + fffffff..9cb79a6 good_bmark -> good_bmark + fffffff..813e523 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: @@ -5393,17 +5430,6 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo 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 -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) ok 24 - remote big push dry-run expecting success: @@ -5449,78 +5475,135 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 +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 ec546a0101a7:0f3f71770a3d +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) +HEAD is now at 863ebe5 zero +HEAD is now at 863ebe5 zero +HEAD is now at 6107a42 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 243a8dcba6c0:18511109a71b +new changesets f16a45200e45:f92c728aba58 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.main/bin/git-remote-hg: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 + + e8b67ca...dbff271 branches/bad_branch -> branches/bad_branch (forced update) + 6107a42..d9f1667 branches/good_branch -> branches/good_branch + + 98ee302...903c346 bad_bmark1 -> bad_bmark1 (forced update) + + 98ee302...1ef9ac7 bad_bmark2 -> bad_bmark2 (forced update) + 98ee302..746c3e6 good_bmark -> good_bmark + 98ee302..0b488ed master -> master + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> 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) + 98ee302..0b488ed master -> master + 98ee302..746c3e6 good_bmark -> good_bmark + 6107a42..d9f1667 branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + 98ee302...903c346 bad_bmark1 -> bad_bmark1 (forced update) + + 98ee302...1ef9ac7 bad_bmark2 -> bad_bmark2 (forced update) + + e8b67ca...dbff271 branches/bad_branch -> branches/bad_branch (forced update) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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] 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) -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 +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 ff6990480684:dd93142eb797 /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 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) added 2 changesets with 3 changes to 3 files -new changesets ee6d9be5443f:abd573e8ecd2 +new changesets d4974bc7ac17:d2d31ee15fb1 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.main/bin/git-remote-hg: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) Cloning into './sub_hg_a/sub_hg_a_x'... -adding changesets -adding manifests -adding file changes -adding remote bookmark bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark +HEAD is now at cdce9f9 zero +HEAD is now at cdce9f9 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+)') /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 4 changesets with 4 changes to 1 files -new changesets e22a87613752:e496e3b45432 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 18ba264 zero -HEAD is now at 18ba264 zero -HEAD is now at cc0e861 good branch +HEAD is now at e81c14a 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 1 changesets with 1 changes to 1 files -new changesets 9e0842b0509c +new changesets be1d0ac4b126 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' @@ -5536,45 +5619,68 @@ 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.main/bin/git-remote-hg: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 - + db9fe78...d49924e branches/bad_branch -> branches/bad_branch (forced update) - cc0e861..1693d59 branches/good_branch -> branches/good_branch - + 81f878e...a7b1b58 bad_bmark1 -> bad_bmark1 (forced update) - + 81f878e...a4633d4 bad_bmark2 -> bad_bmark2 (forced update) - 81f878e..4341d06 good_bmark -> good_bmark - 81f878e..76b098c master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - 81f878e..76b098c master -> master - 81f878e..4341d06 good_bmark -> good_bmark - cc0e861..1693d59 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + 81f878e...a7b1b58 bad_bmark1 -> bad_bmark1 (forced update) - + 81f878e...a4633d4 bad_bmark2 -> bad_bmark2 (forced update) - + db9fe78...d49924e branches/bad_branch -> branches/bad_branch (forced update) +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 + ) + /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 8adafc421b5e:7966a703b58b +new changesets e5d8e2ae07c3:e5253bbadd9d 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 '\(' + 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...55d964c branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...8c1a721 branches/good_branch -> branches/good_branch (forced update) + + fffffff...f25a6a3 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...7df9485 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...eaf099a good_bmark -> good_bmark (forced update) + + fffffff...0e51406 master -> master (forced update) + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark /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...0e51406 master -> master (forced update) + + fffffff...eaf099a good_bmark -> good_bmark (forced update) + + fffffff...8c1a721 branches/good_branch -> branches/good_branch (forced update) + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + fffffff...f25a6a3 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...7df9485 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...55d964c 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:154: SyntaxWarning: invalid escape 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 '\(' @@ -5611,10 +5717,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) -hg 96abcd43d1def99f100813e8af6d5dfed62ed84c abd573e8ecd267a02c9d169ea008a2e44e4d0b19 sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo -hg 97934f7500fcef697419dcba266438a4a8e6091f 9e0842b0509c5e80f26c43158722a91ea17c3b05 sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg c3abcfdae34ba41d63623c3a361f20a1bd36c8e2 7966a703b58b9567fb4d595aab3008ddf117615a sub_hg_b /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg ccd185e422c7b84f757593ffbcdf411d4c4b1de2 d2d31ee15fb12ceaf11efe4276c962649d9b4d84 sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg eb5fc659fc019a3759ff9a0bcac8d9a203bf1e5c be1d0ac4b1267a195e3ee827fd9bbd8f3bb52589 sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg e4121446a5b641f0e22ce85065b555cd123920eb e5253bbadd9dfe385ad1d2f7fac9fe11b9814ce4 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 +Cloning into 'gitrepo'... ok 12 - subcommand sub foreach expecting success: @@ -5647,95 +5754,10 @@ 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) -/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 bebdc6aecb8e:95d293053fb5 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 4bee3be zero -HEAD is now at 4bee3be zero -HEAD is now at 4e83a9c good branch -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 - ) - -/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...8da0aac branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...8490a19 branches/good_branch -> branches/good_branch (forced update) - + fffffff...d205685 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...d988ede bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...bc564ea good_bmark -> good_bmark (forced update) - + fffffff...df18ef0 master -> master (forced update) - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - + fffffff...df18ef0 master -> master (forced update) - + fffffff...bc564ea good_bmark -> good_bmark (forced update) - + fffffff...8490a19 branches/good_branch -> branches/good_branch (forced update) - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + fffffff...d205685 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...d988ede bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...8da0aac branches/bad_branch -> branches/bad_branch (forced update) -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.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 14fe1aae3788:e52fd28a2960 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -5744,28 +5766,17 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets a79b6882da52:e9cc6e91421c +new changesets 62127558c2d7:12a57701bccb progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -HEAD is now at 6b58083 zero -[master 716cbe4] two +HEAD is now at ed314f3 zero +[master 9ee78e9] 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.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/bin/git-remote-hg: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 @@ -5782,19 +5793,10 @@ 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. +/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] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets bc7ea5b0c6e3 -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) +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways ok 25 - remote big push force dry-run expecting success: @@ -5820,11 +5822,6 @@ test_expect_code 1 git push ) -/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] - url = foobar -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) @@ -5864,121 +5861,76 @@ ! grep feature-a out ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +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) -ok 13 - subcommand sub sync - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repo hg hgrepo && - ( - cd hgrepo && - setup_repo hg sub_hg && - setup_repo git sub_git && - echo "sub_hg = sub_hg" > .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 && - - ( - cd sub_hg && - echo one > content_sub_hg && - git add content_sub_hg && - git commit -m one_sub_hg && - # detached HEAD - git push origin HEAD:master && - # also fetch to ensure notes are updated - git fetch origin - ) && - - ( - cd sub_git && - echo one > content_sub_git && - git add content_sub_git && - git commit -m one_sub_git && - # detached HEAD; push revision to other side ... anywhere - git push origin HEAD:refs/heads/new - ) - ) && - - ( - cd gitrepo && - git-hg-helper sub upstate && - git diff && - git status --porcelain | grep .hgsubstate && - git add .hgsubstate && - git commit -m update_sub && - git push origin master - ) && - - hg clone hgrepo hgclone && - - ( - cd hgclone && - hg update - ) && - - check_branch hgclone default update_sub && - 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.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 +added 2 changesets with 3 changes to 3 files +new changesets 512f7399255e:abe1a5e5a304 +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] adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 659bb7805aad:ea522a3e9100 +new changesets 5eb6cac04971:9c5d3ab1815a +Cloning into 'gitrepo'... progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -HEAD is now at 261aa66 zero -[master 9940956] two +/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] +HEAD is now at cd61460 zero +[master 66548bc] 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' +/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/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-push/bin/git-remote-hg: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'... /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+)') +/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 -no changes found adding changesets adding manifests adding file changes adding remote bookmark feature-a -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' added 2 changesets with 2 changes to 1 files -new changesets 659bb7805aad:7a61599cd932 +new changesets 1f7827168a0f:f6ee1aa8eb4f +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +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. @@ -5987,25 +5939,35 @@ 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.helper/hgrepo/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/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] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 2df38bd06d13 /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] +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/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' +/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) 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:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 26 - remote double failed push expecting success: @@ -6037,19 +5999,13 @@ ! grep feature-a out ) -/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 + url = foobar 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 - [deleted] (none) -> origin/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) ok 27 - fetch prune expecting success: @@ -6094,62 +6050,90 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 86715d276f19:ffa931acaf99 -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) +ok 13 - subcommand sub sync + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repo hg hgrepo && + ( + cd hgrepo && + setup_repo hg sub_hg && + setup_repo git sub_git && + echo "sub_hg = sub_hg" > .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 && + + ( + cd sub_hg && + echo one > content_sub_hg && + git add content_sub_hg && + git commit -m one_sub_hg && + # detached HEAD + git push origin HEAD:master && + # also fetch to ensure notes are updated + git fetch origin + ) && + + ( + cd sub_git && + echo one > content_sub_git && + git add content_sub_git && + git commit -m one_sub_git && + # detached HEAD; push revision to other side ... anywhere + git push origin HEAD:refs/heads/new + ) + ) && + + ( + cd gitrepo && + git-hg-helper sub upstate && + git diff && + git status --porcelain | grep .hgsubstate && + git add .hgsubstate && + git commit -m update_sub && + git push origin master + ) && + + hg clone hgrepo hgclone && + + ( + cd hgclone && + hg update + ) && + + check_branch hgclone default update_sub && + check_branch hgclone/sub_hg default one_sub_hg && + check hgclone/sub_git HEAD one_sub_git + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /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 3f90b9261fdf -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_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] -[detached HEAD b38ad4c] one_sub_hg - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes adding remote bookmark feature-a added 2 changesets with 2 changes to 1 files -new changesets 489b6ae25d8c:3d1c7f0e85e0 -/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) +new changesets 661cf823f039:027c7d60dc8b progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) created new head @@ -6158,52 +6142,33 @@ 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] -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.helper/hgrepo/sub_hg - fffffff..b38ad4c HEAD -> 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) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' /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] +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + - [deleted] (none) -> origin/feature-a WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets 17dabcbd642c:31649066697d +new changesets 1881f3ba99cf:ddaf2630d35f 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) -/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) 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. - or locale.getdefaultlocale()[1] -no changes found -error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - - [deleted] (none) -> origin/feature-a -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg: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 -1 local changesets published ok 27 - fetch prune expecting success: @@ -6248,42 +6213,30 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - c16aa3b..b38ad4c branches/default -> origin/branches/default -[detached HEAD cea1af1] one_sub_git +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(+), 1 deletion(-) -To /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git - * [new branch] HEAD -> new -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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] + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 a790ed356dbcc5ce4fb3a1edfd16ca89e0a9db89 [git b38ad4c] -Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] -diff --git a/.hgsubstate b/.hgsubstate -index e64f568..6c2dc59 100644 ---- a/.hgsubstate -+++ b/.hgsubstate -@@ -1,2 +1,2 @@ --e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --3f90b9261fdfc4ee3cbf5c67ccb070edaf65422e sub_hg -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+a790ed356dbcc5ce4fb3a1edfd16ca89e0a9db89 sub_hg - M .hgsubstate -[master 366c477] 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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) +/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 e12e69e45bfe:f3c7d2bbd356 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -6293,24 +6246,25 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e3d7f3d3cf0d +new changesets b34c1b57fc95 WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'branches/default' (2/2) progress revision 0 'default' (0/2) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + 83fd6ba...8054f8c branches/default -> origin/branches/default (forced update) - + 83fd6ba...8054f8c 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] -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.helper/hgrepo - fffffff..366c477 master -> master + + 1d930a7...c14d9ea branches/default -> origin/branches/default (forced update) + + 1d930a7...c14d9ea master -> origin/master (forced update) 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.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) ok 28 - fetch multiple independent histories expecting success: @@ -6337,27 +6291,41 @@ git push origin bookmark ) -Cloning into '/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgclone/sub_git'... -done. -Switched to a new branch 'new' -updating to branch default -cloning subrepo sub_git from /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git -cloning subrepo sub_hg from /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg -3 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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 b51c748dabd9 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) created new 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) +Cloning into './sub_git'... +done. Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/gitrepo/ -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-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 ed98320] 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.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] adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets 4562b482700f:36be219a5518 +new changesets b6c1fc80f664:7b195799ed01 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) @@ -6366,72 +6334,59 @@ * [new branch] master -> master * [new branch] branches/default -> origin/branches/default * [new branch] master -> origin/master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +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/sub_hg + fffffff..ed98320 HEAD -> 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, 1 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+)') /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 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 - ) - -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: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 + 9c4999f..ed98320 branches/default -> origin/branches/default +[detached HEAD cea1af1] one_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +To /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git + * [new branch] HEAD -> new /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg: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 adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets efe046a647d3 +new changesets d5de5b2603e6 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] 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 64b07cc] b +[bookmark bc71004] b Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 b @@ -6439,25 +6394,56 @@ 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' +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 1542b8ab1443 +WARNING: Branch 'default' has more than one head, consider merging +progress revision walk 'branches/default' (2/2) +progress revision 0 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + + 91e8707...1fa829f branches/default -> origin/branches/default (forced update) + + 91e8707...1fa829f master -> origin/master (forced update) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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) +Updating ./sub_hg to a6d09229558444877e1d97d7eaeabcb427ce50b9 [git ed98320] +Updating ./sub_git to cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 [git cea1af1] /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 +diff --git a/.hgsubstate b/.hgsubstate +index 6973323..a8197c7 100644 +--- a/.hgsubstate ++++ b/.hgsubstate +@@ -1,2 +1,2 @@ +-e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git +-b51c748dabd99cb5e9cfd2e92b4649a2ddaa4129 sub_hg ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git ++a6d09229558444877e1d97d7eaeabcb427ce50b9 sub_hg WARNING: Ignoring invalid bookmark 'bookmark' + M .hgsubstate searching for changes adding changesets +[master 868ca44] update_sub + Author: A U Thor + 1 file changed, 2 insertions(+), 2 deletions(-) adding manifests adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new branch] bookmark -> bookmark -/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:154: SyntaxWarning: invalid escape 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 29 - clone remote with null bookmark, then push expecting success: @@ -6478,18 +6464,6 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets d331a0bb97a1 -WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'branches/default' (2/2) -progress revision 0 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - + b3bebb4...9d1053c branches/default -> origin/branches/default (forced update) - + b3bebb4...9d1053c master -> origin/master (forced update) ok 28 - fetch multiple independent histories expecting success: @@ -6516,32 +6490,110 @@ git push origin bookmark ) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + fffffff..868ca44 master -> master +Cloning into '/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgclone/sub_git'... +done. +Switched to a new branch 'new' +updating to branch default +cloning subrepo sub_git from /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git +cloning subrepo sub_hg from /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg +3 files updated, 0 files merged, 0 files removed, 0 files unresolved +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.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 +ok 14 - subcommand sub addstate added 2 changesets with 2 changes to 1 files -new changesets 1534016997f3:3aae4fd75c02 + +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 + ) + +new changesets 0a6cfa2a8b58:e9cb1d358fee +adding changesets +adding manifests +adding file changes +adding remote bookmark bookmark progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... +added 1 changesets with 1 changes to 1 files +new changesets e7850109328e +WARNING: Ignoring invalid bookmark 'bookmark' +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (fetch) +origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (push) +[bookmark e58e4dc] b + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 b /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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.helper/hgrepo/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 30 - notes @@ -6570,32 +6622,6 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -adding changesets -adding manifests -adding file changes -adding remote bookmark bookmark -added 1 changesets with 1 changes to 1 files -new changesets 3e8bddc36fb3 -WARNING: Ignoring invalid bookmark 'bookmark' -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (fetch) -origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo (push) -[bookmark 65b9918] b - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 b -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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] -/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 WARNING: Ignoring invalid bookmark 'bookmark' searching for changes @@ -6625,20 +6651,11 @@ git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 3eb3e30162ec:2639bc0d0d3f /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' (1/1) -progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -6647,69 +6664,53 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 9a68b33ca845 +new changesets e15d2bd8f274 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) -[master 9b8d7f1] two +Cloning into 'gitrepo'... +[master fd6af3c] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -Cloning into './sub_hg_a'... -/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.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) +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 b9ff31785b40:65e2e35464e3 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] no changes found searching for changes adding changesets -adding changesets -adding manifests adding manifests adding file changes -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 - a407a8e..9b8d7f1 master -> master -added 1 changesets with 1 changes to 1 files -new changesets ed026f8dd439 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) + bff6383..fd6af3c master -> 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) /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] ---- expected 2026-03-28 02:27:18.846331938 +0000 -+++ actual 2026-03-28 02:27:18.878331938 +0000 -@@ -1,4 +1,3 @@ --58b1be576c185e83c072cf2dbf48d6648236f086 - - 9a68b33ca845602d19998959c0cb09bd6431ba4a - -not ok 31 - push updates notes # TODO known breakage +ok 30 - notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6728,34 +6729,21 @@ cd gitrepo && echo two > content && git commit -a -m two && - git push origin master && - git branch feature-a && - git push origin feature-a + git push ) && - check_bookmark hgrepo feature-a two + hg -R hgrepo log --template "{node}\n\n" > expected && + git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && + test_cmp expected actual -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 77e33e0cee8d:313841f044f8 -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) -/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. -[detached HEAD cea1af1] one_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -ok 30 - notes +--- expected 2025-02-22 20:15:16.829551435 +0000 ++++ actual 2025-02-22 20:15:17.177542341 +0000 +@@ -1,4 +1,3 @@ +-e3b5c2d4a7fd080f00a3de7eb105bbf5bd633974 + + e15d2bd8f2742a661e3c179cc237c82f4fd9ad10 + +not ok 31 - push updates notes # TODO known breakage expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6774,96 +6762,86 @@ cd gitrepo && echo two > content && git commit -a -m two && - git push + git push origin master && + git branch feature-a && + git push origin feature-a ) && - hg -R hgrepo log --template "{node}\n\n" > expected && - git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && - test_cmp expected actual + check_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. +/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.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) +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 6941c21b4277:6d279678344e +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.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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') - afdbe34ac17544f23781980ab2ef525f3f3550b2 ./sub_hg_a (heads/master) --ee234b965bf32b4070f35947fcec20a68005bc69[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) - afdbe34ac17544f23781980ab2ef525f3f3550b2 ./sub_hg_a (heads/master) --ee234b965bf32b4070f35947fcec20a68005bc69[hg] ./sub_hg_b -+e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -/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+)') +Cloning into 'gitrepo'... /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 -new changesets bab9f1f18947 -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'... +Cloning into './sub_hg_a'... /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+)') -[master 6effdc2] 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:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) -ok 15 - subcommand sub status - -# passed all 15 test(s) -1..15 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg: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: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 -searching for changes +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -adding changesets added 1 changesets with 1 changes to 1 files +new changesets bdf08d711947 +adding changesets adding manifests adding file changes -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - ef23f14..6effdc2 master -> master +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) added 1 changesets with 1 changes to 1 files -new changesets bab9f1f18947 +new changesets 270f4d027b14 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] +[master ff4c8cc] 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' + 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 +new changesets 201c3e7a4d5e /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) -[master 6effdc2] two +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master a194a1f] 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' @@ -6874,22 +6852,46 @@ 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 -1 local changesets published searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new branch] feature-a -> feature-a + 51b8b57..ff4c8cc 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-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 +/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 manifests adding file changes +Cloning into './sub_git'... added 1 changesets with 1 changes to 1 files +done. To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..6effdc2 master -> master -ok 32 - push bookmark without changesets + fffffff..a194a1f 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) +[detached HEAD cea1af1] one_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +ok 31 - push updates notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6904,14 +6906,47 @@ git clone "hg::hgrepo" gitrepo && - (cd hgrepo && hg tag v1.0) && - (cd gitrepo && git pull) && + ( + cd gitrepo && + echo two > content && + git commit -a -m two && + git push origin master && + git branch feature-a && + git push origin feature-a + ) && - echo "v1.0" > expected && - git --git-dir=gitrepo/.git tag > actual && - test_cmp expected actual + check_bookmark hgrepo feature-a two -ok 31 - push updates notes +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 +/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) + e7c4683c0adc545e558b7467ef0fe3cfb6d0c0c0 ./sub_hg_a (heads/master) +-fbd207321ebb7c2298b35e042696373629a19cc8[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) + e7c4683c0adc545e558b7467ef0fe3cfb6d0c0c0 ./sub_hg_a (heads/master) +-fbd207321ebb7c2298b35e042696373629a19cc8[hg] ./sub_hg_b ++e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~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) +/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: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6926,54 +6961,40 @@ git clone "hg::hgrepo" gitrepo && - ( - cd gitrepo && - echo two > content && - git commit -a -m two && - git push origin master && - git branch feature-a && - git push origin feature-a - ) && + (cd hgrepo && hg tag v1.0) && + (cd gitrepo && git pull) && - check_bookmark hgrepo feature-a two + echo "v1.0" > expected && + git --git-dir=gitrepo/.git tag > actual && + test_cmp expected actual Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 ++cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) /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 24fa4d607633 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +ok 15 - subcommand sub status + +# passed all 15 test(s) +1..15 /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 24fa4d607633 +new changesets 0184d3f10fc8 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master f3c7e56] two +[master b64caf8] 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 '\(' @@ -6981,17 +7002,61 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg: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 +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 7446645b25fc +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..f3c7e56 master -> master + fffffff..b64caf8 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) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +1 local changesets published +searching for changes +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new branch] feature-a -> feature-a +/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 32 - push bookmark without changesets + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + echo one > content && + hg add content && + hg commit -m one + ) && + + git clone "hg::hgrepo" gitrepo && + + (cd hgrepo && hg tag v1.0) && + (cd gitrepo && git pull) && + + echo "v1.0" > expected && + 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: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 @@ -7001,13 +7066,13 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets a2cb435f89eb +new changesets b5a558f0d1f1 progress revision 1 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 92fef2f..3635872 master -> origin/master - 92fef2f..3635872 branches/default -> origin/branches/default + 3b0730e..dbc0a73 master -> origin/master + 3b0730e..dbc0a73 branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -Updating 92fef2f..3635872 +Updating 3b0730e..dbc0a73 Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -7047,37 +7112,6 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -1 local changesets published -searching for changes -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new branch] feature-a -> feature-a -ok 32 - push bookmark without changesets - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && - - ( - hg init hgrepo && - cd hgrepo && - echo one > content && - hg add content && - hg commit -m one - ) && - - git clone "hg::hgrepo" gitrepo && - - (cd hgrepo && hg tag v1.0) && - (cd gitrepo && git pull) && - - echo "v1.0" > expected && - git --git-dir=gitrepo/.git tag > actual && - test_cmp expected actual - -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) 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+)') @@ -7085,35 +7119,25 @@ 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] -1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding changesets adding manifests adding file changes -Cloning into 'gitrepo'... +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) added 1 changesets with 1 changes to 1 files -new changesets 25db8ebea72b +new changesets b2d79f798d9b progress revision walk 'bookmarks/master' (0/0) -/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 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 25db8ebea72b:8bd69b4c336c -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'feature' (0/1) +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:154: SyntaxWarning: invalid escape 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] searching for changes @@ -7121,33 +7145,21 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 5535b3d69a00 +new changesets ddbd338bc5af progress revision 1 'default' (0/1) -Auto-merging content -Merge made by the 'ort' strategy. - content | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 4c8d49a..0fa9635 master -> origin/master - 4c8d49a..0fa9635 branches/default -> origin/branches/default + ca6c566..bf340dd master -> origin/master + ca6c566..bf340dd branches/default -> origin/branches/default * [new tag] v1.0 -> v1.0 -/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 -Updating 4c8d49a..0fa9635 +Updating ca6c566..bf340dd Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) create mode 100644 .hgtags -no changes found -searching for changes -adding changesets -adding manifests ok 33 - pull tags expecting success: @@ -7183,10 +7195,34 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual +adding changesets +adding manifests +adding file changes +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets 3a120b6af899:a7a2e36c8a0c +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'feature' (0/1) +Auto-merging content +Merge made by the 'ort' strategy. + content | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 (-1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 224d452..0ccf2e2 master -> master + bcc0738..28cc856 master -> master ok 34 - push merged named branch expecting success: @@ -7214,11 +7250,11 @@ marked working directory as branch feature (branches are permanent and global, did you want a bookmark?) Cloning into 'gitrepo'... -1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -7228,32 +7264,32 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e11add66c949 +new changesets 5cb83207b986 /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] progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets ce7f04840d12:7c0ab610f3ed /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' (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-push/bin/git-remote-hg: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 3 changesets with 3 changes to 1 files (+1 heads) +new changesets bee14f90093c:91f3b46a1243 no changes found +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) +progress revision 1 'feature' (0/1) searching for changes adding changesets adding manifests @@ -7307,9 +7343,7 @@ 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..d36cfad master -> master -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) + fffffff..a434d05 master -> master ok 34 - push merged named branch expecting success: @@ -7334,11 +7368,20 @@ hg -R hgrepo log --template "{author}\n" -r tip > actual && test_cmp expected actual +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) +Cloning into 'gitrepo'... +/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 @@ -7346,19 +7389,25 @@ adding changesets adding manifests adding file changes +added 1 changesets with 1 changes to 1 files +new changesets a204b2ae0e27 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +adding changesets +adding manifests +adding file changes added 2 changesets with 2 changes to 1 files -new changesets 9b017be7a495:01bea05894e4 +new changesets baa303695561:6bad6ef1c501 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'feature' (0/1) -Cloning into 'gitrepo'... +* master +Switched to a new branch 'branches/feature' +branch 'branches/feature' set up to track 'origin/branches/feature'. /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 -Switched to a new branch 'branches/feature' -branch 'branches/feature' set up to track 'origin/branches/feature'. /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 '\(' @@ -7369,14 +7418,15 @@ 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 +no changes found adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 20d734fcb784 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -no changes found +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 searching for changes adding changesets adding manifests @@ -7384,10 +7434,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 -/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: @@ -7408,16 +7454,6 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - * [new tag] v1.0 -> v1.0 ok 35 - light tag sets author expecting success: @@ -7447,39 +7483,46 @@ hg -R hgrepo log --template="{branch}\n" -r tip > actual && test_cmp expected actual -Cloning into '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) +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: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:154: SyntaxWarning: invalid escape 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 -/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 1 changes to 1 files -new changesets c04c2804e978:44cef786f882 +added 2 changesets with 2 changes to 1 files +new changesets 6a6c15db6c37:7557adb0f3ca +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'feature' (0/1) adding changesets adding manifests adding file changes +added 2 changesets with 1 changes to 1 files +new changesets ce9995a084a1:e953ec71eb9b progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -added 2 changesets with 2 changes to 1 files -new changesets b5d5db972543:203edfbc639e -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'feature' (0/1) +* master +Switched to a new branch 'branches/feature' +branch 'branches/feature' set up to track 'origin/branches/feature'. +/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 37 - cloning a removed file works expecting success: @@ -7503,13 +7546,6 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file/test_file" -* master -Switched to a new branch 'branches/feature' -branch 'branches/feature' set up to track 'origin/branches/feature'. -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 @@ -7520,7 +7556,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 -Cloning into 'gitrepo'... ok 36 - push tag different branch expecting success: @@ -7541,6 +7576,7 @@ 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 '\(' @@ -7553,7 +7589,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets 923ec04fec75:20eb16d50dda +new changesets 22ad5fedc0ea:af4533f78fb3 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) Cloning into 'gitrepo'... @@ -7592,7 +7628,7 @@ adding manifests adding file changes added 2 changesets with 1 changes to 1 files -new changesets 55e8b1893194:d6ee53097f22 +new changesets fd2e7534b3d4:98a5029c32fb progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) ok 37 - cloning a removed file works @@ -7627,20 +7663,27 @@ or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 2 files -new changesets 705e9931868e:68aebaf55bde -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) +added 2 changesets with 2 changes to 2 files +new changesets 9a803d4b437f:52dde09406c2 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files +new changesets 7289287cd92d:d559476d359c +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 39 - clone replace directory with a file expecting success: @@ -7664,15 +7707,6 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -new changesets b6ce689fa097:fbcd46291cce -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?) ok 38 - cloning a file replaced with a directory expecting success: @@ -7698,8 +7732,17 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file" +marked working directory as branch parent +(branches are permanent and global, did you want a bookmark?) marked working directory as branch parent/child 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] /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 '\(' @@ -7711,19 +7754,42 @@ adding changesets adding manifests adding file changes +added 2 changesets with 2 changes to 2 files +new changesets ee1ca7ad19dc:624aa836edd8 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +adding changesets +adding manifests +adding file changes added 3 changesets with 3 changes to 1 files -new changesets bbef33e8a9ea:1250980d30fa +new changesets 088427b6b04f:aa084794b17f 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) -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] +ok 39 - clone replace directory with a file + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + + touch test.txt && + hg add test.txt && + hg commit -m master && + hg branch parent && + echo test >test.txt && + hg commit -m test && + hg branch parent/child && + echo test1 >test.txt && + hg commit -m test1 + ) && + + git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && + check_files gitrepo "test.txt" + ok 40 - clone can ignore invalid refnames expecting success: @@ -7753,18 +7819,14 @@ test_cmp expected actual -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -new changesets 8c14fd7dcbe8:1005967cec8c -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) +marked working directory as branch parent +(branches are permanent and global, did you want a bookmark?) +marked working directory as branch parent/child /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 @@ -7772,53 +7834,71 @@ adding changesets adding manifests adding file changes -ok 39 - clone replace directory with a file - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && - - ( - hg init hgrepo && - cd hgrepo && - - touch test.txt && - hg add test.txt && - hg commit -m master && - hg branch parent && - echo test >test.txt && - hg commit -m test && - hg branch parent/child && - echo test1 >test.txt && - hg commit -m test1 - ) && - - git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && - check_files gitrepo "test.txt" - added 1 changesets with 1 changes to 1 files -new changesets d226b345b336 +new changesets 55a6a589e0c3 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -marked working directory as branch parent -(branches are permanent and global, did you want a bookmark?) +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] +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 3 changesets with 3 changes to 1 files +new changesets 60f3f92b16fc:8a76a8504a85 +WARNING: Ignoring matched branch parent/child WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'parent' (0/1) no changes found searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -marked working directory as branch parent/child 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'... +ok 40 - clone can ignore invalid refnames + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + echo one > content && + hg add content && + hg commit -m one + ) && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git tag -m "Version 1.0" v1.0 && + git push --tags + ) && + + cat > expected <<-\EOF && + tip:Version 1.0:C O Mitter + v1.0:one:H G Wells + EOF + + hg -R hgrepo log --template "{tags}:{desc}:{author}\n" > actual && + + test_cmp expected actual + ok 41 - push annotated tag expecting success: @@ -7842,36 +7922,26 @@ 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:154: SyntaxWarning: invalid escape 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) -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 -added 3 changesets with 3 changes to 1 files -new changesets 248b9f73e808:1129344ac1ef no changes found -WARNING: Ignoring matched branch parent/child warning: You appear to have cloned an empty repository. -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'parent' (0/1) +Cloning into 'gitrepo'... [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:154: SyntaxWarning: invalid escape 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 '\(' @@ -7881,35 +7951,6 @@ WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found -ok 40 - clone can ignore invalid refnames - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo" && - - ( - hg init hgrepo && - cd hgrepo && - echo one > content && - hg add content && - hg commit -m one - ) && - - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git tag -m "Version 1.0" v1.0 && - git push --tags - ) && - - cat > expected <<-\EOF && - tip:Version 1.0:C O Mitter - v1.0:one:H G Wells - EOF - - hg -R hgrepo log --template "{tags}:{desc}:{author}\n" > actual && - - test_cmp expected actual - searching for changes adding changesets adding manifests @@ -7917,45 +7958,35 @@ added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new branch] master -> master +/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 'gitrepo2'... /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 1 changesets with 1 changes to 1 files -new changesets e522f351d13b -Cloning into 'gitrepo'... +new changesets f1254a981caa 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/bin/git-remote-hg: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: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 42 - timezone issues with negative offsets - -# still have 2 known breakage(s) -# passed all remaining 40 test(s) -1..42 +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 19bf72ba7405 +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:154: SyntaxWarning: invalid escape 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 @@ -7966,6 +7997,11 @@ 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 42 - timezone issues with negative offsets + +# still have 2 known breakage(s) +# passed all remaining 40 test(s) +1..42 ok 41 - push annotated tag expecting success: @@ -8066,7 +8102,7 @@ adding file changes adding remote bookmark feature-a added 1 changesets with 1 changes to 1 files -new changesets f6ee731d38af +new changesets fbdef7fb39cd 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' @@ -8121,10 +8157,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 84c4948398ad +new changesets 8b12a01eef38 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master dc063e2] one +[master 142e621] 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' @@ -8186,7 +8222,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets deffa4f7b6ab +new changesets 2f2e79a27a63 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -8214,12 +8250,12 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets d56858901dc2:1befc3c3d141 +new changesets 50bc687c8f63:bc4db41cc92b 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 - 65d75d7..766af92 master -> origin/master - 65d75d7..766af92 branches/default -> origin/branches/default -HEAD is now at 766af92 restored + 8ccbd32..4d87f88 master -> origin/master + 8ccbd32..4d87f88 branches/default -> origin/branches/default +HEAD is now at 4d87f88 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 '\(' @@ -8228,9 +8264,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 87e7b1373f8ea2eb0f38007bf82ea6c669b3cf9a) + ! [remote rejected] master -> master (rejected not pushing hg based commit b634f35662b7df2abdd17cd0142fcb67004e6f3d) 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 87e7b1373f8ea2eb0f38007bf82ea6c669b3cf9a) + ! [remote rejected] master -> master (rejected not pushing hg based commit b634f35662b7df2abdd17cd0142fcb67004e6f3d) ok 45 - check-hg-commits with fail mode expecting success: @@ -8266,27 +8302,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 - 307a1e7..86793b7 master -> origin/master - 307a1e7..86793b7 branches/default -> origin/branches/default -HEAD is now at 86793b7 restored + 3bb9c0d..f1ead04 master -> origin/master + 3bb9c0d..f1ead04 branches/default -> origin/branches/default +HEAD is now at f1ead04 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 f6e1a87ff993e35c855d3b34c031c8aa80ea2063 for d6633063153137a37170f1f3806d7a584c7899a5 -WARNING: Pushing hg changeset 2cd40ab0f9cb20c886237b6c27f1e730786e89b2 for 2108fdb08f0f393cd6dc552d4273d3f04aa1761a -WARNING: Pushing hg changeset dea7a726277861b762b990abf6c0623f44cec3ff for 67c0441039e583a85f89ad47cf6b44b8d4bc5484 -WARNING: Pushing hg changeset d127252b3ae9701a59f522c80e4a4359b2bfe17e for a27b8f7328f5c5574e4cca4674e63653cd3673da -WARNING: Pushing hg changeset 9c6125330d281085980e4ade5ff686c4a4cfdd7d for 86793b77876fe3140e4125d9d4c63df241bb2bd6 +WARNING: Pushing hg changeset 20bd4d21cf6fe5b3e8af85a9c544fdbfd03af049 for 452379c2f0ecc945523b0e8b1984e3914016f008 +WARNING: Pushing hg changeset b3bf7e150075db1db3b43eded16aa8833ee973b4 for 658c91ca45565dc544c65d53ed868e4d228b90ca +WARNING: Pushing hg changeset 6c48cbea000a6aa28de8f1ee5bf5adc912fc865c for 80a3bb344bf8d91a64b6832ac85e5aad56ac30c2 +WARNING: Pushing hg changeset c251f39838e2624716ea06cc3d5808c00ff4aaa2 for 767d10704befabb3ad0a84b2d38621badec00f1f +WARNING: Pushing hg changeset 4e176c5b49df0a300461f9dddb2709263168f65b for f1ead0488b322aa5646a981253d6f9d3bd9588a9 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..86793b7 master -> master -WARNING: Pushing hg changeset f6e1a87ff993e35c855d3b34c031c8aa80ea2063 for d6633063153137a37170f1f3806d7a584c7899a5 -WARNING: Pushing hg changeset 2cd40ab0f9cb20c886237b6c27f1e730786e89b2 for 2108fdb08f0f393cd6dc552d4273d3f04aa1761a -WARNING: Pushing hg changeset dea7a726277861b762b990abf6c0623f44cec3ff for 67c0441039e583a85f89ad47cf6b44b8d4bc5484 -WARNING: Pushing hg changeset d127252b3ae9701a59f522c80e4a4359b2bfe17e for a27b8f7328f5c5574e4cca4674e63653cd3673da -WARNING: Pushing hg changeset 9c6125330d281085980e4ade5ff686c4a4cfdd7d for 86793b77876fe3140e4125d9d4c63df241bb2bd6 + fffffff..f1ead04 master -> master +WARNING: Pushing hg changeset 20bd4d21cf6fe5b3e8af85a9c544fdbfd03af049 for 452379c2f0ecc945523b0e8b1984e3914016f008 +WARNING: Pushing hg changeset b3bf7e150075db1db3b43eded16aa8833ee973b4 for 658c91ca45565dc544c65d53ed868e4d228b90ca +WARNING: Pushing hg changeset 6c48cbea000a6aa28de8f1ee5bf5adc912fc865c for 80a3bb344bf8d91a64b6832ac85e5aad56ac30c2 +WARNING: Pushing hg changeset c251f39838e2624716ea06cc3d5808c00ff4aaa2 for 767d10704befabb3ad0a84b2d38621badec00f1f +WARNING: Pushing hg changeset 4e176c5b49df0a300461f9dddb2709263168f65b for f1ead0488b322aa5646a981253d6f9d3bd9588a9 ok 46 - check-hg-commits with push mode - no local proxy expecting success: @@ -8303,7 +8339,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 9fb4d0a6bec7 +new changesets 1efd49a9847c progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -8331,12 +8367,12 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets a6b08e763d41:1de51c782804 +new changesets 9255910cedd2:92818b859c42 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 - 3e47cf2..d80702c master -> origin/master - 3e47cf2..d80702c branches/default -> origin/branches/default -HEAD is now at d80702c restored + 6a87091..2fc517c master -> origin/master + 6a87091..2fc517c branches/default -> origin/branches/default +HEAD is now at 2fc517c 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 '\(' @@ -8344,23 +8380,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 a6b08e763d418f92bb194c2d8856486a058a5bd1 for 079848ccf03a7c3bb5086b95e83c028a227d3b4a -WARNING: Using hg changeset fcfc899d745cdaceefdb8a4fb93d583ca7ad6154 for ce139ef88368118f5154c8b3a42558386a97f229 -WARNING: Using hg changeset 0cc75b3ff3514055a161e752f9dd62d55b3136b5 for 697799971bf80e7c581329e8579c86301534d192 -WARNING: Using hg changeset 0b30224eb5f440939afa860d32449711956d187f for e82e661a0f15c1c82dd96a89e495f1e4072d3490 -WARNING: Using hg changeset 1de51c782804da3a683c7b6ced0bf9d8fa02cb3d for d80702c3a8896543d422d03efefea8ec549ede74 +WARNING: Using hg changeset 9255910cedd2065c7af23dbc0678984e35201f83 for dc63119bfe97cdd754bf18afe45b24117b0700ec +WARNING: Using hg changeset 561fa6d47657328847c698da9d2ca325ed34f69e for 7fc14ac9c64f4c61ab28ca1fcb2269ca81a8f8f7 +WARNING: Using hg changeset d0ffc68abb248043b6d8dbadbbab610ae4f1f505 for 772cb7c7e682c339b0bf0f91e82786445a3115fd +WARNING: Using hg changeset 0b830ad20e3d773f98ae9c8ef2f2a2cfefc43a88 for 921409830cb3b1b89429b83a03a91ceee67f5d27 +WARNING: Using hg changeset 92818b859c421872ef7f540db08bd66931ceae20 for 2fc517c6dcbd60c055d2a25c696b140b84d5f16a 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..d80702c master -> master -WARNING: Using hg changeset a6b08e763d418f92bb194c2d8856486a058a5bd1 for 079848ccf03a7c3bb5086b95e83c028a227d3b4a -WARNING: Using hg changeset fcfc899d745cdaceefdb8a4fb93d583ca7ad6154 for ce139ef88368118f5154c8b3a42558386a97f229 -WARNING: Using hg changeset 0cc75b3ff3514055a161e752f9dd62d55b3136b5 for 697799971bf80e7c581329e8579c86301534d192 -WARNING: Using hg changeset 0b30224eb5f440939afa860d32449711956d187f for e82e661a0f15c1c82dd96a89e495f1e4072d3490 -WARNING: Using hg changeset 1de51c782804da3a683c7b6ced0bf9d8fa02cb3d for d80702c3a8896543d422d03efefea8ec549ede74 + fffffff..2fc517c master -> master +WARNING: Using hg changeset 9255910cedd2065c7af23dbc0678984e35201f83 for dc63119bfe97cdd754bf18afe45b24117b0700ec +WARNING: Using hg changeset 561fa6d47657328847c698da9d2ca325ed34f69e for 7fc14ac9c64f4c61ab28ca1fcb2269ca81a8f8f7 +WARNING: Using hg changeset d0ffc68abb248043b6d8dbadbbab610ae4f1f505 for 772cb7c7e682c339b0bf0f91e82786445a3115fd +WARNING: Using hg changeset 0b830ad20e3d773f98ae9c8ef2f2a2cfefc43a88 for 921409830cb3b1b89429b83a03a91ceee67f5d27 +WARNING: Using hg changeset 92818b859c421872ef7f540db08bd66931ceae20 for 2fc517c6dcbd60c055d2a25c696b140b84d5f16a ok 47 - check-hg-commits with push mode - with local proxy expecting success: @@ -8386,7 +8422,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 2df054672dfb +new changesets be0251af3c4e 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' @@ -8400,23 +8436,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Mar 28 02:29 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Mar 28 02:29 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Feb 22 20:19 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Feb 22 20:19 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Feb 22 20:19 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:19 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:19 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 refs ok 48 - shared-marks unset expecting success: @@ -8452,7 +8488,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7af81f0a5aeb +new changesets 317d523f31d6 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' @@ -8466,39 +8502,39 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Mar 28 02:29 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Mar 28 02:29 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Feb 22 20:19 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Feb 22 20:19 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Feb 22 20:19 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:19 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:19 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 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 origin with shared; performing gc +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' 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/origin/marks-git and .git/hg/marks-git -WARNING: gc for origin failed -WARNING: seeded marks of second with shared; performing gc +ERROR: found both .git/hg/second/marks-git and .git/hg/marks-git +WARNING: gc for second failed +WARNING: seeded marks of origin with shared; performing gc /build/reproducible-path/git-remote-hg-1.0.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' @@ -8513,26 +8549,28 @@ Writing hg marks ... Writing git marks ... no changes found +progress revision walk 'branches/default' (0/0) +progress revision 0 'default' (0/1) total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Feb 22 20:19 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Mar 28 02:29 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Mar 28 02:29 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs -total 20 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone --rw-r--r-- 1 pbuilder1 pbuilder1 0 Mar 28 02:29 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 71 Mar 28 02:29 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:19 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Feb 22 20:19 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Feb 22 20:19 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 refs +total 24 +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:19 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Feb 22 20:19 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Feb 22 20:19 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:19 refs ok 49 - shared-marks set to unset expecting success: @@ -8577,7 +8615,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 70826ef34c60 +new changesets 407a77bbc37a 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' @@ -8593,25 +8631,25 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:20 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Feb 22 20:20 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Mar 28 02:29 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Mar 28 02:29 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:20 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:19 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Feb 22 20:20 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Feb 22 20:20 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Mar 28 02:29 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Mar 28 02:29 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:20 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:20 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Feb 22 20:20 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Feb 22 20:20 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 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 '\(' @@ -8620,25 +8658,25 @@ or locale.getdefaultlocale()[1] no changes found total 20 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:20 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Feb 22 20:20 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 second total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Mar 28 02:29 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Mar 28 02:29 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:20 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:19 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Feb 22 20:20 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Feb 22 20:20 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 refs total 24 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Mar 28 02:29 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Mar 28 02:29 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:20 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:20 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Feb 22 20:20 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Feb 22 20:20 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 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 '\(' @@ -8648,23 +8686,23 @@ WARNING: using marks of remote origin as shared marks no changes found total 28 -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 9 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Mar 28 02:29 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Mar 28 02:29 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 second +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:20 . +drwxr-xr-x 9 pbuilder2 pbuilder2 4096 Feb 22 20:20 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:19 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Feb 22 20:20 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Feb 22 20:20 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 second total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:20 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:19 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 refs total 16 -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 . -drwxr-xr-x 5 pbuilder1 pbuilder1 4096 Mar 28 02:29 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Mar 28 02:29 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Mar 28 02:29 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 . +drwxr-xr-x 5 pbuilder2 pbuilder2 4096 Feb 22 20:20 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Feb 22 20:20 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Feb 22 20:20 refs ok 50 - shared-marks unset to set expecting success: @@ -8717,7 +8755,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: @@ -8792,7 +8830,7 @@ debian/rules override_dh_auto_install make[1]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' dh_auto_install -- prefix=/usr install-doc - make -j42 install DESTDIR=/build/reproducible-path/git-remote-hg-1.0.4\~ds/debian/git-remote-hg AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" prefix=/usr install-doc + make -j20 install DESTDIR=/build/reproducible-path/git-remote-hg-1.0.4\~ds/debian/git-remote-hg AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true" prefix=/usr install-doc make[2]: Entering directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' if [ -n "$PYTHON" ] && "$PYTHON" -c 'import mercurial' 2> /dev/null ; then \ : Use chosen Python version ; \ @@ -8832,8 +8870,8 @@ make[1]: Leaving directory '/build/reproducible-path/git-remote-hg-1.0.4~ds' dh_installman dh_python3 -I: dh_python3 tools:113: replacing shebang in debian/git-remote-hg/usr/bin/git-remote-hg I: dh_python3 tools:113: replacing shebang in debian/git-remote-hg/usr/bin/git-hg-helper +I: dh_python3 tools:113: replacing shebang in debian/git-remote-hg/usr/bin/git-remote-hg dh_perl dh_link dh_strip_nondeterminism @@ -8852,12 +8890,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/991445/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/991445/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/1810657 and its subdirectories -I: Current time: Fri Mar 27 14:30:02 -12 2026 -I: pbuilder-time-stamp: 1774665002 +I: removing directory /srv/workspace/pbuilder/991445 and its subdirectories +I: Current time: Sun Feb 23 10:20:26 +14 2025 +I: pbuilder-time-stamp: 1740255626