Diff of the two buildlogs: -- --- b1/build.log 2025-01-02 03:35:02.357125426 +0000 +++ b2/build.log 2025-01-02 03:43:57.304623144 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Tue Feb 3 21:54:09 -12 2026 -I: pbuilder-time-stamp: 1770198849 +I: Current time: Thu Jan 2 17:35:05 +14 2025 +I: pbuilder-time-stamp: 1735788905 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/1459874/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/2813119/tmp/hooks/D01_modify_environment starting +debug: Running on codethink04-arm64. +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 Jan 2 03:35 /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/2813119/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/2813119/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='arm64' - DEBIAN_FRONTEND='noninteractive' + 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]="aarch64-unknown-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=arm64 + DEBIAN_FRONTEND=noninteractive DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=12 ' - DISTRIBUTION='unstable' - HOME='/root' - HOST_ARCH='arm64' + DIRSTACK=() + DISTRIBUTION=unstable + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=aarch64 + HOST_ARCH=arm64 IFS=' ' - INVOCATION_ID='2660222e2a0b4507b37defc3131db512' - 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='1459874' - PS1='# ' - PS2='> ' + INVOCATION_ID=0c8d35071201413bbb5e0ec0663eb29f + LANG=C + LANGUAGE=nl_BE:nl + LC_ALL=C + MACHTYPE=aarch64-unknown-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=2813119 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.sMWJ0ori/pbuilderrc_ZGpU --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.sMWJ0ori/b1 --logfile b1/build.log git-remote-hg_1.0.4~ds-2.dsc' - SUDO_GID='109' - SUDO_UID='104' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://192.168.101.4: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.sMWJ0ori/pbuilderrc_6HYB --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.sMWJ0ori/b2 --logfile b2/build.log git-remote-hg_1.0.4~ds-2.dsc' + SUDO_GID=109 + SUDO_UID=104 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://192.168.101.4:3128 I: uname -a - Linux codethink01-arm64 6.1.0-28-cloud-arm64 #1 SMP Debian 6.1.119-1 (2024-11-22) aarch64 GNU/Linux + Linux i-capture-the-hostname 6.1.0-28-cloud-arm64 #1 SMP Debian 6.1.119-1 (2024-11-22) aarch64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Nov 22 2024 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/1459874/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Nov 22 14:40 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/2813119/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -235,7 +267,7 @@ Get: 108 http://deb.debian.org/debian unstable/main arm64 python3-zombie-imp all 0.0.2-2 [11.7 kB] Get: 109 http://deb.debian.org/debian unstable/main arm64 sharness all 1.0.0-1.1 [28.6 kB] Get: 110 http://deb.debian.org/debian unstable/main arm64 xmlto arm64 0.0.28-3.1 [26.9 kB] -Fetched 49.9 MB in 1s (78.7 MB/s) +Fetched 49.9 MB in 0s (108 MB/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 ... 19971 files and directories currently installed.) @@ -605,8 +637,8 @@ Setting up tzdata (2024b-4) ... Current default time zone: 'Etc/UTC' -Local time is now: Wed Feb 4 09:54:51 UTC 2026. -Universal Time is now: Wed Feb 4 09:54:51 UTC 2026. +Local time is now: Thu Jan 2 03:35:56 UTC 2025. +Universal Time is now: Thu Jan 2 03:35:56 UTC 2025. Run 'dpkg-reconfigure tzdata' if you wish to change it. Setting up liberror-perl (0.17029-2) ... @@ -711,7 +743,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-2_source.changes +I: user script /srv/workspace/pbuilder/2813119/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for unstable +I: user script /srv/workspace/pbuilder/2813119/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-2_source.changes dpkg-buildpackage: info: source package git-remote-hg dpkg-buildpackage: info: source version 1.0.4~ds-2 dpkg-buildpackage: info: source distribution unstable @@ -768,6 +804,18 @@ expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && + setup_repos && + + ( + cd gitrepo && + test_expect_code 2 git-hg-helper help 2> ../help + ) + # remotes should be in help output + grep origin help + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + ( git init -q gitrepo && cd gitrepo && @@ -810,6 +858,15 @@ hg commit -m zero ) +expecting success: + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero + ) + [master (root-commit) 79c6ce2] add älphà Author: A U Thor 1 file changed, 1 insertion(+) @@ -822,31 +879,10 @@ Author: tést èncödîng 1 file changed, 1 insertion(+) create mode 100644 gamma -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repos && - - ( - cd gitrepo && - test_expect_code 2 git-hg-helper help 2> ../help - ) - # remotes should be in help output - grep origin help - [master 3b0b48f] add déltà Author: tést èncödîng 1 file changed, 1 insertion(+) create mode 100644 delta -expecting success: - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero - ) - /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 '\(' @@ -854,6 +890,12 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 4 changesets with 4 changes to 4 files +Cloning into 'gitrepo'... ok 1 - setup expecting success: @@ -862,24 +904,14 @@ check gitrepo HEAD zero 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+)') -searching for changes -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -adding changesets -adding manifests -adding file changes -added 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) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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 1 - setup expecting success: @@ -888,30 +920,36 @@ check gitrepo HEAD zero Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets cfdba23a5810 /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.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets cfdba23a5810 +new changesets 6defb1904ac9 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 6defb1904ac9 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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) +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 2 - cloning expecting success: @@ -927,26 +965,15 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/branches/next next -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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] -marked working directory as branch next -(branches are permanent and global, did you want a bookmark?) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets cfdba23a5810 +new changesets 110a1f5cf0c0 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -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:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 2 - cloning expecting success: @@ -962,9 +989,18 @@ git clone "hg::hgrepo" gitrepo && check gitrepo origin/branches/next next -Cloning into 'gitrepo'... 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) +marked working directory as branch next +(branches are permanent and global, did you want a bookmark?) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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 '\(' @@ -989,41 +1025,29 @@ test_cmp expected actual +/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:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -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.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 2 changesets with 2 changes to 1 files -new changesets cfdba23a5810:daa6f35016e0 +new changesets 6defb1904ac9:0bf9cc9ec220 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'next' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets cfdba23a5810:daa6f35016e0 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'next' (0/1) -searching for changes -no changes found ok 3 - cloning with branches expecting success: @@ -1041,11 +1065,24 @@ check gitrepo origin/feature-a feature-a searching for changes +no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +searching for changes adding changesets adding manifests adding file changes 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 110a1f5cf0c0:d560f9a79841 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'next' (0/1) 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -1071,7 +1108,11 @@ 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.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 1 - encoding expecting success: @@ -1105,17 +1146,10 @@ test_cmp expected actual -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] [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 alpha -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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 862befc] add beta Author: A U Thor 1 file changed, 1 insertion(+) @@ -1125,6 +1159,8 @@ 1 file changed, 1 insertion(+) create mode 100644 foo/bar rm 'alpha' +/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] [master 74dc957] remove alpha Author: A U Thor 1 file changed, 1 deletion(-) @@ -1135,12 +1171,12 @@ 1 file changed, 1 deletion(-) delete mode 100644 foo/bar 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] ok 2 - subcommand repo - no local proxy +/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+)') expecting success: test_when_finished "rm -rf gitrepo* hgrepo*" && @@ -1156,25 +1192,25 @@ test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 -/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 adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets cfdba23a5810:f5ca569a9e2c -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +new changesets 6defb1904ac9:9a1cf53aa3fc 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) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 4 - cloning with bookmarks expecting success: @@ -1201,19 +1237,12 @@ adding file changes adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets cfdba23a5810:f5ca569a9e2c -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +new changesets 110a1f5cf0c0:94e4f03da252 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'next' (0/1) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files -Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 4 - cloning with bookmarks expecting success: @@ -1235,6 +1264,13 @@ check_bookmark hgrepo devel devel +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 5 changesets with 3 changes to 3 files +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -1244,59 +1280,70 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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 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 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 cfdba23a5810:f5ca569a9e2c +new changesets 6defb1904ac9:9a1cf53aa3fc +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.helper/bin/git-remote-hg: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) -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/2) -progress revision 1 'next' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets da69b23f40f1 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +new changesets b4c372f96e6e progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel 42f4a64] devel +[devel f10c3dc] 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) 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] adding remote bookmark devel adding remote bookmark feature-a added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets cfdba23a5810:f5ca569a9e2c +new changesets 110a1f5cf0c0:94e4f03da252 +/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 'next' (0/1) +[devel 782f05d] 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.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 @@ -1304,27 +1351,22 @@ new changesets 362b656574c3:54f595cbdf1f progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/5) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg: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 42f4a64] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) -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) no changes found 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] 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] +/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 +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: @@ -1345,16 +1387,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) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -no changes found ok 5 - update bookmark expecting success: @@ -1372,15 +1404,12 @@ check_bookmark hgrepo feature-b feature-b Cloning into 'gitrepo'... -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 3 changes to 3 files /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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] ok 5 - update bookmark expecting success: @@ -1397,11 +1426,18 @@ check_bookmark hgrepo feature-b feature-b +searching for changes +no changes found Cloning into 'gitrepo'... +searching for changes +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 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:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -1412,55 +1448,68 @@ adding remote bookmark devel adding remote bookmark feature-a added 4 changesets with 4 changes to 1 files (+1 heads) -new changesets cfdba23a5810:ef2235b056b3 +new changesets 6defb1904ac9:daf7e7aa8fbd 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) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -[feature-b de8cdbd] 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) +Cloning into 'gitrepo'... 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 cfdba23a5810:ef2235b056b3 +new changesets 110a1f5cf0c0:161344758878 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-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 6dfc781] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/3) progress revision 1 'next' (0/1) -/build/reproducible-path/git-remote-hg-1.0.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 ef0ef7b38b5c -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -[feature-b de8cdbd] feature-b +/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 6f85b7b] 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.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 368d56a2440d +no changes found progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +searching for changes +adding changesets +adding manifests +adding file changes +added 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 +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files ok 2 - file removal expecting success: @@ -1490,11 +1539,6 @@ test_cmp expected actual -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files [master (root-commit) 223a6f6] add alpha Author: A U Thor 1 file changed, 1 insertion(+) @@ -1503,20 +1547,8 @@ Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 beta -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape 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 6 - new bookmark expecting success: @@ -1549,9 +1581,6 @@ 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 ok 6 - new bookmark expecting success: @@ -1584,18 +1613,25 @@ test_cmp expected actual -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files -searching for changes +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /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) +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files +searching for changes searching for changes ok 4 - subcommands hg-rev and git-rev @@ -1673,7 +1709,7 @@ adding manifests adding file changes added 4 changesets with 4 changes to 1 files -new changesets d3254d4660d4:6bfac9d6c1fe +new changesets 197c47122a18:2e814bcc3ffc progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) ok 3 - git tags @@ -1715,7 +1751,7 @@ test_cmp expected actual 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/9fe6e79f7f7e-88a1573d-backup.hg +saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/.hg/strip-backup/657ff2dd83cd-769445ac-backup.hg /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -1740,39 +1776,39 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets bfc7b49f94c7 +new changesets a44967397894 progress revision 4 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - + 323e909...4d3bc57 master -> origin/master (forced update) - + 323e909...4d3bc57 branches/default -> origin/branches/default (forced update) -HEAD is now at 4d3bc57 four + + d96df35...ec45ec3 master -> origin/master (forced update) + + d96df35...ec45ec3 branches/default -> origin/branches/default (forced update) Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +HEAD is now at ec45ec3 four /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -Cloning into 'gitrepo'... WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.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 12 changesets with 12 changes to 1 files +new changesets a6dfaa005312:ff2c0e76088b /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 12 changesets with 12 changes to 1 files -new changesets 481261aae513:b8750d935ca5 progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) +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) Loading hg marks ... Loading git marks ... Performing garbage collection on git commits ... @@ -1812,8 +1848,6 @@ 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] ok 7 - authors expecting success: @@ -1853,11 +1887,13 @@ 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 f0b04afbe02d:810cc68c3959 +new changesets 201b356fe438:3c19238472b9 progress revision walk 'bookmarks/master' (11/11) progress revision 0 'master' (0/12) ok 7 - authors @@ -1911,11 +1947,19 @@ m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into 'gitrepo'... searching for changes 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 adding remote bookmark not-master added 2 changesets with 1 changes to 1 files @@ -1923,55 +1967,56 @@ 1 local changesets published progress revision 1 'default' (0/1) progress revision 2 'gamma' (0/1) -Cloning into 'gitrepo'... -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 0c0602615fc5 -/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.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into 'gitrepo'... +adding changesets adding changesets adding manifests +adding manifests +adding file changes adding file changes added 2 changesets with 2 changes to 1 files -new changesets 51ce075e3e7d:af0322dd2882 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +added 1 changesets with 1 changes to 1 files +new changesets fa5feb581a63 +new changesets 5e255caa4e1d:a17df06ffa5f +adding changesets +adding manifests progress revision walk 'bookmarks/master' (1/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) progress revision 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' +adding file changes +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +added 2 changesets with 2 changes to 1 files +new changesets cf0538ea5071:c29f84391e6e +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +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/a17df06ffa5f-687c357d-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] +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/c29f84391e6e-bc71947f-backup.hg +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) 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.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] added 2 changesets with 2 changes to 2 files -/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 @@ -1979,34 +2024,39 @@ added 1 changesets with 0 changes to 0 files searching for changes searching for changes +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets e795c17004cb +new changesets 9fc13003aa13 progress revision 1 'default' (0/1) -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 51ce075e3e7d:4315fd3fca44 From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - f6708a7..a6d1e23 master -> origin/master - f6708a7..a6d1e23 branches/default -> origin/branches/default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo/.hg/strip-backup/af0322dd2882-a208c898-backup.hg -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -saved backup bundle to /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo/.hg/strip-backup/4315fd3fca44-36e6b87a-backup.hg -0 files updated, 0 files merged, 0 files removed, 0 files unresolved + 6b0c673..b95edf1 master -> origin/master + 6b0c673..b95edf1 branches/default -> origin/branches/default +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +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:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files (+1 heads) +new changesets 435adb0896ac:3504aed9def4 +progress revision 2 'default' (0/2) +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + + 36d492f...1f008fd master -> origin/master (forced update) + + 36d492f...1f008fd branches/default -> origin/branches/default (forced update) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure @@ -2016,49 +2066,13 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets c149d4790056:31bdad03903f +new changesets e5b28cb356a0:80ab8041fcfe progress revision 2 'default' (0/2) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - + f816a15...bd81757 master -> origin/master (forced update) - + f816a15...bd81757 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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -ok 6 - subcommand [some-repo] - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - setup_repo hg hgrepo && - ( - cd hgrepo && - setup_repo hg sub_hg_a && - setup_repo hg sub_hg_b && - setup_repo git sub_git && - echo "sub_hg_a = sub_hg_a" > .hgsub && - echo "sub_hg_b = sub_hg_b" >> .hgsub && - echo "sub_git = [git]sub_git" >> .hgsub && - hg add .hgsub && - hg commit -m substate - ) - - git clone hg::hgrepo gitrepo && - - ( - cd gitrepo && - git-hg-helper sub update --force && - test -f content_hgrepo && - test -f sub_hg_a/content_sub_hg_a && - test -f sub_hg_b/content_sub_hg_b && - test -f sub_git/content_sub_git - ) && - - check gitrepo HEAD substate && - check gitrepo/sub_hg_a HEAD zero_sub_hg_a && - check gitrepo/sub_hg_b HEAD zero_sub_hg_b && - check gitrepo/sub_git HEAD zero_sub_git - + + 3367d25...7abc1d5 master -> origin/master (forced update) + + 3367d25...7abc1d5 branches/default -> origin/branches/default (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] ok 4 - hg branch expecting success: @@ -2092,26 +2106,6 @@ test_cmp expected actual -[master (root-commit) 223a6f6] add alpha - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 alpha -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -searching for changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files (+1 heads) -new changesets c149d4790056:31bdad03903f -progress revision 2 'default' (0/2) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - + 9bd2dfd...bd81757 master -> origin/master (forced update) - + 9bd2dfd...bd81757 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) ok 8 - strip expecting success: @@ -2138,15 +2132,10 @@ 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 -adding file changes -added 1 changesets with 1 changes to 1 files -searching for changes +[master (root-commit) 223a6f6] add alpha + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 alpha ok 8 - strip expecting success: @@ -2173,80 +2162,137 @@ check_branch hgrepo default two -0 files updated, 0 files merged, 0 files removed, 0 files unresolved +ok 6 - subcommand [some-repo] + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + setup_repo hg hgrepo && + ( + cd hgrepo && + setup_repo hg sub_hg_a && + setup_repo hg sub_hg_b && + setup_repo git sub_git && + echo "sub_hg_a = sub_hg_a" > .hgsub && + echo "sub_hg_b = sub_hg_b" >> .hgsub && + echo "sub_git = [git]sub_git" >> .hgsub && + hg add .hgsub && + hg commit -m substate + ) + + git clone hg::hgrepo gitrepo && + + ( + cd gitrepo && + git-hg-helper sub update --force && + test -f content_hgrepo && + test -f sub_hg_a/content_sub_hg_a && + test -f sub_hg_b/content_sub_hg_b && + test -f sub_git/content_sub_git + ) && + + check gitrepo HEAD substate && + check gitrepo/sub_hg_a HEAD zero_sub_hg_a && + check gitrepo/sub_hg_b HEAD zero_sub_hg_b && + check gitrepo/sub_git HEAD zero_sub_git + /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) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +no changes found searching for changes adding changesets adding manifests adding file changes -adding remote bookmark not-master added 1 changesets with 1 changes to 1 files -new changesets 16869bbe54be -1 local changesets published -progress revision 1 'default' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +searching for changes 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) +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: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.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) adding changesets adding manifests adding file changes adding remote bookmark master added 2 changesets with 2 changes to 1 files -new changesets 1b621c4d95e2:6559da8ff71c +new changesets da937fbea9c4:68ae32c4ffed progress revision walk 'bookmarks/default' (1/1) progress revision 0 'default' (0/2) -[default 2bf97f9] two +[default 74b628b] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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.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 +adding remote bookmark master +added 2 changesets with 2 changes to 1 files +searching for changes +new changesets afef01f0cd4f:459e699e0b95 +adding changesets +adding manifests +adding file changes +adding remote bookmark not-master +added 1 changesets with 1 changes to 1 files +new changesets 16869bbe54be +1 local changesets published +progress revision walk 'bookmarks/default' (1/1) +progress revision 0 'default' (0/2) +progress revision 1 'default' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +[default 3ae5cb4] 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.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +no changes found +searching for changes adding changesets adding manifests adding file changes -adding remote bookmark master +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + fffffff..74b628b default -> default Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -added 2 changesets with 2 changes to 1 files -new changesets 1b621c4d95e2:089a07761fd9 [master (root-commit) e9a16bb] zero_sub_git Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content_sub_git -progress revision walk 'bookmarks/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 2671212] 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' +/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.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) no changes found searching for changes @@ -2255,9 +2301,32 @@ adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - 6a7b4af..2bf97f9 default -> default + 0f3670b..3ae5cb4 default -> default /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 9 - remote push with master bookmark + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo*" && + + hg init hgrepo && + + ( + git init gitrepo && + cd gitrepo && + git remote add origin "hg::../hgrepo" && + echo one > content && + git add content && + git commit -a -m one && + git push origin master + ) && + + hg -R hgrepo log > actual && + cat actual && + test_cmp expected actual && + + check_branch hgrepo default one + searching for changes no changes found searching for changes @@ -2273,22 +2342,6 @@ * [new branch] not-master -> not-master ! [rejected] alpha -> alpha (already exists) error: failed to push some refs to 'hg::../hgrepo2' -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -hint: Updates were rejected because the tag already exists in the remote. -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/hgrepo - fffffff..2671212 default -> default -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 9 - remote push with master bookmark expecting success: @@ -2312,8 +2365,21 @@ check_branch hgrepo default one -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... +hint: Updates were rejected because the tag already exists in the remote. +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/gitrepo/.git/ +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-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 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/gitrepo/.git/ [master (root-commit) 64caca5] one Author: A U Thor @@ -2323,36 +2389,37 @@ 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 9 - remote push with master bookmark - -expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && - - hg init hgrepo && - - ( - git init gitrepo && - cd gitrepo && - git remote add origin "hg::../hgrepo" && - echo one > content && - git add content && - git commit -a -m one && - git push origin master - ) && - - hg -R hgrepo log > actual && - cat actual && - test_cmp expected actual && - - check_branch hgrepo default one - +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 6f81b71528c0:9bdfbaaaa61c +new changesets bdb90db4b799:1fb2d5747487 +no changes found progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) +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.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::../hgrepo + * [new branch] master -> master ok 5 - hg tags expecting success: @@ -2392,6 +2459,8 @@ 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] [master (root-commit) a663549] add alpha Author: A U Thor Date: Mon Jan 1 00:00:00 2007 +0000 @@ -2402,6 +2471,10 @@ Date: Mon Jan 1 00:00:00 2007 +0100 1 file changed, 1 insertion(+) create mode 100644 beta +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-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 d7a1343] add gamma Author: A U Thor Date: Mon Jan 1 00:00:00 2007 -0100 @@ -2412,86 +2485,34 @@ Date: Mon Jan 1 00:00:00 2007 +0130 1 file changed, 1 insertion(+) create mode 100644 delta +Cloning into './sub_hg_a'... [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 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - 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/ -[master (root-commit) 64caca5] one - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -no changes found -searching for changes -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -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.main-push/bin/git-remote-hg: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.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_a'... -no changes found /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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::../hgrepo -no changes found - * [new branch] master -> master -searching for changes -adding changesets -adding manifests -adding file changes -added 5 changesets with 5 changes to 5 files changeset: 0:6e2126489d3d tag: tip user: A U Thor date: Mon Jan 01 00:00:00 2007 +0230 summary: one -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets c23d2791f702 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) changeset: 0:6e2126489d3d tag: tip user: A U Thor date: Mon Jan 01 00:00:00 2007 +0230 summary: one +/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] ok 10 - remote push from master branch expecting success: @@ -2508,19 +2529,13 @@ git clone "hg::hgrepo" gitrepo && check gitrepo HEAD zero -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-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.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 0ad9d0f91d55 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) ok 10 - remote push from master branch expecting success: @@ -2539,28 +2554,52 @@ /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] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-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 './sub_hg_b'... +searching for changes 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-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 051fd4a08dcb +new changesets 5c6dfaa37709 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -progress revision walk 'bookmarks/master' (4/4) -progress revision 0 'master' (0/5) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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'... Cloning into './sub_git'... done. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 7 - subcommand sub initial update (hg and git subrepos) expecting success: @@ -2586,40 +2625,31 @@ 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 -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - 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] -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 -no changes found adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets f6b9271e0c79 -searching for changes +new changesets b593aadb1175 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/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-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +progress revision walk 'bookmarks/master' (4/4) +progress revision 0 'master' (0/5) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets af66de353c51 ok 11 - remote cloning expecting success: @@ -2633,23 +2663,12 @@ ) Cloning into 'gitrepo'... +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 f6b9271e0c79 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways ok 11 - remote cloning expecting success: @@ -2667,38 +2686,54 @@ 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 '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets f6b9271e0c79 +new changesets b593aadb1175 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.bidi/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets /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 f6b9271e0c79 +new changesets af66de353c51 +searching for changes +no changes found +searching for changes +adding changesets +adding manifests progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways +adding file changes +added 5 changesets with 5 changes to 5 files /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -ok 6 - test timezones - -# passed all 6 test(s) -1..6 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +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] no changes found ok 12 - moving remote clone @@ -2721,14 +2756,6 @@ check_bookmark hgrepo devel devel -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -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 12 - moving remote clone expecting success: @@ -2750,57 +2777,66 @@ 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 +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 '\(' -adding changesets 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 devel added 1 changesets with 1 changes to 1 files -new changesets f6b9271e0c79 +new changesets b593aadb1175 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[devel 0439b0c] devel +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +ok 6 - test timezones + +[devel 2674336] devel Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +# 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] adding changesets adding manifests adding file changes adding remote bookmark devel added 1 changesets with 1 changes to 1 files -new changesets f6b9271e0c79 +new changesets af66de353c51 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +[devel 7c2e8be] 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 -[devel 0439b0c] devel - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -/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 @@ -2830,18 +2866,6 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - 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 f6b9271e0c79:51f3872bfe4f -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) ok 13 - remote update bookmark expecting success: @@ -2863,18 +2887,10 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -[feature-b 082b04a] 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) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_b/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets @@ -2882,29 +2898,54 @@ adding file changes adding remote bookmark devel added 2 changesets with 2 changes to 1 files -new changesets f6b9271e0c79:51f3872bfe4f +new changesets b593aadb1175:955b689c4de9 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -[feature-b 082b04a] feature-b +adding remote bookmark devel +added 2 changesets with 2 changes to 1 files +new changesets af66de353c51:c8ac190695d6 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +[feature-b a6426e8] feature-b + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[feature-b 85e0943] feature-b Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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_hg_b/sub_git/.git/ +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. 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 +no changes found +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 ok 14 - remote new bookmark expecting success: @@ -2931,28 +2972,10 @@ check_branch hgrepo default bump Cloning into 'gitrepo'... -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:154: SyntaxWarning: invalid escape sequence '\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 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 -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 f6b9271e0c79:8e83887cfab4 -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) ok 14 - remote new bookmark expecting success: @@ -2983,16 +3006,11 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-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. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg: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) -/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. +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 @@ -3000,21 +3018,42 @@ adding remote bookmark devel adding remote bookmark feature-b added 3 changesets with 3 changes to 1 files -new changesets f6b9271e0c79:8e83887cfab4 +new changesets b593aadb1175:8d9eac1e88d9 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) adding changesets adding manifests adding file changes +adding remote bookmark devel +adding remote bookmark feature-b +added 3 changesets with 3 changes to 1 files +new changesets af66de353c51:be5c365804e7 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +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 +(leaving bookmark devel) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +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 e526351ed903:f427ee0163c2 +new changesets dafa0f13b7e1:e7bae242ce3c progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -[master 233cf75] diverged +[master 681f732] diverged + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) +[master 91f2711] diverged Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -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-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' @@ -3026,11 +3065,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) -[master 233cf75] 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:154: SyntaxWarning: invalid escape sequence '\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 '\(' @@ -3044,7 +3078,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets d6214e493e87 +new changesets 88c177dd2426 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' @@ -3053,26 +3087,35 @@ hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ! [rejected] master -> master (non-fast-forward) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets a2dc0ca25d63:1d4e5d7b6541 -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' +new changesets e88a694943f1:3101cbbd5f7c +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 0d3a02d649e8 +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) +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 15 - remote push diverged expecting success: @@ -3104,36 +3147,19 @@ check_bookmark hgrepo diverge "bump bookmark" -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-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.main-push/bin/git-remote-hg: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 d6214e493e87 -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo' -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. - ! [rejected] master -> master (non-fast-forward) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 3c90eb041ad3 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) ok 15 - remote push diverged expecting success: @@ -3165,47 +3191,33 @@ check_bookmark hgrepo diverge "bump bookmark" -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -Cloning into './sub_hg_b'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +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] +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) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets a7740b82dcbc +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) 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) -/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 1cc47e1bcf86:248d218b9a7e -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. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/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 '\(' @@ -3217,20 +3229,18 @@ adding remote bookmark diverge adding remote bookmark feature-b added 4 changesets with 4 changes to 1 files -new changesets f6b9271e0c79:d6214e493e87 -Cloning into './sub_hg_b/sub_git'... -done. +new changesets af66de353c51:0d3a02d649e8 +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 '\(' progress revision walk 'bookmarks/master' (3/3) + m = re.match(b'^(.+?) ext:\((.+)\)$', name) progress revision 0 'master' (0/4) -ok 8 - subcommand sub initial recursive update - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && - - test_sub_update - -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes @@ -3238,56 +3248,82 @@ adding remote bookmark diverge adding remote bookmark feature-b added 4 changesets with 4 changes to 1 files -new changesets f6b9271e0c79:d6214e493e87 +new changesets b593aadb1175:88c177dd2426 progress revision walk 'bookmarks/master' (3/3) progress revision 0 'master' (0/4) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 1ac670e3d700:1c55b24fee59 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) created new head -[diverge 1b2ac70] diverge +[diverge 5a6a786] diverge Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-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) created new head -[diverge 1b2ac70] diverge +Cloning into './sub_hg_b/sub_git'... +done. +[diverge 0cc9da9] diverge Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +ok 8 - subcommand sub initial recursive update + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_update + +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways searching for changes adding changesets adding manifests adding file changes updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 80066bb93fdd -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo +new changesets 213b3ac68adc +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/hgrepo' +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-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 updating bookmark diverge added 1 changesets with 1 changes to 1 files (+1 heads) -new changesets 0fd9295d3498 -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo +new changesets a62679a36c19 +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-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. @@ -3310,14 +3346,12 @@ check_bookmark hgrepo feature-c feature-c 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. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. 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 16 - remote update bookmark diverge expecting success: @@ -3335,9 +3369,9 @@ check_bookmark hgrepo feature-c feature-c Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' +/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) adding changesets adding manifests @@ -3346,19 +3380,21 @@ adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets f6b9271e0c79:80066bb93fdd +new changesets af66de353c51:213b3ac68adc WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/4) -[feature-c 76f5a9a] feature-c +[feature-c 2ae93c9] 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) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes @@ -3366,20 +3402,18 @@ adding remote bookmark diverge adding remote bookmark feature-b added 5 changesets with 5 changes to 1 files (+1 heads) -new changesets f6b9271e0c79:0fd9295d3498 +new changesets b593aadb1175:a62679a36c19 WARNING: Branch 'default' has more than one head, consider merging progress revision walk 'bookmarks/master' (4/4) progress revision 0 'master' (0/4) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. 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-c 76f5a9a] feature-c +[feature-c 2a4fe41] 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' +/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) no changes found searching for changes @@ -3387,8 +3421,10 @@ 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: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 no changes found searching for changes adding changesets @@ -3397,7 +3433,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) ok 17 - remote new bookmark multiple branch head -checking known breakage: +expecting success: test_when_finished "rm -rf gitrepo hgrepo" && ( @@ -3436,7 +3472,7 @@ ok 17 - remote new bookmark multiple branch head -expecting success: +checking known breakage: test_when_finished "rm -rf gitrepo hgrepo" && ( @@ -3474,89 +3510,96 @@ ) 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. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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 07f8db678260 -/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) +new changesets 3196954ecec3 +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/ progress revision walk 'bookmarks/master' (0/0) +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git progress revision 0 'master' (0/1) -[master 3b59cba] copy +[master d82cd86] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -[master ff1f428] moved +[master a75bdb5] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) -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/ -/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/bin/git-remote-hg: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/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) -[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] +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 a831d5b9daaf +new changesets 2003fefb8f61 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. 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 -[master a0260b2] copy +[master 4228c29] copy Author: A U Thor 1 file changed, 2 insertions(+) create mode 100644 content-copy -searching for changes -adding changesets -[master db50258] moved +[master dd82328] moved Author: A U Thor 1 file changed, 0 insertions(+), 0 deletions(-) rename content-copy => content-moved (100%) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +no changes found +searching for changes +adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo - ee58cb7..ff1f428 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. +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo + fffffff..a75bdb5 master -> master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways no changes found -1 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/hgrepo - fffffff..db50258 master -> master +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/hgrepo + dff3d54..dd82328 master -> master 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -not ok 18 - push commits with copy and rename # TODO known breakage +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.helper/bin/git-remote-hg: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 18 - push commits with copy and rename expecting success: test_when_finished "rm -rf hgrepo gitrepo && LC_ALL=C" && @@ -3588,14 +3631,14 @@ echo "ø~?" > expected && test_cmp expected actual -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-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 18 - push commits with copy and rename +adding changesets +adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 475faaa78ca7:8bb2d34273fa +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +not ok 18 - push commits with copy and rename # TODO known breakage expecting success: test_when_finished "rm -rf hgrepo gitrepo && LC_ALL=C" && @@ -3627,14 +3670,6 @@ echo "ø~?" > expected && test_cmp expected actual -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 151747666c52:a2ccc281b19b -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -warning: filename contains '?', which is reserved on Windows: 'ø~?' /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-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' @@ -3652,8 +3687,9 @@ 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 9d14fe0214ef:17e5609a8b84 +new changesets 4ef34eb99291:d678cba2dd3b 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' @@ -3671,18 +3707,18 @@ 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 added 1 changesets with 1 changes to 1 files -new changesets 4820bdcbd688 +new changesets f5797485a2fa 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: 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 '\(' @@ -3693,44 +3729,49 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) warning: filename contains '?', which is reserved on Windows: 'ø~?' +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] 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.helper/bin/git-remote-hg: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 9d0dfa5dd0a8:c1bfb0ca48e4 +new changesets 2509462528a1:8fae73956b64 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 -Cloning into 'gitrepo'... -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) -added 3 changesets with 4 changes to 2 files -new changesets 01881a63939e:a415bc0d06ba -progress revision walk 'bookmarks/master' (2/2) -progress revision 0 'master' (0/3) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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. +adding changesets +adding manifests +adding file changes +added 3 changesets with 4 changes to 2 files +new changesets 110993e9498b:7d3629b27f48 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/3) +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +adding changesets +adding manifests +adding file changes +added 3 changesets with 4 changes to 2 files +new changesets 110993e9498b:01190442f21c ok 19 - fetch special filenames expecting success: @@ -3769,11 +3810,6 @@ printf "content\næ rø\n" > expected && test_cmp expected actual -adding changesets -adding manifests -adding file changes -added 3 changesets with 4 changes to 2 files -new changesets 33baa3a5c2e9:46fa428c9f00 progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/3) ok 19 - fetch special filenames @@ -3814,64 +3850,53 @@ printf "content\næ rø\n" > 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: 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 'gitrepo'... -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) -added 1 changesets with 1 changes to 1 files -new changesets afda29bcafb2 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master b8b8080] 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] +Cloning into 'gitrepo'... searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 0d607fa657ba +new changesets 018d8dbafef1 +/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/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 54e27b3..39fe9c9 master -> origin/master - 54e27b3..39fe9c9 branches/default -> origin/branches/default + 450593e..d4bf1cc master -> origin/master + 450593e..d4bf1cc branches/default -> origin/branches/default +Updating 450593e..d4bf1cc +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets afda29bcafb2 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -Updating 54e27b3..39fe9c9 -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +new changesets 4592345b1708 WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -[master b8b8080] utf-8 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 5107406fbdc6 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 9382b24] utf-8 Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 "\303\246 r\303\270" @@ -3879,44 +3904,71 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - f91a167..b8b8080 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] +[master 1280ead] utf-8 + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 "\303\246 r\303\270" /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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 -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..b8b8080 master -> master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..9382b24 master -> master +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 7def49b..1280ead master -> master searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7fcac4549e8c +new changesets d5194a4684d0 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 - c5cacf7..79cb1a0 branches/default -> origin/branches/default - c5cacf7..79cb1a0 master -> origin/master + 3e38271..7f4b304 branches/default -> origin/branches/default + 3e38271..7f4b304 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 3e38271 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) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] ok 20 - push special filenames expecting success: @@ -3962,20 +4014,6 @@ check_bookmark hgrepo new_bmark fi -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -HEAD is now at c5cacf7 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) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-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 20 - push special filenames expecting success: @@ -4021,23 +4059,21 @@ 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 9e23130d634f +new changesets 50adff607462 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 - a717b01..75bd70a branches/default -> origin/branches/default - a717b01..75bd70a master -> origin/master + b94705d..3efa4ca branches/default -> origin/branches/default + b94705d..3efa4ca 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 a717b01 zero_sub_hg_a_x +HEAD is now at b94705d 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 '\(' @@ -4069,6 +4105,11 @@ 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 @@ -4080,20 +4121,14 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 9e0824d72e37:c79f4667f1e6 -Cloning into 'gitrepo'... +new changesets 778837262d20:00140164bf43 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.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) -HEAD is now at 7bbeaed zero -HEAD is now at 7bbeaed zero -HEAD is now at a6833dc good branch /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +HEAD is now at 2f79082 zero +HEAD is now at 2f79082 zero adding changesets adding manifests adding file changes @@ -4101,13 +4136,14 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 51bf642a2827:0ced1d60226a +new changesets 778837262d20:22dd4a782377 +HEAD is now at ee025e7 good branch progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) -HEAD is now at 71c669c zero -HEAD is now at 71c669c zero -HEAD is now at 1839090 good branch +HEAD is now at 2f79082 zero +HEAD is now at 2f79082 zero +HEAD is now at e379981 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 '\(' @@ -4118,9 +4154,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 - a6833dc..2858511 branches/good_branch -> branches/good_branch - 7e1d4ac..7a06513 good_bmark -> good_bmark - 7e1d4ac..ab44229 master -> master + ee025e7..b931fb4 branches/good_branch -> branches/good_branch + 5e52df8..db27b65 good_bmark -> good_bmark + 5e52df8..fad0be4 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) @@ -4131,9 +4167,9 @@ hint: counterpart. If you want to integrate the remote changes, use 'git pull' hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 7e1d4ac..ab44229 master -> master - 7e1d4ac..7a06513 good_bmark -> good_bmark - a6833dc..2858511 branches/good_branch -> branches/good_branch + 5e52df8..fad0be4 master -> master + 5e52df8..db27b65 good_bmark -> good_bmark + ee025e7..b931fb4 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) @@ -4172,9 +4208,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..27f27e7 branches/good_branch -> branches/good_branch - fffffff..dd004b1 good_bmark -> good_bmark - fffffff..9088b93 master -> master + fffffff..ae310ff branches/good_branch -> branches/good_branch + fffffff..76fa852 good_bmark -> good_bmark + fffffff..dcc8a3f 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) @@ -4185,9 +4221,9 @@ hint: counterpart. If you want to integrate the remote changes, use 'git pull' hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..9088b93 master -> master - fffffff..dd004b1 good_bmark -> good_bmark - fffffff..27f27e7 branches/good_branch -> branches/good_branch + fffffff..dcc8a3f master -> master + fffffff..76fa852 good_bmark -> good_bmark + fffffff..ae310ff 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) @@ -4207,9 +4243,13 @@ or locale.getdefaultlocale()[1] adding changesets adding manifests +adding file changes +added 2 changesets with 3 changes to 3 files +new changesets 3046265e6220:76111821f10e +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 21 - remote big push -adding file changes expecting success: test_when_finished "rm -rf hgrepo gitrepo*" && @@ -4284,10 +4324,6 @@ fi ) -added 2 changesets with 3 changes to 3 files -new changesets 0c39f3cb2651:0611fb0baa12 -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' @@ -4295,6 +4331,27 @@ /build/reproducible-path/git-remote-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 ba5656964296:5f0768aafb31 +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) ok 21 - remote big push expecting success: @@ -4371,27 +4428,6 @@ fi ) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg: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 3e7061d04e31:b12b858f2000 -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+)') @@ -4403,7 +4439,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets d5bca53e458d +new changesets e16d52a398bd 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' @@ -4425,7 +4461,7 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets d7ef2b90a7ff:7d031fb18aa0 +new changesets e99830f64a03:7914a35ed2e8 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' @@ -4453,21 +4489,19 @@ adding remote bookmark bad_bmark adding remote bookmark good_bmark added 3 changesets with 3 changes to 1 files -new changesets 7702ba162055:c1bfcc30fa39 +new changesets 76399b55fdb5:e13daded9eb1 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-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:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-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] searching for changes @@ -4475,25 +4509,27 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 1953a61732b4 +new changesets 38bd0f1b6dfe progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 3779a20..28c499f master -> origin/master - 3779a20..28c499f branches/default -> origin/branches/default + 8f4f1b6..95c46af master -> origin/master + 8f4f1b6..95c46af branches/default -> origin/branches/default +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +Updating 8f4f1b6..95c46af +Fast-forward + .hgsubstate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) 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 7702ba162055:6c790f518867 +new changesets 5b9a7f7e7a15:c07c1475682b progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'bad_branch' (0/2) -Updating 3779a20..28c499f -Fast-forward - .hgsubstate | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' @@ -4504,8 +4540,6 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -4520,10 +4554,10 @@ adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets 8efb4697f0af +new changesets 050b4ade50e3 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 8f30626..ee00886 good_bmark -> good_bmark - 8f30626..9657995 master -> master + 2febe2f..d86ac7a good_bmark -> good_bmark + 2febe2f..9f88eba 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,29 +4565,42 @@ hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. - 8f30626..9657995 master -> master - 8f30626..ee00886 good_bmark -> good_bmark + 2febe2f..9f88eba master -> master + 2febe2f..d86ac7a good_bmark -> good_bmark ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg: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 1aaf4593ea2e -/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] +new changesets 92eb7f462d6f +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways 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 - 415a2ff..7051b42 branches/default -> origin/branches/default - 415a2ff..7051b42 master -> origin/master + 7e1efc7..84349d3 branches/default -> origin/branches/default + 7e1efc7..84349d3 master -> origin/master +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.main/tmp/hgrepo + 3c86d95..d4f5cf5 branches/bad_branch -> origin/branches/bad_branch + 2febe2f..d4f5cf5 bad_bmark -> origin/bad_bmark + + d86ac7a...2febe2f good_bmark -> origin/good_bmark (forced update) + + 9f88eba...2febe2f master -> origin/master (forced update) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -HEAD is now at 415a2ff substate_hg_a +HEAD is now at 7e1efc7 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+)') @@ -4563,17 +4610,35 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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 2af0c15be591 +/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 -progress revision 3 'bad_branch' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 6e09140..3f7f78b branches/bad_branch -> origin/branches/bad_branch - 8f30626..3f7f78b bad_bmark -> origin/bad_bmark - + ee00886...8f30626 good_bmark -> origin/good_bmark (forced update) - + 9657995...8f30626 master -> origin/master (forced update) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + 2febe2f..d86ac7a good_bmark -> good_bmark + 2febe2f..9f88eba 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' +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. + 2febe2f..9f88eba master -> master +progress revision 1 'default' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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 '\(' @@ -4586,7 +4651,7 @@ adding file changes updating bookmark bad_bmark added 1 changesets with 1 changes to 1 files -new changesets 4f5a822f3499 +new changesets e7b59ecf8eda searching for changes adding changesets adding manifests @@ -4598,8 +4663,8 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..ee00886 good_bmark -> good_bmark - fffffff..9657995 master -> master + fffffff..3e017a8 good_bmark -> good_bmark + fffffff..05af089 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' @@ -4607,73 +4672,15 @@ 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..9657995 master -> master - fffffff..ee00886 good_bmark -> good_bmark + 2febe2f..d86ac7a good_bmark -> good_bmark + fffffff..05af089 master -> master ! [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-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 848f1dc1b7ae -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 - ceec89f..e1e2c0f branches/default -> origin/branches/default - ceec89f..e1e2c0f 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 ceec89f zero_sub_hg_a_x - Successfully rebased and updated detached HEAD. -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 -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 - 76cd808..7baf155 branches/bad_branch -> origin/branches/bad_branch - 8f30626..9657995 branches/default -> origin/branches/default - 8f30626..7baf155 bad_bmark -> origin/bad_bmark -/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 - 8f30626..ee00886 good_bmark -> good_bmark - 8f30626..9657995 master -> master + 2d908e5..66d72a4 branches/default -> origin/branches/default + 2d908e5..66d72a4 master -> origin/master + fffffff..3e017a8 good_bmark -> good_bmark ! [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' -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. - 8f30626..9657995 master -> master - 8f30626..ee00886 good_bmark -> good_bmark - ! [rejected] bad_bmark -> bad_bmark (non-fast-forward) ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) ok 22 - remote big push non fast forward @@ -4719,8 +4726,37 @@ check_bookmark hgrepo bad_bmark2 five && check_bookmark hgrepo new_bmark six +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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) +HEAD is now at 2d908e5 zero_sub_hg_a_x + Successfully rebased and updated detached HEAD. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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) /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] +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + 4590934..f116f1b branches/bad_branch -> origin/branches/bad_branch + 8dc64fc..05af089 branches/default -> origin/branches/default + 8dc64fc..f116f1b bad_bmark -> origin/bad_bmark 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+)') @@ -4814,39 +4850,18 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets bc2cb9503203:70314b2c2771 +new changesets 205c1cf9c4fc:808493213335 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) progress revision 2 'bad_branch' (0/2) +HEAD is now at cd52d06 zero +HEAD is now at cd52d06 zero +HEAD is now at 407f2e6 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) -HEAD is now at 08b2aa7 zero -HEAD is now at 08b2aa7 zero -HEAD is now at 433fc44 good branch -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -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 42c92dc6fcdf:b98c2a5000c0 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -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 288c9a0 zero -HEAD is now at 288c9a0 zero -HEAD is now at 00a2fb9 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 '\(' @@ -4862,22 +4877,87 @@ 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 - + 855edb8...0868bd2 branches/bad_branch -> branches/bad_branch (forced update) - 433fc44..bcebb8e branches/good_branch -> branches/good_branch - + 1ccf0fe...c9d08e2 bad_bmark1 -> bad_bmark1 (forced update) - + 1ccf0fe...a16fafb bad_bmark2 -> bad_bmark2 (forced update) - 1ccf0fe..74f85de good_bmark -> good_bmark - 1ccf0fe..3c0c255 master -> master + + d44c0a4...49a69de branches/bad_branch -> branches/bad_branch (forced update) + 407f2e6..bbb92b7 branches/good_branch -> branches/good_branch + + aee00e0...4653f16 bad_bmark1 -> bad_bmark1 (forced update) + + aee00e0...7fe7ec2 bad_bmark2 -> bad_bmark2 (forced update) + aee00e0..4fe8801 good_bmark -> good_bmark + aee00e0..240ac9f master -> master * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - 1ccf0fe..3c0c255 master -> master - 1ccf0fe..74f85de good_bmark -> good_bmark - 433fc44..bcebb8e branches/good_branch -> branches/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/ + aee00e0..240ac9f master -> master + aee00e0..4fe8801 good_bmark -> good_bmark + 407f2e6..bbb92b7 branches/good_branch -> branches/good_branch * [new branch] new_bmark -> new_bmark +[master (root-commit) e9a16bb] zero_sub_git + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 content_sub_git * [new branch] branches/new_branch -> branches/new_branch - + 1ccf0fe...c9d08e2 bad_bmark1 -> bad_bmark1 (forced update) - + 1ccf0fe...a16fafb bad_bmark2 -> bad_bmark2 (forced update) - + 855edb8...0868bd2 branches/bad_branch -> branches/bad_branch (forced update) + + aee00e0...4653f16 bad_bmark1 -> bad_bmark1 (forced update) + + aee00e0...7fe7ec2 bad_bmark2 -> bad_bmark2 (forced update) + + d44c0a4...49a69de branches/bad_branch -> branches/bad_branch (forced update) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +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 44fa9c053bf4:034eb30ee110 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 0a2c600 zero +HEAD is now at 0a2c600 zero +HEAD is now at f878a7b 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) +ok 23 - remote big push force + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo*" && + + setup_big_push + + ( + cd gitrepo && + + check_push 1 --dry-run --all <<-\EOF && + master + good_bmark + branches/good_branch + new_bmark:new + branches/new_branch:new + bad_bmark1:non-fast-forward + bad_bmark2:non-fast-forward + branches/bad_branch:non-fast-forward + EOF + + check_push 0 --dry-run master good_bmark new_bmark branches/good_branch branches/new_branch <<-\EOF + master + good_bmark + branches/good_branch + new_bmark:new + branches/new_branch:new + EOF + ) && + + check_branch hgrepo default one && + check_branch hgrepo good_branch "good branch" && + check_branch hgrepo bad_branch "bad branch" && + check_branch hgrepo new_branch && + check_bookmark hgrepo good_bmark one && + check_bookmark hgrepo bad_bmark1 one && + check_bookmark hgrepo bad_bmark2 one && + check_bookmark hgrepo new_bmark + /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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 '\(' @@ -4926,34 +5006,29 @@ 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...fadc6c2 branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...1f9992d branches/good_branch -> branches/good_branch (forced update) - + fffffff...8f7f2a9 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...93473e3 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...1534576 good_bmark -> good_bmark (forced update) - + fffffff...9e3e9fe master -> master (forced update) + + fffffff...7cdeab7 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...5bdf32e branches/good_branch -> branches/good_branch (forced update) + + fffffff...fa4f2a6 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...4562484 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...4d69bad good_bmark -> good_bmark (forced update) + + fffffff...b2a07a7 master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...9e3e9fe master -> master (forced update) - + fffffff...1534576 good_bmark -> good_bmark (forced update) - + fffffff...1f9992d branches/good_branch -> branches/good_branch (forced update) + + fffffff...b2a07a7 master -> master (forced update) + + fffffff...4d69bad good_bmark -> good_bmark (forced update) + + fffffff...5bdf32e branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...8f7f2a9 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...93473e3 bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...fadc6c2 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) + + fffffff...fa4f2a6 bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...4562484 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...7cdeab7 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 8a306da41112:066d3d638cf9 +new changesets 55b3dcfc5ab6:f9d2c4f1f2b5 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. @@ -4969,50 +5044,11 @@ 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: - test_when_finished "rm -rf hgrepo gitrepo*" && - - setup_big_push - - ( - cd gitrepo && - - check_push 1 --dry-run --all <<-\EOF && - master - good_bmark - branches/good_branch - new_bmark:new - branches/new_branch:new - bad_bmark1:non-fast-forward - bad_bmark2:non-fast-forward - branches/bad_branch:non-fast-forward - EOF - - check_push 0 --dry-run master good_bmark new_bmark branches/good_branch branches/new_branch <<-\EOF - master - good_bmark - branches/good_branch - new_bmark:new - branches/new_branch:new - EOF - ) && - - check_branch hgrepo default one && - check_branch hgrepo good_branch "good branch" && - check_branch hgrepo bad_branch "bad branch" && - check_branch hgrepo new_branch && - check_bookmark hgrepo good_bmark one && - check_bookmark hgrepo bad_bmark1 one && - check_bookmark hgrepo bad_bmark2 one && - check_bookmark hgrepo new_bmark - adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets 9e8636345dd8:a5de560b3419 +new changesets 268a8bb57cea:3c91e3090a90 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' @@ -5030,6 +5066,26 @@ 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 7e6f9fe5ffbb +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) ok 23 - remote big push force expecting success: @@ -5069,13 +5125,15 @@ check_bookmark hgrepo bad_bmark2 one && check_bookmark hgrepo new_bmark +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 0f238b62223f -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 2 changesets with 3 changes to 3 files +new changesets f084b875de0e:d2d25a4665e1 +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 '\(' @@ -5084,30 +5142,62 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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' +Cloning into './sub_hg_b/sub_git'... +done. +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 1b37adc2f1b4:7535e8563351 +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 5faef8f27a48:f620c60f80cf 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' +progress revision 2 'bad_branch' (0/2) +HEAD is now at bc65893 zero +HEAD is now at bc65893 zero +HEAD is now at c754106 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.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) -Cloning into './sub_hg_b/sub_git'... -done. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + c754106..9d936cf branches/good_branch -> branches/good_branch + 61bcdfd..84ffbc1 good_bmark -> good_bmark + 61bcdfd..0ffae4b 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. + 61bcdfd..0ffae4b master -> master + 61bcdfd..84ffbc1 good_bmark -> good_bmark + c754106..9d936cf 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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5119,65 +5209,63 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 603b913a0b50 +new changesets 00a6eddf40c6 progress revision 2 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo - 58a1c2b..a1f5703 master -> origin/master - 58a1c2b..a1f5703 branches/default -> origin/branches/default -Updating 58a1c2b..a1f5703 + 22a71ce..d8be98a master -> origin/master + 22a71ce..d8be98a 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.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + 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 + c754106..9d936cf branches/good_branch -> branches/good_branch + 61bcdfd..84ffbc1 good_bmark -> good_bmark + 61bcdfd..0ffae4b master -> master + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + 61bcdfd..0ffae4b master -> master + 61bcdfd..84ffbc1 good_bmark -> good_bmark + c754106..9d936cf branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch +Updating 22a71ce..d8be98a 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] -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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: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 54ae0aa43f2e:1d370d802163 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 8bc9067b98a1 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) +new changesets d930cf064088 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 - 763329b..fb2d12a branches/default -> origin/branches/default - 763329b..fb2d12a master -> origin/master + 4a8d6fa..071bec7 branches/default -> origin/branches/default + 4a8d6fa..071bec7 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 dc63981 zero -HEAD is now at dc63981 zero -HEAD is now at 763329b substate_hg_a -Updating 763329b..fb2d12a +HEAD is now at 4a8d6fa substate_hg_a +Updating 4a8d6fa..071bec7 Fast-forward .hgsubstate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -5185,18 +5273,15 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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 4be822e 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) +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-remote-hg: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 @@ -5204,28 +5289,30 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets afab46728e63 +new changesets 5ccd12fe1b82 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 + 7367a0d..ecfe98e branches/default -> origin/branches/default + 7367a0d..ecfe98e 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 -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg_a/sub_hg_a_x - 210f421..c5a422f branches/default -> origin/branches/default - 210f421..c5a422f master -> origin/master 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 54ae0aa43f2e:f44b5991d2d1 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) +new changesets 11811cbe98ec:523101757e94 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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 210f421 zero_sub_hg_a_x -Updating 210f421..c5a422f +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) +HEAD is now at 7367a0d zero_sub_hg_a_x +Updating 7367a0d..ecfe98e Fast-forward content_sub_hg_a_x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -5233,129 +5320,16 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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 - 4be822e..e167dcc branches/good_branch -> branches/good_branch - e86ab1c..35c6274 good_bmark -> good_bmark - e86ab1c..003b08b 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. -HEAD is now at dc63981 zero - e86ab1c..003b08b master -> master - e86ab1c..35c6274 good_bmark -> good_bmark - 4be822e..e167dcc 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) -HEAD is now at dc63981 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 f2ca12a good branch +HEAD is now at 6b23d45 zero +HEAD is now at 6b23d45 zero +HEAD is now at 065e7f9 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] no changes found -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - 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 - 4be822e..e167dcc branches/good_branch -> branches/good_branch - e86ab1c..35c6274 good_bmark -> good_bmark - e86ab1c..003b08b master -> master - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - e86ab1c..003b08b master -> master - e86ab1c..35c6274 good_bmark -> good_bmark - 4be822e..e167dcc branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-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 -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - fffffff..fbce474 branches/good_branch -> branches/good_branch - fffffff..ad0310c good_bmark -> good_bmark - fffffff..a5f7239 master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) - ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) - ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' -hint: Updates were rejected because a pushed branch tip is behind its remote -hint: counterpart. If you want to integrate the remote changes, use 'git pull' -hint: before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. - fffffff..a5f7239 master -> master - fffffff..ad0310c good_bmark -> good_bmark - fffffff..fbce474 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) -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 '\(' - 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..fbce474 branches/good_branch -> branches/good_branch - fffffff..ad0310c good_bmark -> good_bmark - fffffff..a5f7239 master -> master - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - fffffff..a5f7239 master -> master - fffffff..ad0310c good_bmark -> good_bmark - fffffff..fbce474 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: @@ -5401,6 +5375,88 @@ 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) +/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..269cb9b branches/good_branch -> branches/good_branch + fffffff..214c2ae good_bmark -> good_bmark + fffffff..d933845 master -> master + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) + ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) + ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo' +hint: Updates were rejected because a pushed branch tip is behind its remote +hint: counterpart. If you want to integrate the remote changes, use 'git pull' +hint: before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. +ok 11 - subcommand sub subsequent recursive update -- merge + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + test_sub_foreach + + fffffff..d933845 master -> master + fffffff..214c2ae good_bmark -> good_bmark + fffffff..269cb9b branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + ! [rejected] bad_bmark1 -> bad_bmark1 (non-fast-forward) + ! [rejected] bad_bmark2 -> bad_bmark2 (non-fast-forward) + ! [rejected] branches/bad_branch -> branches/bad_branch (non-fast-forward) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + fffffff..269cb9b branches/good_branch -> branches/good_branch + fffffff..214c2ae good_bmark -> good_bmark + fffffff..d933845 master -> master + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + fffffff..d933845 master -> master + fffffff..214c2ae good_bmark -> good_bmark + fffffff..269cb9b 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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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 29b3fc73e1c6:197023bd56a7 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +progress revision 2 'bad_branch' (0/2) ok 24 - remote big push dry-run expecting success: @@ -5451,6 +5507,35 @@ Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 content_sub_git +HEAD is now at 9de3ce8 zero +HEAD is now at 9de3ce8 zero +HEAD is now at 3ecb0d4 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 + + 58cf87b...6b352f8 branches/bad_branch -> branches/bad_branch (forced update) + 3ecb0d4..843a0de branches/good_branch -> branches/good_branch + + 11c3a8e...44fcc94 bad_bmark1 -> bad_bmark1 (forced update) + + 11c3a8e...ae8fb5e bad_bmark2 -> bad_bmark2 (forced update) + 11c3a8e..185a9cc good_bmark -> good_bmark + 11c3a8e..a48bf2e master -> master + * [new branch] branches/new_branch -> branches/new_branch + * [new branch] new_bmark -> new_bmark + 11c3a8e..a48bf2e master -> master + 11c3a8e..185a9cc good_bmark -> good_bmark + 3ecb0d4..843a0de branches/good_branch -> branches/good_branch + * [new branch] new_bmark -> new_bmark + * [new branch] branches/new_branch -> branches/new_branch + + 11c3a8e...44fcc94 bad_bmark1 -> bad_bmark1 (forced update) + + 11c3a8e...ae8fb5e bad_bmark2 -> bad_bmark2 (forced update) + + 58cf87b...6b352f8 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+)') @@ -5462,61 +5547,58 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -new changesets e0415829dfcd:c875f7cfd0c8 +new changesets 6ea005fbcf0e:fee97364fb7a progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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 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 bad_bmark1 -adding remote bookmark bad_bmark2 -adding remote bookmark good_bmark -added 4 changesets with 4 changes to 1 files -new changesets 73e920fb3de3:bed801e16558 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -progress revision 2 'bad_branch' (0/2) -HEAD is now at 683f86f zero -HEAD is now at 683f86f zero -HEAD is now at 5228829 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 eeb1260b137c:5335613ff114 -Cloning into 'gitrepo'... +new changesets af7d5f402271:47a3b7350ac9 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +ok 25 - remote big push force dry-run + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo zero > content && + hg add content && + hg commit -m zero && + echo one > content && + hg commit -m one + ) && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git reset --hard HEAD^ && + echo two > content && + git commit -a -m two && + test_expect_code 1 git push && + test_expect_code 1 git push + ) + /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5526,8 +5608,26 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 7214308c8536 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-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 @@ -5535,70 +5635,65 @@ adding remote bookmark bad_bmark2 adding remote bookmark good_bmark added 4 changesets with 4 changes to 1 files -new changesets 73e920fb3de3:d0f9c9bc820d +new changesets a63631442623:ebd047787e7c 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) +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) +HEAD is now at de76c27 zero +HEAD is now at de76c27 zero +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) +HEAD is now at 5505db0 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] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg: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 1a081fead00f:ad2a8bade220 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 - + f46b3b0...6f920fc branches/bad_branch -> branches/bad_branch (forced update) - 5228829..563e2f2 branches/good_branch -> branches/good_branch - + 82951f8...7ca1217 bad_bmark1 -> bad_bmark1 (forced update) - + 82951f8...3d8b81e bad_bmark2 -> bad_bmark2 (forced update) - 82951f8..23b7d67 good_bmark -> good_bmark - 82951f8..a6b5d82 master -> master - * [new branch] branches/new_branch -> branches/new_branch - * [new branch] new_bmark -> new_bmark - 82951f8..a6b5d82 master -> master - 82951f8..23b7d67 good_bmark -> good_bmark - 5228829..563e2f2 branches/good_branch -> branches/good_branch - * [new branch] new_bmark -> new_bmark - * [new branch] branches/new_branch -> branches/new_branch - + 82951f8...7ca1217 bad_bmark1 -> bad_bmark1 (forced update) - + 82951f8...3d8b81e bad_bmark2 -> bad_bmark2 (forced update) - + f46b3b0...6f920fc 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] -HEAD is now at 683f86f zero -HEAD is now at 683f86f zero +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 70d037294c76 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -HEAD is now at 13fd352 good branch +added 2 changesets with 2 changes to 1 files +new changesets 011b35d15c4f:b68250553d5a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +progress revision walk 'bookmarks/master' (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) -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' +Cloning into './sub_hg_b/sub_git'... +done. +HEAD is now at cb1b6c9 zero +[master c453f0c] 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.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 9e821e12fd66:1626f11ee250 -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 '\(' @@ -5607,46 +5702,44 @@ 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...0ce28fd branches/bad_branch -> branches/bad_branch (forced update) - + fffffff...a090937 branches/good_branch -> branches/good_branch (forced update) - + fffffff...7ca1217 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...3d8b81e bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...37f6847 good_bmark -> good_bmark (forced update) - + fffffff...5daa1a9 master -> master (forced update) + + fffffff...e81bde5 branches/bad_branch -> branches/bad_branch (forced update) + + fffffff...7809a1e branches/good_branch -> branches/good_branch (forced update) + + fffffff...34ec0fb bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...aea44a4 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...2b7cff2 good_bmark -> good_bmark (forced update) + + fffffff...61d6171 master -> master (forced update) * [new branch] branches/new_branch -> branches/new_branch * [new branch] new_bmark -> new_bmark - + fffffff...5daa1a9 master -> master (forced update) - + fffffff...37f6847 good_bmark -> good_bmark (forced update) - + fffffff...a090937 branches/good_branch -> branches/good_branch (forced update) + + fffffff...61d6171 master -> master (forced update) + + fffffff...2b7cff2 good_bmark -> good_bmark (forced update) + + fffffff...7809a1e branches/good_branch -> branches/good_branch (forced update) * [new branch] new_bmark -> new_bmark * [new branch] branches/new_branch -> branches/new_branch - + fffffff...7ca1217 bad_bmark1 -> bad_bmark1 (forced update) - + fffffff...3d8b81e bad_bmark2 -> bad_bmark2 (forced update) - + fffffff...0ce28fd 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 '\(' - 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. + + fffffff...34ec0fb bad_bmark1 -> bad_bmark1 (forced update) + + fffffff...aea44a4 bad_bmark2 -> bad_bmark2 (forced update) + + fffffff...e81bde5 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.main/bin/git-remote-hg: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 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5655,6 +5748,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) +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' @@ -5663,9 +5760,13 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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 0085f304432add3475fd9500df90d5d48c088153 5335613ff11403f34a66edc8716437606c5bd21a sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo -hg 43b068ada780a60b22d03f3baadcc74eb102743d 70d037294c7630c22c250294bd84787f48b9e407 sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a -hg 2cdf911850f38056311376bee35a6f05d1f85b6e 1626f11ee250be65c0d06676ca4153fbc0a8a237 sub_hg_b /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/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) +hg d356d993da13551f5887574b5592a4d09be2a2f6 47a3b7350ac9717d844a760af8ee4b615ed7bf17 sub_hg_a /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo +hg d9dcf0ed07f969eb6efb2582c1b5a3cbc11c719e 7214308c85369965e9c6347d532fc0f3741cff92 sub_hg_a_x /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_a +hg f5ff3403295930b76f1e364fd45700aca1c5ba3a ad2a8bade220475fcad12654d8078218346bfe3b sub_hg_b /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo git e9a16bb7c08361f85ab0002e4094b4229fefb384 e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/gitrepo/sub_hg_b ok 12 - subcommand sub foreach @@ -5699,10 +5800,22 @@ test_cmp expected actual ) -ok 25 - remote big push force dry-run +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + ! [rejected] master -> master (non-fast-forward) +error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. +ok 26 - remote double failed push expecting success: - test_when_finished "rm -rf hgrepo gitrepo*" && + test_when_finished "rm -rf gitrepo hgrepo" && ( hg init hgrepo && @@ -5710,20 +5823,43 @@ echo zero > content && hg add content && hg commit -m zero && - echo one > content && - hg commit -m one + echo feature-a > content && + hg commit -m feature-a + hg bookmark feature-a ) && - ( git clone "hg::hgrepo" gitrepo && + check gitrepo origin/feature-a feature-a && + + ( + cd hgrepo && + hg bookmark -d feature-a + ) && + + ( cd gitrepo && - git reset --hard HEAD^ && - echo two > content && - git commit -a -m two && - test_expect_code 1 git push && - test_expect_code 1 git push + git fetch --prune origin + git branch -a > out && + ! grep feature-a out ) +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 feature-a +added 2 changesets with 2 changes to 1 files +new changesets 98be55d43407:c78c8a3d8cbe +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) ok 25 - remote big push force dry-run expecting success: @@ -5750,114 +5886,32 @@ ) 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.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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: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 51e55a2e4fa2:514009b1a054 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -adding changesets -adding manifests -adding file changes -added 2 changesets with 3 changes to 3 files -new changesets 79bc7aba0b4e:15a6f96d8ddd -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -HEAD is now at ec30c91 zero -[master 19249dd] 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) -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] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper: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+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-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) adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 851b16ef11bd:4627f0d1b81e +added 2 changesets with 3 changes to 3 files +new changesets 6d99f55b8680:65fcfbe038df +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 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] -HEAD is now at 99332b4 zero -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -[master e2a3e8c] 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.helper/bin/git-remote-hg: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) -no changes found -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo' -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 89646102e1cc -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -hint: Updates were rejected because the tip of your current branch is behind -hint: its remote counterpart. If you want to integrate the remote changes, -hint: use 'git pull' before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. -ok 26 - remote double failed push +ok 27 - fetch prune expecting success: test_when_finished "rm -rf gitrepo hgrepo" && @@ -5868,51 +5922,99 @@ echo zero > content && hg add content && hg commit -m zero && - echo feature-a > content && - hg commit -m feature-a - hg bookmark feature-a + hg up -r null && + echo another > ocontent && + hg add ocontent && + hg commit -m one ) && - git clone "hg::hgrepo" gitrepo && - check gitrepo origin/feature-a feature-a && + # -r 1 acts as master + ( + git init --bare gitrepo && cd gitrepo && + git remote add origin hg::../hgrepo && + git fetch origin refs/heads/*:refs/heads/* + ) && ( cd hgrepo && - hg bookmark -d feature-a + hg up 0 && + echo two > content && + hg commit -m two ) && + # now master already exists + # -r 2 becomes master head which has rev 0 as ancestor + # so when importing (parentless) rev 0, a reset is needed + # (to ensure rev 0 is not given a parent commit) ( cd gitrepo && - git fetch --prune origin - git branch -a > out && - ! grep feature-a out - ) + git fetch origin && + git log --format="%s" origin/master > ../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. + 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-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) -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' +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.helper/bin/git-remote-hg: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 1 changesets with 1 changes to 1 files +new changesets a2890e3470f4 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +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-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-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 1 files +new changesets d5b4b42d37b3:d6c2aff538e7 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) url = foobar -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. +HEAD is now at 0c0e514 zero +[master 0354e64] two + Author: A U Thor + 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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] +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) +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.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 13 - subcommand sub sync expecting success: @@ -5979,7 +6081,39 @@ /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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] +no changes found +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/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' +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files (+1 heads) +new changesets ad7213214853:01c99e742ecf +WARNING: Branch 'default' has more than one head, consider merging +WARNING: Branch 'default' has more than one head, consider merging +progress revision 1 'default' (0/1) +From hg::../hgrepo + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] branches/default -> origin/branches/default + * [new branch] master -> origin/master +hint: Updates were rejected because the tip of your current branch is behind +hint: its remote counterpart. If you want to integrate the remote changes, +hint: use 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] no changes found +1 files updated, 0 files merged, 1 files removed, 0 files unresolved 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' @@ -6018,37 +6152,76 @@ ! grep feature-a out ) -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) +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 +searching for changes adding changesets adding manifests adding file changes -adding remote bookmark feature-a -added 2 changesets with 2 changes to 1 files -new changesets ef8784b75cc0:5a6e9b3b77c0 +added 1 changesets with 1 changes to 1 files +new changesets 8906ea56fff6 +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 + + 1b9de5c...f1cfd79 branches/default -> origin/branches/default (forced update) + + 1b9de5c...f1cfd79 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' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-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: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo a > a && + hg add a && + hg commit -m a && + hg bookmark -r null bookmark + ) && + + ( + git clone "hg::hgrepo" gitrepo && + check gitrepo HEAD a && + cd gitrepo && + git checkout --quiet -b bookmark && + git remote -v && + echo b > b && + git add b && + git commit -m b && + git push origin bookmark + ) + +/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 bf2816e25d8d:166c33e1d2e6 progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_git/.git/ -[master (root-commit) e9a16bb] zero_sub_git - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 content_sub_git Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-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 @@ -6056,91 +6229,50 @@ adding file changes adding remote bookmark feature-a added 2 changesets with 2 changes to 1 files -new changesets c88f79ce441a:4fa82164d823 -Cloning into 'gitrepo'... +new changesets 181443e18ac6:c6c5c500289b +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -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 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Cloning into './sub_hg'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -ok 27 - fetch prune - -expecting success: - test_when_finished "rm -rf gitrepo hgrepo" && - - ( - hg init hgrepo && - cd hgrepo && - echo zero > content && - hg add content && - hg commit -m zero && - hg up -r null && - echo another > ocontent && - hg add ocontent && - hg commit -m one - ) && - - # -r 1 acts as master - ( - git init --bare gitrepo && cd gitrepo && - git remote add origin hg::../hgrepo && - git fetch origin refs/heads/*:refs/heads/* - ) && - - ( - cd hgrepo && - hg up 0 && - echo two > content && - hg commit -m two - ) && - - # now master already exists - # -r 2 becomes master head which has rev 0 as ancestor - # so when importing (parentless) rev 0, a reset is needed - # (to ensure rev 0 is not given a parent commit) - ( - cd gitrepo && - git fetch origin && - git log --format="%s" origin/master > ../actual - ) && - - hg -R hgrepo log -r . -f --template "{desc}\n" > expected && - test_cmp actual expected - -added 2 changesets with 3 changes to 3 files -new changesets f220002d82de:6d05b79958ca -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) +added 1 changesets with 1 changes to 1 files +new changesets 8938e7859f21 +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] no changes found error: refusing to update ref with bad name 'hg/origin/refs/bookmarks/feature-a' From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - [deleted] (none) -> origin/feature-a -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into './sub_git'... +done. ok 27 - fetch prune expecting success: @@ -6185,253 +6317,220 @@ hg -R hgrepo log -r . -f --template "{desc}\n" > expected && test_cmp actual expected -Cloning into './sub_hg'... +[detached HEAD a199f7c] 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/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + 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] -0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding changesets adding manifests adding file changes +adding remote bookmark bookmark added 1 changesets with 1 changes to 1 files -new changesets 455cabf54fe3 +new changesets 2c366290f51e +WARNING: Ignoring invalid bookmark 'bookmark' progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg + fffffff..a199f7c HEAD -> master +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) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -Cloning into './sub_git'... -done. -created new head -[detached HEAD 8e66038] one_sub_hg +[bookmark c120952] 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) -Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/gitrepo/ + 1 file changed, 1 insertion(+) + create mode 100644 b /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) -created new head /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - 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/tmp/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 -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 2 files (+1 heads) -new changesets 0c5408eb7311:dc6822497a8a -WARNING: Branch 'default' has more than one head, consider merging -WARNING: Branch 'default' has more than one head, consider merging -progress revision 1 'default' (0/1) -From hg::../hgrepo - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] branches/default -> origin/branches/default - * [new branch] master -> origin/master +WARNING: Ignoring invalid bookmark 'bookmark' searching for changes +no changes found +1 local changesets published 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..8e66038 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) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 26e256c53910:f7768c8450ec -WARNING: Branch 'default' has more than one head, consider merging -WARNING: Branch 'default' has more than one head, consider merging -progress revision 1 'default' (0/1) -From hg::../hgrepo - * [new branch] branches/default -> branches/default - * [new branch] master -> master - * [new branch] branches/default -> origin/branches/default - * [new branch] master -> origin/master -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 +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new branch] bookmark -> bookmark From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo/sub_hg - a38ebe5..8e66038 branches/default -> origin/branches/default + 138b13c..a199f7c branches/default -> origin/branches/default +ok 29 - clone remote with null bookmark, then push + +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 && + 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 + [detached HEAD cea1af1] one_sub_git Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +0 files updated, 0 files merged, 1 files removed, 0 files unresolved 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] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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) -Updating ./sub_hg to 8410904c400541af5743c8e39d714cc132999470 [git 8e66038] +Updating ./sub_hg to 6ad39975392c07d36677024f05a1b2663d68640c [git a199f7c] 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 -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 12d38d13c7e6 -WARNING: Branch 'default' has more than one head, consider merging -progress revision walk 'branches/default' (2/2) -progress revision 0 'default' (0/2) +created new head diff --git a/.hgsubstate b/.hgsubstate -index 34ea25b..7455038 100644 +index f16dba7..566aa83 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -1,2 +1,2 @@ -e9a16bb7c08361f85ab0002e4094b4229fefb384 sub_git --455cabf54fe368406e737e870561ea7a2857b236 sub_hg +-8938e7859f21ec37c5799bb4dbed38db372f0434 sub_hg +cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 sub_git -+8410904c400541af5743c8e39d714cc132999470 sub_hg -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - + b268075...b9c73a2 branches/default -> origin/branches/default (forced update) - + b268075...b9c73a2 master -> origin/master (forced update) ++6ad39975392c07d36677024f05a1b2663d68640c sub_hg M .hgsubstate -[master 3a8e873] update_sub +[master b5152fe] 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' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/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] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +Cloning into 'gitrepo'... +no changes found +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/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 changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 761e81807237 +adding manifests +adding file changes +added 2 changesets with 2 changes to 2 files (+1 heads) +new changesets 9c2b4fa38983:183115767807 +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgrepo + fffffff..b5152fe master -> master 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 - + dc2865c...feb2815 branches/default -> origin/branches/default (forced update) - + dc2865c...feb2815 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. +WARNING: Branch 'default' has more than one head, consider merging +progress revision 1 'default' (0/1) +From hg::../hgrepo + * [new branch] branches/default -> branches/default + * [new branch] master -> master + * [new branch] branches/default -> origin/branches/default + * [new branch] master -> origin/master +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg: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 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +Cloning into '/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/hgclone/sub_git'... +done. 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..3a8e873 master -> master -ok 28 - fetch multiple independent histories +Switched to a new branch 'new' +added 2 changesets with 2 changes to 1 files +new changesets 9846fbf0e2b5:e5b7ff11681a +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 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +/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 30 - notes -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && +checking known breakage: + test_when_finished "rm -rf hgrepo gitrepo" && ( hg init hgrepo && cd hgrepo && - echo a > a && - hg add a && - hg commit -m a && - hg bookmark -r null bookmark + echo one > content && + hg add content && + hg commit -m one ) && - ( git clone "hg::hgrepo" gitrepo && - check gitrepo HEAD a && - cd gitrepo && - git checkout --quiet -b bookmark && - git remote -v && - echo b > b && - git add b && - git commit -m b && - git push origin bookmark - ) - -ok 28 - fetch multiple independent histories - -expecting success: - test_when_finished "rm -rf gitrepo* hgrepo*" && ( - hg init hgrepo && - cd hgrepo && - echo a > a && - hg add a && - hg commit -m a && - hg bookmark -r null bookmark + cd gitrepo && + echo two > content && + git commit -a -m two && + git push ) && - ( - git clone "hg::hgrepo" gitrepo && - check gitrepo HEAD a && - cd gitrepo && - git checkout --quiet -b bookmark && - git remote -v && - echo b > b && - git add b && - git commit -m b && - git push origin bookmark - ) + hg -R hgrepo log --template "{node}\n\n" > expected && + git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && + test_cmp expected actual -Cloning into '/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. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. 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 389fd89c0634 +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 + + e1ce533...983237c branches/default -> origin/branches/default (forced update) + + e1ce533...983237c master -> origin/master (forced update) ok 14 - subcommand sub addstate expecting success: @@ -6476,91 +6575,91 @@ test_cmp output actual ) -adding changesets -adding manifests -adding file changes -adding remote bookmark bookmark -added 1 changesets with 1 changes to 1 files -new changesets 19ba3a3aeece -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/tmp/hgrepo (fetch) -origin hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo (push) -[bookmark dbda84f] b - Author: A U Thor - 1 file changed, 1 insertion(+) - create mode 100644 b -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +ok 28 - fetch multiple independent histories + +expecting success: + test_when_finished "rm -rf gitrepo* hgrepo*" && + + ( + hg init hgrepo && + cd hgrepo && + echo a > a && + hg add a && + hg commit -m a && + hg bookmark -r null bookmark + ) && + + ( + git clone "hg::hgrepo" gitrepo && + check gitrepo HEAD a && + cd gitrepo && + git checkout --quiet -b bookmark && + git remote -v && + echo b > b && + git add b && + git commit -m b && + git push origin bookmark + ) + +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 bookmark added 1 changesets with 1 changes to 1 files -new changesets 19ba3a3aeece -WARNING: Ignoring invalid bookmark 'bookmark' +new changesets 506115d758cf 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 dbda84f] b +[master 49ac4a0] two 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' + 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-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/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) no changes found -WARNING: Ignoring invalid bookmark 'bookmark' searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new branch] bookmark -> bookmark -ok 29 - clone remote with null bookmark, then push - -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 && - 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 - + ae4836c..49ac4a0 master -> master /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -no changes found -WARNING: Ignoring invalid bookmark 'bookmark' -searching for changes adding changesets adding manifests adding file changes +adding remote bookmark bookmark 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 branch] bookmark -> bookmark -ok 29 - clone remote with null bookmark, then push +new changesets 71194a1552c1 +WARNING: Ignoring invalid bookmark 'bookmark' +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +--- expected 2025-01-02 03:40:56.335125361 +0000 ++++ actual 2025-01-02 03:40:56.571126863 +0000 +@@ -1,4 +1,3 @@ +-a94b34d95910377698e1867b3af57032f55f15dc + + 506115d758cf533853515df4f3a9c6d5525ae3d9 + +not ok 31 - push updates notes # TODO known breakage expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6570,78 +6669,49 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one && - echo two > content && - hg commit -m two + hg commit -m one ) && git clone "hg::hgrepo" gitrepo && - hg -R hgrepo log --template "{node}\n\n" > expected && - git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && - test_cmp expected actual -Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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'... + ( + cd gitrepo && + echo two > content && + git commit -a -m two && + git push origin master && + git branch feature-a && + git push origin feature-a + ) && + + check_bookmark hgrepo feature-a two + +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 a5b4021] b + Author: A U Thor + 1 file changed, 1 insertion(+) + create mode 100644 b +Initialized empty Git repository in /build/reproducible-path/git-remote-hg-1.0.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:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -adding changesets -adding manifests -adding file changes -added 2 changesets with 2 changes to 1 files -new changesets f9d66d076dd4:2305f4716494 -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] -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] +no changes found +WARNING: Ignoring invalid bookmark 'bookmark' +searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files -new changesets f9d66d076dd4:fad20fd0be0b -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 30 - notes - -checking known breakage: - 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 && - echo two > content && - git commit -a -m two && - git push - ) && - - hg -R hgrepo log --template "{node}\n\n" > expected && - git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && - test_cmp expected actual - -ok 30 - notes +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 branch] bookmark -> bookmark +ok 29 - clone remote with null bookmark, then push expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6651,18 +6721,12 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one - ) && - - git clone "hg::hgrepo" gitrepo && - - ( - cd gitrepo && + hg commit -m one && echo two > content && - git commit -a -m two && - git push + hg commit -m two ) && + git clone "hg::hgrepo" gitrepo && hg -R hgrepo log --template "{node}\n\n" > expected && git --git-dir=gitrepo/.git log --pretty="tformat:%N" --notes=hg > actual && test_cmp expected actual @@ -6672,115 +6736,104 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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 b49a3a4b1585:099f41406e40 -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) -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] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg: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 83a51fd16152:f456148d7059 WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7a89d7083078 +new changesets defde4e75869 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +[master 0b58b90] 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.main/bin/git-remote-hg: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 /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-push/bin/git-remote-hg: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) -[master 506421a] 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) +no changes found +searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 7a89d7083078 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -[master 506421a] two - Author: A U Thor - 1 file changed, 1 insertion(+), 1 deletion(-) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + fe93060..0b58b90 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:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +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 adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 62f273c9d97f -no changes found +new changesets f1926672507b +adding changesets 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::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 60705ee..506421a master -> master +added 2 changesets with 2 changes to 1 files +new changesets 4f0a8202b0c5:afb98a7366e8 +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-push/bin/git-remote-hg: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..506421a master -> master ---- expected 2026-02-04 09:56:50.895471267 +0000 -+++ actual 2026-02-04 09:56:50.967471267 +0000 -@@ -1,4 +1,3 @@ --61e6e74072fe11b567fd012c7c0764dbbfe57439 - - 7a89d708307816f74f69866799b20df06fcc4713 - -not ok 31 - push updates notes # TODO known breakage +ok 32 - push bookmark without changesets expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6795,16 +6848,12 @@ 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 /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] @@ -6815,8 +6864,7 @@ /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. -ok 31 - push updates notes +ok 30 - notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -6835,13 +6883,14 @@ 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 +done. [detached HEAD cea1af1] one_sub_git Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) @@ -6855,87 +6904,64 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-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) - d2ea83483f8903db378e1da1a4435bf1802e6053 ./sub_hg_a (heads/master) --602565145ff005d2e03ee6878b49f0739327b182[hg] ./sub_hg_b + 3d1372a7c77cff7afc4fc491ce02f91dba4ed150 ./sub_hg_a (heads/master) +-55540b3cfe0903692984877a168e0aae54780ebd[hg] ./sub_hg_b +e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) - d2ea83483f8903db378e1da1a4435bf1802e6053 ./sub_hg_a (heads/master) --602565145ff005d2e03ee6878b49f0739327b182[hg] ./sub_hg_b + 3d1372a7c77cff7afc4fc491ce02f91dba4ed150 ./sub_hg_a (heads/master) +-55540b3cfe0903692984877a168e0aae54780ebd[hg] ./sub_hg_b +e9a16bb7c08361f85ab0002e4094b4229fefb384 ./sub_git (feature-a~1) Cloning into 'gitrepo'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +/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 -added 1 changesets with 1 changes to 1 files -new changesets 0d5ce7247d38 -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+)') +added 1 changesets with 1 changes to 1 files +new changesets 44d29bff5bfe /build/reproducible-path/git-remote-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] -[master ded7076] 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:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' - RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' - m = re.match(b'^(.+?) ext:\((.+)\)$', name) adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets d33deb56988b +new changesets 44d29bff5bfe progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -+cea1af1c0bdaae94623e5a8e4d85c13835bb44b6 ./sub_git (feature-a) -ok 15 - subcommand sub status - -# passed all 15 test(s) -1..15 -[master 55f6d97] two +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.helper/bin/git-hg-helper:44: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master 45b30fb] two Author: A U Thor 1 file changed, 1 insertion(+), 1 deletion(-) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 1fb7126..ded7076 master -> master ++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-push/bin/git-remote-hg: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 searching for changes adding changesets @@ -6943,101 +6969,7 @@ 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..55f6d97 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/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - 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 -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.main-push/bin/git-remote-hg: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 - -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 - -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 -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 1 changesets with 1 changes to 1 files -new changesets 3de1ab7b6490 -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 -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets 3de1ab7b6490 -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) + fffffff..45b30fb 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 '\(' @@ -7051,22 +6983,13 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 68b8f1e92cff +new changesets 33039fdc80a0 progress revision 1 'default' (0/1) From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - 2cb34c3..2fe0fea master -> origin/master - 2cb34c3..2fe0fea branches/default -> origin/branches/default + 067c250..627fd59 master -> origin/master + 067c250..627fd59 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-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) -Updating 2cb34c3..2fe0fea -Fast-forward - .hgtags | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 .hgtags -ok 33 - pull tags +ok 31 - push updates notes expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -7076,45 +6999,23 @@ cd hgrepo && echo one > content && hg add content && - hg commit -m one && - hg branch feature && - echo two > content && - hg commit -m two && - hg update default && - echo three > content && - hg commit -m three + hg commit -m one ) && - ( git clone "hg::hgrepo" gitrepo && + + ( cd gitrepo && - git merge -m Merge -Xtheirs origin/branches/feature && - git push + echo two > content && + git commit -a -m two && + git push origin master && + git branch feature-a && + git push origin feature-a ) && - cat > expected <<-EOF && - Merge - three - two - one - EOF - hg -R hgrepo log --template "{desc}\n" > actual && - test_cmp expected actual + check_bookmark hgrepo feature-a two -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 68b8f1e92cff -progress revision 1 'default' (0/1) -From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo - 2cb34c3..2fe0fea master -> origin/master - 2cb34c3..2fe0fea branches/default -> origin/branches/default - * [new tag] v1.0 -> v1.0 -Updating 2cb34c3..2fe0fea +Updating 067c250..627fd59 Fast-forward .hgtags | 1 + 1 file changed, 1 insertion(+) @@ -7154,49 +7055,65 @@ hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) -marked working directory as branch feature -(branches are permanent and global, did you want a bookmark?) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved Cloning into 'gitrepo'... -/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. +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -Cloning into 'gitrepo'... +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 91b09b476c8f +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +[master d73f76f] 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) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +searching for changes adding changesets adding manifests adding file changes -added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets 997d4144cb91:316b32362200 -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(-) +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..d73f76f 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) +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] +no changes found +1 local changesets published +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +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 adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files (+1 heads) -new changesets d931ada7c24c:cbc886837c35 +new changesets 91b09b476c8f:fe33d2de975a progress revision walk 'bookmarks/master' (2/2) progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) @@ -7204,33 +7121,11 @@ 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:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - 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' +/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) -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 - ccbf0e9..e5aaaf1 master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -no changes found -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..da0e287 master -> master -ok 34 - push merged named branch +ok 32 - push bookmark without changesets expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -7243,17 +7138,27 @@ hg commit -m one ) && - ( git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git tag v1.0 && - git push --tags - ) && - echo "C O Mitter " > expected && - hg -R hgrepo log --template "{author}\n" -r tip > actual && + (cd hgrepo && hg tag v1.0) && + (cd gitrepo && git pull) && + + echo "v1.0" > expected && + git --git-dir=gitrepo/.git tag > actual && test_cmp expected actual +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + 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 + 073b020..033cf18 master -> master ok 34 - push merged named branch expecting success: @@ -7279,66 +7184,74 @@ 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) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways -Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 515631b7f3f5 +new changesets 943315dd7873 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) +Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 515631b7f3f5 +new changesets 472c100616a2 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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 '\(' -no changes found 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] searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] +new changesets 0c1ea90230d8 +progress revision 1 'default' (0/1) +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +From hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + 71fca75..ac3ce9d master -> origin/master + 71fca75..ac3ce9d branches/default -> origin/branches/default + * [new tag] v1.0 -> v1.0 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 +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new tag] v1.0 -> v1.0 -ok 35 - light tag sets author +Updating 71fca75..ac3ce9d +Fast-forward + .hgtags | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 .hgtags +ok 33 - pull tags expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -7351,20 +7264,26 @@ hg commit -m one && hg branch feature && echo two > content && - hg commit -m two + hg commit -m two && + hg update default && + echo three > content && + hg commit -m three ) && ( git clone "hg::hgrepo" gitrepo && cd gitrepo && - git branch && - git checkout branches/feature && - git tag v1.0 && - git push --tags + git merge -m Merge -Xtheirs origin/branches/feature && + git push ) && - echo feature > expected && - hg -R hgrepo log --template="{branch}\n" -r tip > actual && + cat > expected <<-EOF && + Merge + three + two + one + EOF + hg -R hgrepo log --template "{desc}\n" > actual && test_cmp expected actual ok 35 - light tag sets author @@ -7400,6 +7319,7 @@ (branches are permanent and global, did you want a bookmark?) marked working directory as branch feature (branches are permanent and global, did you want a bookmark?) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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+)') @@ -7413,11 +7333,11 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -new changesets 06b24dce7c91:163759111467 +new changesets cad6d7cea90c:0bec111ac315 +Cloning into 'gitrepo'... progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) progress revision 1 'feature' (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 '\(' @@ -7434,39 +7354,30 @@ adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 1 files -new changesets 18220797c9fb:cc7d5dd86f5e -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) +added 3 changesets with 3 changes to 1 files (+1 heads) +new changesets a6a3f627ba85:941c02de3df2 +progress revision walk 'bookmarks/master' (2/2) +progress revision 0 'master' (0/2) progress revision 1 'feature' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways no changes found -* master -Switched to a new branch 'branches/feature' -branch 'branches/feature' set up to track 'origin/branches/feature'. +Auto-merging content +Merge made by the 'ort' strategy. + content | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [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) -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg: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 +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' 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 + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new tag] v1.0 -> v1.0 ok 36 - push tag different branch @@ -7488,7 +7399,17 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo -ok 36 - push tag different branch +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +no changes found +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..f065151 master -> master +ok 34 - push merged named branch expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -7496,35 +7417,52 @@ ( hg init hgrepo && cd hgrepo && - - echo test > test_file && - hg add test_file && - hg commit -m add && - - hg rm test_file && - hg commit -m remove + echo one > content && + hg add content && + hg commit -m one ) && + ( git clone "hg::hgrepo" gitrepo && - check_files gitrepo + cd gitrepo && + git tag v1.0 && + git push --tags + ) && + echo "C O Mitter " > expected && + hg -R hgrepo log --template "{author}\n" -r tip > actual && + test_cmp expected actual + +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets 5c7eaad6e811 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files -new changesets 79b382d69be6:db3b4a676c9f +new changesets 448d2975930f:e41e4e1ba08a 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 '\(' @@ -7554,14 +7492,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] +no changes found +searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 1 changes to 1 files -new changesets 8c269bc69f28:1cf870c1bc38 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 37 - cloning a removed file works +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: test_when_finished "rm -rf hgrepo gitrepo" && @@ -7569,26 +7508,39 @@ ( hg init hgrepo && cd hgrepo && - - echo test > dir_or_file && - hg add dir_or_file && - hg commit -m add && - - hg rm dir_or_file && - mkdir dir_or_file && - echo test > dir_or_file/test_file && - hg add dir_or_file/test_file && - hg commit -m replase + echo one > content && + hg add content && + hg commit -m one && + hg branch feature && + echo two > content && + hg commit -m two ) && + ( git clone "hg::hgrepo" gitrepo && - check_files gitrepo "dir_or_file/test_file" + cd gitrepo && + git branch && + git checkout branches/feature && + git tag v1.0 && + git push --tags + ) && + + echo feature > expected && + hg -R hgrepo log --template="{branch}\n" -r tip > actual && + test_cmp expected actual Cloning into 'gitrepo'... +marked working directory as branch feature +(branches are permanent and global, did you want a bookmark?) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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 @@ -7597,14 +7549,11 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -new changesets f0d6f9783676:63de90570dc3 +new changesets 1f42b832fe9d:cb412649bb3b 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] ok 38 - cloning a file replaced with a directory expecting success: @@ -7630,16 +7579,32 @@ git clone "hg::hgrepo" gitrepo && check_files gitrepo "dir_or_file" +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +new changesets 181caeb920b8:adde5d550c61 +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) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] +no changes found +searching for changes adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 2 files -new changesets 2c91a7faa493:b7abe983e411 -progress revision walk 'bookmarks/master' (1/1) -progress revision 0 'master' (0/2) -ok 38 - cloning a file replaced with a directory +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new tag] v1.0 -> v1.0 +ok 36 - push tag different branch expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -7648,21 +7613,16 @@ hg init hgrepo && cd hgrepo && - mkdir dir_or_file && - echo test > dir_or_file/test_file && - hg add dir_or_file/test_file && - hg commit -m add && - - hg rm dir_or_file/test_file && - echo test > dir_or_file && - hg add dir_or_file && + echo test > test_file && + hg add test_file && hg commit -m add && - hg rm dir_or_file + hg rm test_file && + hg commit -m remove ) && git clone "hg::hgrepo" gitrepo && - check_files gitrepo "dir_or_file" + check_files gitrepo Cloning into 'gitrepo'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' @@ -7674,17 +7634,19 @@ 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 686f2e820ae5:22cedd810937 /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 2 changes to 2 files +new changesets 665cb247b8fd:7cbfb85415c9 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] ok 39 - clone replace directory with a file expecting success: @@ -7708,16 +7670,14 @@ git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && check_files gitrepo "test.txt" -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] adding changesets adding manifests adding file changes -added 2 changesets with 2 changes to 2 files -new changesets 686f2e820ae5:22cedd810937 +added 2 changesets with 1 changes to 1 files +new changesets 1f290c9ca595:22135be9568f progress revision walk 'bookmarks/master' (1/1) progress revision 0 'master' (0/2) -ok 39 - clone replace directory with a file +ok 37 - cloning a removed file works expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -7726,50 +7686,56 @@ hg init hgrepo && cd hgrepo && - touch test.txt && - hg add test.txt && - hg commit -m master && - hg branch parent && - echo test >test.txt && - hg commit -m test && - hg branch parent/child && - echo test1 >test.txt && - hg commit -m test1 + echo test > dir_or_file && + hg add dir_or_file && + hg commit -m add && + + hg rm dir_or_file && + mkdir dir_or_file && + echo test > dir_or_file/test_file && + hg add dir_or_file/test_file && + hg commit -m replase ) && - git clone -c remote-hg.ignore-name=child "hg::hgrepo" gitrepo && - check_files gitrepo "test.txt" + git clone "hg::hgrepo" gitrepo && + check_files gitrepo "dir_or_file/test_file" marked working directory as branch parent (branches are permanent and global, did you want a bookmark?) -marked working directory as branch parent -(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/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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/child +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg: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 WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways +adding file changes +added 2 changesets with 2 changes to 2 files +new changesets 0371efd634f3:3ed6db71d0f0 +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 3cc5f6a37c07:985a0c874fbf +new changesets 865d69d51ea0:858f218ed674 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) -ok 40 - clone can ignore invalid refnames +ok 38 - cloning a file replaced with a directory expecting success: test_when_finished "rm -rf hgrepo gitrepo" && @@ -7777,38 +7743,23 @@ ( hg init hgrepo && cd hgrepo && - echo one > content && - hg add content && - hg commit -m one - ) && - ( - git clone "hg::hgrepo" gitrepo && - cd gitrepo && - git tag -m "Version 1.0" v1.0 && - git push --tags - ) && + mkdir dir_or_file && + echo test > dir_or_file/test_file && + hg add dir_or_file/test_file && + hg commit -m add && - cat > expected <<-\EOF && - tip:Version 1.0:C O Mitter - v1.0:one:H G Wells - EOF + hg rm dir_or_file/test_file && + echo test > dir_or_file && + hg add dir_or_file && + hg commit -m add && - hg -R hgrepo log --template "{tags}:{desc}:{author}\n" > actual && + hg rm dir_or_file + ) && - test_cmp expected actual + git clone "hg::hgrepo" gitrepo && + check_files gitrepo "dir_or_file" -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files -new changesets 3cc5f6a37c07:b2a024d9c8c9 -WARNING: Ignoring matched branch parent/child -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -progress revision 1 'parent' (0/1) ok 40 - clone can ignore invalid refnames expecting success: @@ -7851,7 +7802,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets d34a702074a3 +new changesets 5187966a5d57 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) Cloning into 'gitrepo'... @@ -7865,39 +7816,48 @@ 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 8128a92e350d -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] WARNING: capability_push is disabled, only do so when really sure WARNING: various enhanced features might fail in subtle ways -no changes found -searching for changes adding changesets adding manifests adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new tag] v1.0 -> v1.0 -/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] +added 2 changesets with 2 changes to 2 files no changes found +new changesets ba9feddcb0e5:616a0f519c37 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 +progress revision walk 'bookmarks/master' (1/1) +progress revision 0 'master' (0/2) +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo * [new tag] v1.0 -> v1.0 +ok 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 41 - push annotated tag expecting success: @@ -7925,6 +7885,130 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) +marked working directory as branch parent +(branches are permanent and global, did you want a bookmark?) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +WARNING: capability_push is disabled, only do so when really sure +WARNING: various enhanced features might fail in subtle ways +no changes found +warning: You appear to have cloned an empty repository. +[master (root-commit) 9f40cc0] two + Author: A U Thor + Date: Mon Sep 26 00:00:00 2016 -0230 + 1 file changed, 1 insertion(+) + create mode 100644 content +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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 +marked working directory as branch parent/child +no changes found +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo + * [new branch] master -> master +Cloning into 'gitrepo2'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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 +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets e522f351d13b +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +ok 42 - timezone issues with negative offsets + +# still have 2 known breakage(s) +# passed all remaining 40 test(s) +1..42 +adding changesets +adding manifests +adding file changes +added 3 changesets with 3 changes to 1 files +new changesets ad9bef53424b:db45d73f2c81 +WARNING: Ignoring matched branch parent/child +progress revision walk 'bookmarks/master' (0/0) +progress revision 0 'master' (0/1) +progress revision 1 'parent' (0/1) +ok 40 - clone can ignore invalid refnames + +expecting success: + test_when_finished "rm -rf hgrepo gitrepo" && + + ( + hg init hgrepo && + cd hgrepo && + echo one > content && + hg add content && + hg commit -m one + ) && + + ( + git clone "hg::hgrepo" gitrepo && + cd gitrepo && + git tag -m "Version 1.0" v1.0 && + git push --tags + ) && + + cat > expected <<-\EOF && + tip:Version 1.0:C O Mitter + v1.0:one:H G Wells + EOF + + hg -R hgrepo log --template "{tags}:{desc}:{author}\n" > actual && + + test_cmp expected actual + +Cloning into 'gitrepo'... +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' + RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' + m = re.match(b'^(.+?) ext:\((.+)\)$', name) +/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. + or locale.getdefaultlocale()[1] +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +new changesets ba4e31c1a4aa +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 +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo + * [new tag] v1.0 -> v1.0 ok 41 - push annotated tag expecting success: @@ -7947,34 +8031,15 @@ git --git-dir=gitrepo2/.git log -1 --format="%ai" > actual && test_cmp expected actual -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways Cloning into 'gitrepo1'... -no changes found -warning: You appear to have cloned an empty repository. /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 (root-commit) 9f40cc0] two - Author: A U Thor - Date: Mon Sep 26 00:00:00 2016 -0230 - 1 file changed, 1 insertion(+) - create mode 100644 content -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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 warning: You appear to have cloned an empty repository. -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways [master (root-commit) 9f40cc0] two Author: A U Thor Date: Mon Sep 26 00:00:00 2016 -0230 @@ -7984,19 +8049,6 @@ RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -no changes found -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/tmp/hgrepo - * [new branch] master -> master -Cloning into 'gitrepo2'... -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\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 @@ -8007,27 +8059,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 branch] master -> master -/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. - or locale.getdefaultlocale()[1] -WARNING: capability_push is disabled, only do so when really sure -WARNING: various enhanced features might fail in subtle ways Cloning into 'gitrepo2'... /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' RAW_AUTHOR_RE = re.compile(b'^(\w+) (?:(.+)? )?<(.*)> (\d+) ([+-]\d+)') /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:392: SyntaxWarning: invalid escape sequence '\(' m = re.match(b'^(.+?) ext:\((.+)\)$', name) -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -new changesets e522f351d13b -progress revision walk 'bookmarks/master' (0/0) -progress revision 0 'master' (0/1) -ok 42 - timezone issues with negative offsets - -# still have 2 known breakage(s) -# passed all remaining 40 test(s) -1..42 /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:57: DeprecationWarning: 'locale.getdefaultlocale' is deprecated and slated for removal in Python 3.15. Use setlocale(), getencoding() and getlocale() instead. or locale.getdefaultlocale()[1] adding changesets @@ -8073,7 +8109,7 @@ adding file changes adding remote bookmark feature-a added 1 changesets with 1 changes to 1 files -new changesets c8a2eb021a06 +new changesets d23a4dab3040 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' @@ -8128,10 +8164,10 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 30c1ca67fb15 +new changesets e136e02dc5c6 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) -[master 17e29f4] one +[master b39c18b] 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' @@ -8193,7 +8229,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 1d85d770438d +new changesets 68db4dc3be74 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -8221,12 +8257,12 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets 01a525e0e505:1f672a9c1060 +new changesets 66ecdedf4de3:18b2ea78641f 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 - 775d8fb..881c126 master -> origin/master - 775d8fb..881c126 branches/default -> origin/branches/default -HEAD is now at 881c126 restored + 0f8afa2..57a7973 master -> origin/master + 0f8afa2..57a7973 branches/default -> origin/branches/default +HEAD is now at 57a7973 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 '\(' @@ -8235,9 +8271,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 000e0ec6c718d6d3f8d64031ab4c6b10bbfcf58b) + ! [remote rejected] master -> master (rejected not pushing hg based commit 9ed89bb482e3e0fe30f87b35bfdb62ebeec4ac22) 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 000e0ec6c718d6d3f8d64031ab4c6b10bbfcf58b) + ! [remote rejected] master -> master (rejected not pushing hg based commit 9ed89bb482e3e0fe30f87b35bfdb62ebeec4ac22) ok 45 - check-hg-commits with fail mode expecting success: @@ -8273,27 +8309,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 - 8889068..3adbc3a master -> origin/master - 8889068..3adbc3a branches/default -> origin/branches/default -HEAD is now at 3adbc3a restored + afb27ae..07b737a master -> origin/master + afb27ae..07b737a branches/default -> origin/branches/default +HEAD is now at 07b737a 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 c24380221296e6a5bb2ced4ef48e6ca0a9d4d018 for 50ef2aa9e0f6c2b9073674200dee459d83b5dde2 -WARNING: Pushing hg changeset b0e31e0ba2e06f462c4a55ae492279f937f834eb for edd83bdf073a2a9a65a4221692ab253de41ff0fb -WARNING: Pushing hg changeset d87411fd3846763651a1611d160fe3468bdf7549 for bc9cfbcf6a3dc1a882562bd7c78a1ea28ff9426b -WARNING: Pushing hg changeset 1fc57a7f336ac3777b52c190c602d6bf6e5eeb73 for 875384e4033acf7ebfff756ec0292ec1e64f71c3 -WARNING: Pushing hg changeset 1dbb07c2db6a4aa61153b2f016547e4e2d902b16 for 3adbc3ab06f55f3f38590283a8c73bbdb1a432af +WARNING: Pushing hg changeset 646c1147301d7c5182d22e0bf78df70254aec2be for 3c504ff6da9154fff3a6530a91400a25385a267d +WARNING: Pushing hg changeset d81c94e14ea6c7550cf231f43bb52ea187751cae for 53e3db4b365e7228914d1ef0407b0d034302de2c +WARNING: Pushing hg changeset b78999f5f6b4fd3b51938f7b78a275c25bef9faf for 0aac0a968bf0621eb1da5877fe3b9a18aec83c59 +WARNING: Pushing hg changeset 222f431193ef1510ea910fbca12f4b0a33af6a70 for 26414dfde2de94dc17ea4538171b3c231c5047a9 +WARNING: Pushing hg changeset 295ef73312b2123c7523580233661280d2945eb4 for 07b737aced6a1ce91780d9868f29a282d0a93a42 To hg::/build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/tmp/hgrepo.second - fffffff..3adbc3a master -> master -WARNING: Pushing hg changeset c24380221296e6a5bb2ced4ef48e6ca0a9d4d018 for 50ef2aa9e0f6c2b9073674200dee459d83b5dde2 -WARNING: Pushing hg changeset b0e31e0ba2e06f462c4a55ae492279f937f834eb for edd83bdf073a2a9a65a4221692ab253de41ff0fb -WARNING: Pushing hg changeset d87411fd3846763651a1611d160fe3468bdf7549 for bc9cfbcf6a3dc1a882562bd7c78a1ea28ff9426b -WARNING: Pushing hg changeset 1fc57a7f336ac3777b52c190c602d6bf6e5eeb73 for 875384e4033acf7ebfff756ec0292ec1e64f71c3 -WARNING: Pushing hg changeset 1dbb07c2db6a4aa61153b2f016547e4e2d902b16 for 3adbc3ab06f55f3f38590283a8c73bbdb1a432af + fffffff..07b737a master -> master +WARNING: Pushing hg changeset 646c1147301d7c5182d22e0bf78df70254aec2be for 3c504ff6da9154fff3a6530a91400a25385a267d +WARNING: Pushing hg changeset d81c94e14ea6c7550cf231f43bb52ea187751cae for 53e3db4b365e7228914d1ef0407b0d034302de2c +WARNING: Pushing hg changeset b78999f5f6b4fd3b51938f7b78a275c25bef9faf for 0aac0a968bf0621eb1da5877fe3b9a18aec83c59 +WARNING: Pushing hg changeset 222f431193ef1510ea910fbca12f4b0a33af6a70 for 26414dfde2de94dc17ea4538171b3c231c5047a9 +WARNING: Pushing hg changeset 295ef73312b2123c7523580233661280d2945eb4 for 07b737aced6a1ce91780d9868f29a282d0a93a42 ok 46 - check-hg-commits with push mode - no local proxy expecting success: @@ -8310,7 +8346,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets f41dc509bd46 +new changesets 2a5cad4df4fe progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) updating to branch default @@ -8338,12 +8374,12 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -new changesets b7309a14ff6e:af16e9d9afaf +new changesets 6a5dfa768977:356865032111 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 - 52a09b0..08a0bcb master -> origin/master - 52a09b0..08a0bcb branches/default -> origin/branches/default -HEAD is now at 08a0bcb restored + f7459ad..1c485ca master -> origin/master + f7459ad..1c485ca branches/default -> origin/branches/default +HEAD is now at 1c485ca 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 '\(' @@ -8351,23 +8387,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 b7309a14ff6e4aeb99d6c62967b5709cdbe605cc for 1c9cf32478d4e2e8592390bee9557951ba35fd2f -WARNING: Using hg changeset 36317b6b858ee5acaac82fad44d93f114839bb6f for 7f6b1e8e4922195e58852b5152ee7c4ba8525a5d -WARNING: Using hg changeset 590050d8af82cf161edda18b2643433b647137c3 for 0063ed7e8b2e860cbfd0661e7eb5faf7c671aa01 -WARNING: Using hg changeset d098fbc945517da487983a071dee22c300bf617f for dbc7f49cfeda824c148092fba46fbc02ad06f7ce -WARNING: Using hg changeset af16e9d9afaf52f66129f72a6cf883b724fb7ff9 for 08a0bcb8b2816015f2aa8d2fc7560576020ada0c +WARNING: Using hg changeset 6a5dfa76897777e67b1469b9097c105fcd22000a for b54609d58685e465518fc4a507d04cf355b2c5a0 +WARNING: Using hg changeset faa7b3658c786cd729f648eef5517e61ab929ff1 for 6c6a7c05c9261e5703d8081344fd45b1691ab8f1 +WARNING: Using hg changeset c59c6ae483e0a5b446d40540e35adebde288315f for 012e5f648a54a7d9469d31ebdcc0ee80007e7af7 +WARNING: Using hg changeset 044dafde8daa55c4505bd1bc398fad6158535194 for 137703fc9ed8bc107b67dddaf1390af299232142 +WARNING: Using hg changeset 356865032111bf29d16109e51107594709fc7d83 for 1c485ca040a6122023d6762f4b3359edca102e64 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..08a0bcb master -> master -WARNING: Using hg changeset b7309a14ff6e4aeb99d6c62967b5709cdbe605cc for 1c9cf32478d4e2e8592390bee9557951ba35fd2f -WARNING: Using hg changeset 36317b6b858ee5acaac82fad44d93f114839bb6f for 7f6b1e8e4922195e58852b5152ee7c4ba8525a5d -WARNING: Using hg changeset 590050d8af82cf161edda18b2643433b647137c3 for 0063ed7e8b2e860cbfd0661e7eb5faf7c671aa01 -WARNING: Using hg changeset d098fbc945517da487983a071dee22c300bf617f for dbc7f49cfeda824c148092fba46fbc02ad06f7ce -WARNING: Using hg changeset af16e9d9afaf52f66129f72a6cf883b724fb7ff9 for 08a0bcb8b2816015f2aa8d2fc7560576020ada0c + fffffff..1c485ca master -> master +WARNING: Using hg changeset 6a5dfa76897777e67b1469b9097c105fcd22000a for b54609d58685e465518fc4a507d04cf355b2c5a0 +WARNING: Using hg changeset faa7b3658c786cd729f648eef5517e61ab929ff1 for 6c6a7c05c9261e5703d8081344fd45b1691ab8f1 +WARNING: Using hg changeset c59c6ae483e0a5b446d40540e35adebde288315f for 012e5f648a54a7d9469d31ebdcc0ee80007e7af7 +WARNING: Using hg changeset 044dafde8daa55c4505bd1bc398fad6158535194 for 137703fc9ed8bc107b67dddaf1390af299232142 +WARNING: Using hg changeset 356865032111bf29d16109e51107594709fc7d83 for 1c485ca040a6122023d6762f4b3359edca102e64 ok 47 - check-hg-commits with push mode - with local proxy expecting success: @@ -8393,7 +8429,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 0d6a667357e9 +new changesets 581626a88179 progress revision walk 'bookmarks/master' (0/0) progress revision 0 'master' (0/1) /build/reproducible-path/git-remote-hg-1.0.4~ds/test/trash directory.main-push/bin/git-remote-hg:154: SyntaxWarning: invalid escape sequence '\w' @@ -8407,23 +8443,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Feb 4 09:57 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Feb 4 09:57 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Feb 4 09:57 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jan 2 03:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jan 2 03:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jan 2 03:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 refs ok 48 - shared-marks unset expecting success: @@ -8459,7 +8495,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 6134d278f119 +new changesets 66538eeca8cd 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' @@ -8473,23 +8509,23 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Feb 4 09:57 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Feb 4 09:57 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Feb 4 09:57 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jan 2 03:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jan 2 03:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jan 2 03:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 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 '\(' @@ -8523,25 +8559,25 @@ progress revision walk 'branches/default' (0/0) progress revision 0 'default' (0/1) total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Feb 4 09:57 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Feb 4 09:57 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jan 2 03:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jan 2 03:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Feb 4 09:57 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Feb 4 09:57 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jan 2 03:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jan 2 03:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Feb 4 09:57 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Feb 4 09:57 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jan 2 03:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jan 2 03:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 refs ok 49 - shared-marks set to unset expecting success: @@ -8586,7 +8622,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -new changesets 36d42f380c4d +new changesets 1dc5578a2a61 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' @@ -8602,25 +8638,25 @@ * [new branch] branches/default -> second/branches/default * [new branch] master -> second/master total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Feb 4 09:57 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Feb 4 09:57 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jan 2 03:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jan 2 03:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Feb 4 09:57 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Feb 4 09:57 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jan 2 03:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jan 2 03:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Feb 4 09:57 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Feb 4 09:57 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jan 2 03:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jan 2 03:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 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 '\(' @@ -8629,25 +8665,25 @@ or locale.getdefaultlocale()[1] no changes found total 0 -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Feb 4 09:57 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Feb 4 09:57 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .hg -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 second +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jan 2 03:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jan 2 03:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .hg +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 second total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Feb 4 09:57 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Feb 4 09:57 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jan 2 03:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jan 2 03:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 refs total 8 -drwxr-xr-x 4 pbuilder1 pbuilder1 120 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 100 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone --rw-r--r-- 1 pbuilder1 pbuilder1 132 Feb 4 09:57 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Feb 4 09:57 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 120 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 100 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jan 2 03:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jan 2 03:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 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 '\(' @@ -8657,23 +8693,23 @@ WARNING: using marks of remote origin as shared marks no changes found total 8 -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 . -drwxr-xr-x 9 pbuilder1 pbuilder1 300 Feb 4 09:57 .. -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .hg --rw-r--r-- 1 pbuilder1 pbuilder1 132 Feb 4 09:57 marks-git --rw-r--r-- 1 pbuilder1 pbuilder1 116 Feb 4 09:57 marks-hg -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 origin -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 second +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 . +drwxr-xr-x 9 pbuilder2 pbuilder2 300 Jan 2 03:43 .. +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .hg +-rw-r--r-- 1 pbuilder2 pbuilder2 132 Jan 2 03:43 marks-git +-rw-r--r-- 1 pbuilder2 pbuilder2 116 Jan 2 03:43 marks-hg +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 origin +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 second total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 refs total 0 -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 . -drwxr-xr-x 5 pbuilder1 pbuilder1 140 Feb 4 09:57 .. -drwxr-xr-x 3 pbuilder1 pbuilder1 60 Feb 4 09:57 clone -drwxr-xr-x 4 pbuilder1 pbuilder1 80 Feb 4 09:57 refs +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 . +drwxr-xr-x 5 pbuilder2 pbuilder2 140 Jan 2 03:43 .. +drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 2 03:43 clone +drwxr-xr-x 4 pbuilder2 pbuilder2 80 Jan 2 03:43 refs ok 50 - shared-marks unset to set expecting success: @@ -8726,7 +8762,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: @@ -8861,12 +8897,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/2813119/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/2813119/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/1459874 and its subdirectories -I: Current time: Tue Feb 3 21:58:00 -12 2026 -I: pbuilder-time-stamp: 1770199080 +I: removing directory /srv/workspace/pbuilder/2813119 and its subdirectories +I: Current time: Thu Jan 2 17:43:56 +14 2025 +I: pbuilder-time-stamp: 1735789436